- gerrit-log - lists.osmocom.org

[M] Change in osmo-pcap[master]: pcap-server: Introduce VTY cmd '[no] completed-path'
by pespin 24 Dec '24

24 Dec '24

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email ) Change subject: pcap-server: Introduce VTY cmd '[no] completed-path' ...................................................................... Patch Set 3: (1 comment) File doc/manuals/chapters/server.adoc: https://gerrit.osmocom.org/c/osmo-pcap/+/39201/comment/21ca606e_0148a674?us… : PS2, Line 138: wants > users ... […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I5166d1c5d9eb45358c87c2e1c5fbf7969d1d5294 Gerrit-Change-Number: 39201 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 14:45:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: pcap-server: Resolve real path of pcap file before opening
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39200?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pcap-server: Resolve real path of pcap file before opening ...................................................................... pcap-server: Resolve real path of pcap file before opening This means we always end up with a canonicalized absolute path. While at it, also valdiate that we can indeed resolve the path (eg. it exists and is reachable with current process permissions) during startup. It is preferrable to resolve it everytime a file is opened, this allows the user to eg. change the base-path to a different symlink it they wish to change the base-path for new pcaps without restarting osmo-pcap. Change-Id: I8d161010dc8b480dd4cf90e19ca28a77914a50ad --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c M src/osmo_server_vty.c 3 files changed, 19 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index 0a43a69..50bb121 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -87,6 +87,7 @@ /* Remote connection */ struct osmo_wqueue rem_wq; int local_fd; + /* canonicalized absolute pathname of pcap file we write to */ char *curr_filename; /* pcap stuff */ diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 0b0073f..8747091 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -166,6 +166,7 @@ time_t now = time(NULL); struct tm tm; int rc; + char *real_base_path; osmo_pcap_server_close_trace(conn); @@ -178,11 +179,17 @@ } localtime_r(&now, &tm); + real_base_path = realpath(conn->server->base_path, NULL); + if (!real_base_path) { + LOGP(DSERVER, LOGL_ERROR, "Failed to resolve real path '%s': %s\n", + conn->server->base_path, strerror(errno)); + return; + } conn->curr_filename = talloc_asprintf(conn, "%s/trace-%s-%d%.2d%.2d_%.2d%.2d%.2d.pcap", - conn->server->base_path, conn->name, - tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, - tm.tm_hour, tm.tm_min, tm.tm_sec); - + real_base_path, conn->name, + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec); + free(real_base_path); if (!conn->curr_filename) { LOGP(DSERVER, LOGL_ERROR, "Failed to assemble filename for %s.\n", conn->name); return; diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index c3014c9..ee3f995 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -148,6 +148,13 @@ "base-path PATH", "Base path for log files\n" "Path\n") { + /* Validate we can resolve path: */ + char *tmp = realpath(argv[0], NULL); + if (!tmp) { + vty_out(vty, "%% Failed to resolve path '%s': %s%s", argv[0], strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + free(tmp); osmo_talloc_replace_string(pcap_server, &pcap_server->base_path, argv[0]); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39200?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I8d161010dc8b480dd4cf90e19ca28a77914a50ad Gerrit-Change-Number: 39200 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: pcap-server: remove unneeded check for null base_path
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email ) Change subject: pcap-server: remove unneeded check for null base_path ...................................................................... pcap-server: remove unneeded check for null base_path It cannot be ever NULL. It is set to a non-null path during alloc(), and it can only be replaced with another string through VTY. Change-Id: I2f503f6f9af35d6ae6fbd03e85cade4f0eb93df2 --- M src/osmo_server_vty.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 6a44da6..c3014c9 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -96,8 +96,7 @@ vty_out(vty, "server%s", VTY_NEWLINE); - if (pcap_server->base_path) - vty_out(vty, " base-path %s%s", pcap_server->base_path, VTY_NEWLINE); + vty_out(vty, " base-path %s%s", pcap_server->base_path, VTY_NEWLINE); vty_out(vty, " file-permission-mask 0%o%s", pcap_server->permission_mask, VTY_NEWLINE); if (pcap_server->addr) vty_out(vty, " server ip %s%s", pcap_server->addr, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2f503f6f9af35d6ae6fbd03e85cade4f0eb93df2 Gerrit-Change-Number: 39192 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org>

1 0

[M] Change in osmo-pcap[master]: pcap-server: Introduce VTY cmd '[no] completed-path'
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email ) Change subject: pcap-server: Introduce VTY cmd '[no] completed-path' ...................................................................... pcap-server: Introduce VTY cmd '[no] completed-path' This VTY allows enabling feature to instruct osmo-pcap-server to move the closed files (due to ration) into a separate directory. This is useful for users who want to monitor and act on closed pcap files to eg. generate statistics, etc. Important: completed-path must be in the same filesystem mountpoint as base-path, since osmo-pcap-server is actually not copying the files, but atomically renaming the paths through rename() syscall. Related: SYS#7248 Change-Id: I5166d1c5d9eb45358c87c2e1c5fbf7969d1d5294 --- M doc/manuals/chapters/server.adoc M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_network.c M src/osmo_server_vty.c 4 files changed, 141 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/manuals/chapters/server.adoc b/doc/manuals/chapters/server.adoc index c6404ab..e0d9ff4 100644 --- a/doc/manuals/chapters/server.adoc +++ b/doc/manuals/chapters/server.adoc @@ -125,3 +125,31 @@ Saving procedure), osmo-pcap-server may end up recreating (and truncating) a previous pcap file if it is generated with the same localtime timestamp, for instance because connection from osmo-pcap-client was re-established. + +=== Completed pcap directory + +`osmo-pcap-server` creates and writes data to opened pcap files in the +`base-path` directory configured through VTY. Furthermore, if user supplies a +`completed-path` directory through the VTY, `osmo-pcap-server` will move the +file from `base-path` to `completed-path` directory once it closes the current +file due to rotation or because `osmo-pcap-client` became disconnected. The file +name is kept when moving from one directory to the other. + +This feature is useful for users willing to have an external tool to monitor a +directory for new closed pcap files and then acting on them, eg. to gather +statistics of packets. + +.Example: Move files from /tmp/recording to /tmp/done +---- +server + ... + base-path /tmp/recording <1> + completed-path /tmp/done <2> +---- +<1> Files are opened and recorded under /tmp/recording +<2> Once closed files are moved under /tmp/done + +NOTE:: `osmo-pcap-server` uses a rename() call to move the file atomically. +However, this has the drawback that both `base-path` and `completed-path` must +be placed in the same filesystem mounting point. Using directories in different +filesystem mount points will fail. diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index 50bb121..614ceca 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -140,6 +140,7 @@ bool dh_params_allocated; char *base_path; + char *completed_path; mode_t permission_mask; off_t max_size; bool max_size_enabled; diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 8747091..9750170 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -39,6 +39,9 @@ #include <errno.h> #include <string.h> #include <unistd.h> +#include <limits.h> +#include <stdlib.h> +#include <libgen.h> static void pcap_zmq_send(void *publ, const void *data, size_t len, int flags) { @@ -112,6 +115,84 @@ 0); } +/* Move pcap file from base_path to completed_path, and updates + * conn->curr_filename to point to new location. */ +void move_completed_trace_if_needed(struct osmo_pcap_conn *conn) +{ + struct osmo_pcap_server *server = conn->server; + char *curr_filename_cpy_bname = NULL; + char *curr_filename_cpy_dname = NULL; + char *bname = NULL; + char *curr_dirname = NULL; + char *new_dirname = NULL; + char *new_filename = NULL; + size_t new_filename_len; + int rc; + + if (!conn->curr_filename) + return; + + if (!server->completed_path) + return; + + /* Assumption: curr_filename is anonicalized absolute pathname. */ + + /* basename and dirname may modify input param, and return a string + * which shall not be freed, potentially pointing to the input param. */ + curr_filename_cpy_dname = talloc_strdup(conn, conn->curr_filename); + curr_filename_cpy_bname = talloc_strdup(conn, conn->curr_filename); + if (!curr_filename_cpy_dname || !curr_filename_cpy_bname) + goto ret_free1; + + curr_dirname = dirname(curr_filename_cpy_dname); + bname = basename(curr_filename_cpy_bname); + if (!curr_dirname || !bname) { + LOGP(DSERVER, LOGL_ERROR, "Failed to resolve dirname and basename for '%s'\n", + conn->curr_filename); + goto ret_free1; + } + + new_dirname = realpath(server->completed_path, NULL); + if (!new_dirname) { + LOGP(DSERVER, LOGL_ERROR, "Failed to resolve path '%s': %s\n", + server->completed_path, strerror(errno)); + goto ret_free1; + } + + new_filename_len = strlen(new_dirname) + 1 /* '/' */ + strlen(bname) + 1 /* '\0' */; + new_filename = talloc_size(conn, new_filename_len); + if (!new_filename) + goto ret_free1; + rc = snprintf(new_filename, new_filename_len, "%s/%s", new_dirname, bname); + if (rc != new_filename_len - 1) + goto ret_free2; + + LOGP(DSERVER, LOGL_INFO, "Moving completed pcap file '%s' -> '%s'\n", conn->curr_filename, new_filename); + rc = rename(conn->curr_filename, new_filename); + if (rc == -1) { + int err = errno; + LOGP(DSERVER, LOGL_ERROR, "Failed moving completed pcap file '%s' -> '%s': %s\n", + conn->curr_filename, new_filename, strerror(err)); + if (err == EXDEV) + LOGP(DSERVER, LOGL_ERROR, "Fix your config! %s and %s shall not be in different filesystems!\n", + curr_dirname, new_dirname); + goto ret_free2; + } + + /* Now replace conn->curr_filename with new path: */ + talloc_free(conn->curr_filename); + conn->curr_filename = new_filename; + /* new_filename has been assigned, so we don't want to free it, hence move to ret_free1: */ + goto ret_free1; + +ret_free2: + talloc_free(new_filename); +ret_free1: + free(new_dirname); + talloc_free(curr_filename_cpy_bname); + talloc_free(curr_filename_cpy_dname); +} + void osmo_pcap_server_close_trace(struct osmo_pcap_conn *conn) { if (conn->local_fd >= 0) { @@ -119,6 +200,8 @@ conn->local_fd = -1; } + move_completed_trace_if_needed(conn); + if (conn->curr_filename) { client_event(conn, "closingtracefile", conn->curr_filename); rate_ctr_inc2(conn->ctrg, PEER_CTR_PROTATE); diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index ee3f995..1e8e05c 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -97,6 +97,8 @@ vty_out(vty, "server%s", VTY_NEWLINE); vty_out(vty, " base-path %s%s", pcap_server->base_path, VTY_NEWLINE); + if (pcap_server->completed_path) + vty_out(vty, " completed-path %s%s", pcap_server->completed_path, VTY_NEWLINE); vty_out(vty, " file-permission-mask 0%o%s", pcap_server->permission_mask, VTY_NEWLINE); if (pcap_server->addr) vty_out(vty, " server ip %s%s", pcap_server->addr, VTY_NEWLINE); @@ -159,6 +161,31 @@ return CMD_SUCCESS; } +DEFUN(cfg_server_no_completed_path, + cfg_server_no_completed_path_cmd, + "no completed-path", + NO_STR "Base path for completed (already closed, rotated) log files. Completed files won't be moved.\n") +{ + TALLOC_FREE(pcap_server->completed_path); + return CMD_SUCCESS; +} + +DEFUN(cfg_server_completed_path, + cfg_server_completed_path_cmd, + "completed-path PATH", + "Base path for completed (already closed, rotated) log files\n" "Path\n") +{ + /* Validate we can resolve path: */ + char *tmp = realpath(argv[0], NULL); + if (!tmp) { + vty_out(vty, "%% Failed to resolve path '%s': %s%s", argv[0], strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + free(tmp); + osmo_talloc_replace_string(pcap_server, &pcap_server->completed_path, argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_server_file_permission_mask, cfg_server_file_permission_mask_cmd, "file-permission-mask MODE", @@ -671,6 +698,8 @@ install_node(&server_node, config_write_server); install_element(SERVER_NODE, &cfg_server_base_cmd); + install_element(SERVER_NODE, &cfg_server_no_completed_path_cmd); + install_element(SERVER_NODE, &cfg_server_completed_path_cmd); install_element(SERVER_NODE, &cfg_server_file_permission_mask_cmd); install_element(SERVER_NODE, &cfg_server_ip_cmd); install_element(SERVER_NODE, &cfg_server_port_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I5166d1c5d9eb45358c87c2e1c5fbf7969d1d5294 Gerrit-Change-Number: 39201 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: pcap-server: remove unneeded check for null base_path
by pespin 24 Dec '24

24 Dec '24

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email ) Change subject: pcap-server: remove unneeded check for null base_path ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2f503f6f9af35d6ae6fbd03e85cade4f0eb93df2 Gerrit-Change-Number: 39192 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 24 Dec 2024 14:45:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-pcap[master]: pcap-server: Introduce VTY cmd '[no] completed-path'
by pespin 24 Dec '24

24 Dec '24

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email ) Change subject: pcap-server: Introduce VTY cmd '[no] completed-path' ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I5166d1c5d9eb45358c87c2e1c5fbf7969d1d5294 Gerrit-Change-Number: 39201 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 14:44:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-pcap[master]: pcap-client,pcap-server: Use rate_ctr_inc2 and rate_ctr_add2 APIs
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39174?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pcap-client,pcap-server: Use rate_ctr_inc2 and rate_ctr_add2 APIs ...................................................................... pcap-client,pcap-server: Use rate_ctr_inc2 and rate_ctr_add2 APIs Change-Id: Idcc20646d252ad7bf61a740d900b31ca37ada280 --- M src/osmo_client_core.c M src/osmo_client_network.c M src/osmo_server_network.c 3 files changed, 19 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index d111fca..7338622 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -163,7 +163,7 @@ data = pcap_next(ph->handle, &hdr); if (!data) { - rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, CLIENT_CTR_PERR)); + rate_ctr_inc2(client->ctrg, CLIENT_CTR_PERR); return -1; } @@ -205,7 +205,7 @@ uint64_t inc; inc = get_psbl_wrapped_ctr(*old_val, new_val); - rate_ctr_add(rate_ctr_group_get_ctr(client->ctrg, ctr), inc); + rate_ctr_add2(client->ctrg, ctr, inc); *old_val = new_val; } @@ -223,7 +223,7 @@ rc = pcap_stats(ph->handle, &stat); if (rc != 0) { LOGPH(ph, LOGL_ERROR, "Failed to query pcap stats: %s\n", pcap_geterr(ph->handle)); - rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, CLIENT_CTR_PERR)); + rate_ctr_inc2(client->ctrg, CLIENT_CTR_PERR); return; } diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index bc99087..70fe740 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -61,7 +61,7 @@ if (osmo_wqueue_enqueue_quiet(&conn->wqueue, msg) != 0) { LOGCONN(conn, LOGL_ERROR, "Failed to enqueue msg (capacity: %u/%u)\n", conn->wqueue.current_length, conn->wqueue.max_length); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_QERR)); + rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_QERR); msgb_free(msg); return; } @@ -91,7 +91,7 @@ if (rc < 0) { struct osmo_pcap_client_conn *conn = fd->data; LOGCONN(conn, LOGL_ERROR, "Lost connection on write\n"); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_WERR)); + rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_WERR); lost_connection(conn); return -1; } @@ -172,13 +172,13 @@ if (in_hdr->len > in_hdr->caplen) { LOGCONN(conn, LOGL_ERROR, "Recording truncated packet, len %zu > snaplen %zu\n", (size_t) in_hdr->len, (size_t) in_hdr->caplen); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_2BIG)); + rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_2BIG); } msg = msgb_alloc(in_hdr->caplen + sizeof(*om_hdr) + sizeof(*hdr), "data-data"); if (!msg) { LOGCONN(conn, LOGL_ERROR, "Failed to allocate\n"); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_NOMEM)); + rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_NOMEM); return; } @@ -198,8 +198,8 @@ memcpy(msg->l3h, data, in_hdr->caplen); om_hdr->len = htons(msgb_l2len(msg)); - rate_ctr_add(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_BYTES), hdr->caplen); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_PKTS)); + rate_ctr_add2(conn->client->ctrg, CLIENT_CTR_BYTES, hdr->caplen); + rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_PKTS); break; case PROTOCOL_IPIP: /* TODO: support capturing from multiple interfaces here: */ @@ -310,7 +310,7 @@ osmo_fd_setup(&conn->wqueue.bfd, rc, when, conn_cb, conn, 0); osmo_fd_register(&conn->wqueue.bfd); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_CONNECT)); + rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_CONNECT); } void osmo_client_conn_reconnect(struct osmo_pcap_client_conn *conn) diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 1c8d442..0b0073f 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -121,8 +121,8 @@ if (conn->curr_filename) { client_event(conn, "closingtracefile", conn->curr_filename); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->ctrg, PEER_CTR_PROTATE)); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->server->ctrg, SERVER_CTR_PROTATE)); + rate_ctr_inc2(conn->ctrg, PEER_CTR_PROTATE); + rate_ctr_inc2(conn->server->ctrg, SERVER_CTR_PROTATE); talloc_free(conn->curr_filename); conn->curr_filename = NULL; } @@ -568,12 +568,12 @@ conn->pend = sizeof(*conn->data); /* count the full packet we got */ - rate_ctr_inc(rate_ctr_group_get_ctr(conn->ctrg, PEER_CTR_PKTS)); - rate_ctr_inc(rate_ctr_group_get_ctr(conn->server->ctrg, SERVER_CTR_PKTS)); + rate_ctr_inc2(conn->ctrg, PEER_CTR_PKTS); + rate_ctr_inc2(conn->server->ctrg, SERVER_CTR_PKTS); /* count the bytes of it */ - rate_ctr_add(rate_ctr_group_get_ctr(conn->ctrg, PEER_CTR_BYTES), conn->data->len); - rate_ctr_add(rate_ctr_group_get_ctr(conn->server->ctrg, SERVER_CTR_BYTES), conn->data->len); + rate_ctr_add2(conn->ctrg, PEER_CTR_BYTES, conn->data->len); + rate_ctr_add2(conn->server->ctrg, SERVER_CTR_BYTES, conn->data->len); switch (conn->data->type) { case PKT_LINK_HDR: @@ -666,7 +666,7 @@ return; } - rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, PEER_CTR_CONNECT)); + rate_ctr_inc2(client->ctrg, PEER_CTR_CONNECT); client->state = STATE_INITIAL; client->pend = sizeof(*client->data); @@ -711,7 +711,7 @@ server = fd->data; /* count any accept to see no clients */ - rate_ctr_inc(rate_ctr_group_get_ctr(server->ctrg, SERVER_CTR_CONNECT)); + rate_ctr_inc2(server->ctrg, SERVER_CTR_CONNECT); llist_for_each_entry(conn, &server->conn, entry) { if (conn->remote_addr.s_addr == addr.sin_addr.s_addr) { @@ -723,7 +723,7 @@ } } - rate_ctr_inc(rate_ctr_group_get_ctr(server->ctrg, SERVER_CTR_NOCLIENT)); + rate_ctr_inc2(server->ctrg, SERVER_CTR_NOCLIENT); /* * TODO: In the future start with a tls handshake and see if we know -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39174?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Idcc20646d252ad7bf61a740d900b31ca37ada280 Gerrit-Change-Number: 39174 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-pcap[master]: pcap-client: Move stats to its own file
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39173?usp=email ) Change subject: pcap-client: Move stats to its own file ...................................................................... pcap-client: Move stats to its own file Further stats groups will be added, so move it to a separate file for easier handing. Change-Id: I4b5ecdd6f9b0c646dd03ca3bc7fa24624fb9fcbc --- M include/osmo-pcap/osmo_pcap_client.h M src/Makefile.am M src/osmo_client_core.c M src/osmo_client_main.c A src/osmo_client_stats.c 5 files changed, 69 insertions(+), 33 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 8ad5ffa..44ca54b 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -28,13 +28,12 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/select.h> #include <osmocom/core/timer.h> +#include <osmocom/core/rate_ctr.h> #include <osmocom/core/write_queue.h> -struct rate_ctr_group; - #define WQUEUE_MAXLEN_DEFAULT 1000 -enum { +enum pcap_client_ctr { CLIENT_CTR_CONNECT, CLIENT_CTR_BYTES, CLIENT_CTR_PKTS, @@ -47,6 +46,7 @@ CLIENT_CTR_P_DROP, CLIENT_CTR_P_IFDROP, }; +extern const struct rate_ctr_group_desc pcap_client_ctr_group_desc; enum osmo_pcap_protocol { PROTOCOL_OSMOPCAP, diff --git a/src/Makefile.am b/src/Makefile.am index 8c2c968..b35227c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,7 @@ osmo_client_core.c \ osmo_client_vty.c \ osmo_client_network.c \ + osmo_client_stats.c \ osmo_tls.c \ $(NULL) diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index bde40d3..d111fca 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -302,7 +302,18 @@ INIT_LLIST_HEAD(&client->handles); INIT_LLIST_HEAD(&client->conns); + /* initialize the stats interface */ + client->ctrg = rate_ctr_group_alloc(pcap_client, &pcap_client_ctr_group_desc, 0); + if (!client->ctrg) { + LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate rate ctr\n"); + goto ret_free; + } + return client; + +ret_free: + talloc_free(client); + return NULL; } void osmo_client_conn_free(struct osmo_pcap_client_conn *conn) diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index 3fa0ae4..1fedce1 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -52,29 +52,6 @@ void *tall_cli_ctx; struct osmo_pcap_client *pcap_client; - -static const struct rate_ctr_desc pcap_client_ctr_desc[] = { - [CLIENT_CTR_CONNECT] = { "server:connect", "Connects to the server" }, - [CLIENT_CTR_BYTES] = { "captured:bytes", "Captured bytes " }, - [CLIENT_CTR_PKTS] = { "captured:pkts", "Captured packets " }, - [CLIENT_CTR_2BIG] = { "bpf:too_big", "Captured data too big " }, - [CLIENT_CTR_NOMEM] = { "client:no_mem", "No memory available " }, - [CLIENT_CTR_QERR] = { "client:queue_err", "Can not queue data " }, - [CLIENT_CTR_PERR] = { "client:pcap_err", "libpcap error " }, - [CLIENT_CTR_WERR] = { "client:write_err", "Write error " }, - [CLIENT_CTR_P_RECV] = { "pcap:recv", "PCAP received packets " }, - [CLIENT_CTR_P_DROP] = { "pcap:drop", "PCAP dropped packets " }, - [CLIENT_CTR_P_IFDROP] = { "pcap:ifdrop", "iface dropped packets " }, -}; - -static const struct rate_ctr_group_desc pcap_client_ctr_group_desc = { - .group_name_prefix = "pcap:client", - .group_description = "PCAP Client statistics", - .num_ctr = ARRAY_SIZE(pcap_client_ctr_desc), - .ctr_desc = pcap_client_ctr_desc, - .class_id = OSMO_STATS_CLASS_GLOBAL, -}; - static struct vty_app_info vty_info = { .name = "OsmoPCAPClient", .version = PACKAGE_VERSION, @@ -261,13 +238,6 @@ exit(1); } - /* initialize the stats interface */ - pcap_client->ctrg = rate_ctr_group_alloc(pcap_client, &pcap_client_ctr_group_desc, 0); - if (!pcap_client->ctrg) { - LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate rate ctr\n"); - exit(1); - } - /* Default conn, always present. */ pcap_client->conn = osmo_client_conn_alloc(pcap_client, "default"); diff --git a/src/osmo_client_stats.c b/src/osmo_client_stats.c new file mode 100644 index 0000000..07ff4a1 --- /dev/null +++ b/src/osmo_client_stats.c @@ -0,0 +1,54 @@ +/* + * osmo-pcap-client code + * + * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * (C) 2011-2016 by Holger Hans Peter Freyther <holger(a)moiji-mobile.com> + * (C) 2011 by On-Waves + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/stats.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> + +#include <osmo-pcap/common.h> +#include <osmo-pcap/osmo_pcap_client.h> + +#include "osmopcapconfig.h" + +static const struct rate_ctr_desc pcap_client_ctr_desc[] = { + [CLIENT_CTR_CONNECT] = { "server:connect", "Connects to the server" }, + [CLIENT_CTR_BYTES] = { "captured:bytes", "Captured bytes " }, + [CLIENT_CTR_PKTS] = { "captured:pkts", "Captured packets " }, + [CLIENT_CTR_2BIG] = { "bpf:too_big", "Captured data too big " }, + [CLIENT_CTR_NOMEM] = { "client:no_mem", "No memory available " }, + [CLIENT_CTR_QERR] = { "client:queue_err", "Can not queue data " }, + [CLIENT_CTR_PERR] = { "client:pcap_err", "libpcap error " }, + [CLIENT_CTR_WERR] = { "client:write_err", "Write error " }, + [CLIENT_CTR_P_RECV] = { "pcap:recv", "PCAP received packets " }, + [CLIENT_CTR_P_DROP] = { "pcap:drop", "PCAP dropped packets " }, + [CLIENT_CTR_P_IFDROP] = { "pcap:ifdrop", "iface dropped packets " }, +}; + +const struct rate_ctr_group_desc pcap_client_ctr_group_desc = { + .group_name_prefix = "pcap:client", + .group_description = "PCAP Client statistics", + .num_ctr = ARRAY_SIZE(pcap_client_ctr_desc), + .ctr_desc = pcap_client_ctr_desc, + .class_id = OSMO_STATS_CLASS_GLOBAL, +}; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39173?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I4b5ecdd6f9b0c646dd03ca3bc7fa24624fb9fcbc Gerrit-Change-Number: 39173 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-pcap[master]: pcap-client: Add per iface counter group instance
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39175?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pcap-client: Add per iface counter group instance ...................................................................... pcap-client: Add per iface counter group instance Change-Id: I0a35f8258eedb785ddb3311f94b42707f0045c32 --- M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_core.c M src/osmo_client_stats.c 3 files changed, 54 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 44ca54b..250a41f 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -48,6 +48,14 @@ }; extern const struct rate_ctr_group_desc pcap_client_ctr_group_desc; +enum pcap_handle_ctr { + PH_CTR_PERR, + PH_CTR_P_RECV, + PH_CTR_P_DROP, + PH_CTR_P_IFDROP, +}; +extern const struct rate_ctr_group_desc pcap_handle_ctr_group_desc; + enum osmo_pcap_protocol { PROTOCOL_OSMOPCAP, PROTOCOL_IPIP, @@ -85,6 +93,7 @@ struct osmo_pcap_handle { struct llist_head entry; /* item in (struct osmo_pcap_client)->handles */ struct osmo_pcap_client *client; /* back pointer */ + unsigned int idx; char *devname; pcap_t *handle; struct osmo_fd fd; @@ -93,10 +102,13 @@ u_int last_ps_ifdrop; struct osmo_timer_list pcap_stat_timer; struct bpf_program bpf; + /* statistics */ + struct rate_ctr_group *ctrg; }; struct osmo_pcap_client { struct llist_head handles; /* list of struct osmo_pcap_handle */ + unsigned int next_pcap_handle_idx; char *filter_string; int filter_itself; @@ -141,4 +153,4 @@ LOGP(DCLIENT, lvl, "CONN(%s,%s:%d) " fmt, (conn)->name, (conn)->srv_ip, (conn)->srv_port, ## args) #define LOGPH(ph, lvl, fmt, args...) \ - LOGP(DCLIENT, lvl, "PH(%s) " fmt, (ph)->devname, ## args) + LOGP(DCLIENT, lvl, "PH(%u,%s) " fmt, (ph)->idx, (ph)->devname, ## args) diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 7338622..a2ab894 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -163,6 +163,7 @@ data = pcap_next(ph->handle, &hdr); if (!data) { + rate_ctr_inc2(ph->ctrg, PH_CTR_PERR); rate_ctr_inc2(client->ctrg, CLIENT_CTR_PERR); return -1; } @@ -199,22 +200,13 @@ return new_val - old_val; } -static void add_psbl_wrapped_ctr(struct osmo_pcap_client *client, - u_int *old_val, u_int new_val, int ctr) -{ - uint64_t inc; - - inc = get_psbl_wrapped_ctr(*old_val, new_val); - rate_ctr_add2(client->ctrg, ctr, inc); - *old_val = new_val; -} - static void pcap_check_stats_cb(void *_ph) { struct pcap_stat stat; struct osmo_pcap_handle *ph = _ph; struct osmo_pcap_client *client = ph->client; int rc; + uint64_t inc; /* reschedule */ osmo_timer_schedule(&ph->pcap_stat_timer, 10, 0); @@ -223,13 +215,25 @@ rc = pcap_stats(ph->handle, &stat); if (rc != 0) { LOGPH(ph, LOGL_ERROR, "Failed to query pcap stats: %s\n", pcap_geterr(ph->handle)); + rate_ctr_inc2(ph->ctrg, PH_CTR_PERR); rate_ctr_inc2(client->ctrg, CLIENT_CTR_PERR); return; } - add_psbl_wrapped_ctr(client, &ph->last_ps_recv, stat.ps_recv, CLIENT_CTR_P_RECV); - add_psbl_wrapped_ctr(client, &ph->last_ps_drop, stat.ps_drop, CLIENT_CTR_P_DROP); - add_psbl_wrapped_ctr(client, &ph->last_ps_ifdrop, stat.ps_ifdrop, CLIENT_CTR_P_IFDROP); + inc = get_psbl_wrapped_ctr(ph->last_ps_recv, stat.ps_recv); + rate_ctr_add2(ph->ctrg, PH_CTR_P_RECV, inc); + rate_ctr_add2(client->ctrg, CLIENT_CTR_P_RECV, inc); + ph->last_ps_recv = stat.ps_recv; + + inc = get_psbl_wrapped_ctr(ph->last_ps_drop, stat.ps_drop); + rate_ctr_add2(ph->ctrg, PH_CTR_P_DROP, inc); + rate_ctr_add2(client->ctrg, CLIENT_CTR_P_DROP, inc); + ph->last_ps_drop = stat.ps_drop; + + inc = get_psbl_wrapped_ctr(ph->last_ps_ifdrop, stat.ps_ifdrop); + rate_ctr_add2(ph->ctrg, PH_CTR_P_IFDROP, inc); + rate_ctr_add2(client->ctrg, CLIENT_CTR_P_IFDROP, inc); + ph->last_ps_ifdrop = stat.ps_ifdrop; } static int osmo_pcap_handle_install_filter(struct osmo_pcap_handle *ph) @@ -390,8 +394,14 @@ OSMO_ASSERT(ph->devname); ph->client = client; + ph->idx = client->next_pcap_handle_idx++; ph->fd.fd = -1; + /* initialize the stats interface */ + ph->ctrg = rate_ctr_group_alloc(ph, &pcap_handle_ctr_group_desc, ph->idx); + OSMO_ASSERT(ph->ctrg); + rate_ctr_group_set_name(ph->ctrg, ph->devname); + llist_add_tail(&ph->entry, &client->handles); return ph; } @@ -416,6 +426,9 @@ ph->handle = NULL; } + rate_ctr_group_free(ph->ctrg); + ph->ctrg = NULL; + talloc_free(ph); } diff --git a/src/osmo_client_stats.c b/src/osmo_client_stats.c index 07ff4a1..9522e7b 100644 --- a/src/osmo_client_stats.c +++ b/src/osmo_client_stats.c @@ -31,6 +31,21 @@ #include "osmopcapconfig.h" +static const struct rate_ctr_desc pcap_client_handle_ctr_desc[] = { + [PH_CTR_PERR] = { "pcap:err", "libpcap error " }, + [PH_CTR_P_RECV] = { "pcap:recv", "PCAP received packets " }, + [PH_CTR_P_DROP] = { "pcap:drop", "PCAP dropped packets " }, + [PH_CTR_P_IFDROP] = { "pcap:ifdrop", "iface dropped packets " }, +}; + +const struct rate_ctr_group_desc pcap_handle_ctr_group_desc = { + .group_name_prefix = "pcap:client:handle", + .group_description = "PCAP Client Handle statistics", + .num_ctr = ARRAY_SIZE(pcap_client_handle_ctr_desc), + .ctr_desc = pcap_client_handle_ctr_desc, + .class_id = OSMO_STATS_CLASS_PEER, +}; + static const struct rate_ctr_desc pcap_client_ctr_desc[] = { [CLIENT_CTR_CONNECT] = { "server:connect", "Connects to the server" }, [CLIENT_CTR_BYTES] = { "captured:bytes", "Captured bytes " }, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39175?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I0a35f8258eedb785ddb3311f94b42707f0045c32 Gerrit-Change-Number: 39175 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: pcap-client: Allow recording on several interfaces
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39176?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pcap-client: Allow recording on several interfaces ...................................................................... pcap-client: Allow recording on several interfaces This commit enables basic support for multi-interface capturing. The transmitted data to the osmo-pcap-server is not yet in pcapng format, which means no information regarding the iface it was captured on is provided when opening the resulting pcap file. Related: SYS#5822 Change-Id: I082b0bd38cf1829937c5e643f0ee31f9d56a07a7 --- M src/osmo_client_vty.c 1 file changed, 1 insertion(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index c976a1a..009c735 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -170,14 +170,8 @@ PCAP_STRING "the device to filter\n" "device name\n") { struct osmo_pcap_handle *ph = osmo_client_find_handle(pcap_client, argv[0]); - if (!ph) { - /* Only allow max one for now:*/ - if (llist_count(&pcap_client->handles) > 0) { - vty_out(vty, "Only one 'pcap device' allowed! Remove the old one with 'no pcap device' first!%s", VTY_NEWLINE); - return CMD_WARNING; - } + if (!ph) osmo_pcap_handle_alloc(pcap_client, argv[0]); - } return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39176?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I082b0bd38cf1829937c5e643f0ee31f9d56a07a7 Gerrit-Change-Number: 39176 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log