- 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

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+2 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/01/39201/3 -- 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: newpatchset 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(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

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39200?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/00/39200/2 -- 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: newpatchset 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-Attention: 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

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39173?usp=email ) Change subject: pcap-client: Move stats to its own file ...................................................................... Patch Set 2: (2 comments) File include/osmo-pcap/osmo_pcap_client.h: https://gerrit.osmocom.org/c/osmo-pcap/+/39173/comment/328ab446_459e0963?us… : PS2, Line 34: struct rate_ctr_group; > can be removed Done File src/osmo_client_stats.c: https://gerrit.osmocom.org/c/osmo-pcap/+/39173/comment/83a12efc_bce5dfe4?us… : PS2, Line 29: #include <osmocom/vty/logging.h> : #include <osmocom/vty/telnet_interface.h> : #include <osmocom/vty/stats.h> : #i > There's no VTY stuff in this file, so drop these? Done -- 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: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I4b5ecdd6f9b0c646dd03ca3bc7fa24624fb9fcbc Gerrit-Change-Number: 39173 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 14:36:54 +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-client: Improve conn logging
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39172?usp=email ) Change subject: pcap-client: Improve conn logging ...................................................................... pcap-client: Improve conn logging Change-Id: I078557144a2604e343ed0b44f72035a4eda8a674 --- M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_network.c 2 files changed, 11 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 7641ef1..8ad5ffa 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -137,5 +137,8 @@ void osmo_pcap_handle_free(struct osmo_pcap_handle *ph); int osmo_pcap_handle_start_capture(struct osmo_pcap_handle *ph); +#define LOGCONN(conn, lvl, fmt, args...) \ + 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) diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index e27a91f..bc99087 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -59,8 +59,8 @@ static void write_data(struct osmo_pcap_client_conn *conn, struct msgb *msg) { if (osmo_wqueue_enqueue_quiet(&conn->wqueue, msg) != 0) { - LOGP(DCLIENT, LOGL_ERROR, "Failed to enqueue conn=%s (capacity: %u/%u)\n", - conn->name, conn->wqueue.current_length, conn->wqueue.max_length); + 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)); msgb_free(msg); return; @@ -75,8 +75,7 @@ rc = read(fd->fd, buf, sizeof(buf)); if (rc <= 0) { struct osmo_pcap_client_conn *conn = fd->data; - LOGP(DCLIENT, LOGL_ERROR, "Lost connection on read conn=%s\n", - conn->name); + LOGCONN(conn, LOGL_ERROR, "Lost connection on read\n"); lost_connection(conn); return -1; } @@ -91,8 +90,7 @@ rc = write(fd->fd, msg->data, msg->len); if (rc < 0) { struct osmo_pcap_client_conn *conn = fd->data; - LOGP(DCLIENT, LOGL_ERROR, "Lost connection on write to %s %s:%d.\n", - conn->name, conn->srv_ip, conn->srv_port); + LOGCONN(conn, LOGL_ERROR, "Lost connection on write\n"); rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_WERR)); lost_connection(conn); return -1; @@ -172,15 +170,14 @@ struct osmo_pcap_handle *ph; if (in_hdr->len > in_hdr->caplen) { - LOGP(DCLIENT, LOGL_ERROR, - "Recording truncated packet, len %zu > snaplen %zu\n", + 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)); } msg = msgb_alloc(in_hdr->caplen + sizeof(*om_hdr) + sizeof(*hdr), "data-data"); if (!msg) { - LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate.\n"); + LOGCONN(conn, LOGL_ERROR, "Failed to allocate\n"); rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_NOMEM)); return; } @@ -245,8 +242,7 @@ /* TODO: support capturing from multiple interfaces here: */ ph = llist_first_entry_or_null(&conn->client->handles, struct osmo_pcap_handle, entry); if (!ph || !ph->handle) { - LOGP(DCLIENT, LOGL_ERROR, - "No pcap_handle not sending link info to conn=%s\n", conn->name); + LOGCONN(conn, LOGL_ERROR, "No pcap_handle not sending link info\n"); return; } @@ -307,9 +303,7 @@ rc = osmo_sock_init2(AF_INET, sock_type, sock_proto, conn->source_ip, 0, conn->srv_ip, srv_port, OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK); if (rc < 0) { - LOGP(DCLIENT, LOGL_ERROR, - "Failed to connect conn=%s to %s:%d\n", - conn->name, conn->srv_ip, conn->srv_port); + LOGCONN(conn, LOGL_ERROR, "Failed to connect\n"); lost_connection(conn); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39172?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: I078557144a2604e343ed0b44f72035a4eda8a674 Gerrit-Change-Number: 39172 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

[L] Change in osmo-pcap[master]: pcap-client: Decouple dev capture handling from client
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39170?usp=email ) Change subject: pcap-client: Decouple dev capture handling from client ...................................................................... pcap-client: Decouple dev capture handling from client A new struct osmo_pcap_handle is introduced, and struct osmo_pcap_client manages a list of it. This is a first step towards supporting capturing from multiple interfaces. VTY still enforces only 1 configured interface since further work is required. Related: SYS#5822 Change-Id: I02f33f11cbcb7ed5ff6475df9442741618178379 --- M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_core.c M src/osmo_client_main.c M src/osmo_client_network.c M src/osmo_client_vty.c 5 files changed, 192 insertions(+), 104 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 ce2fb8f..6725201 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -82,22 +82,26 @@ struct osmo_pcap_client *client; }; -struct osmo_pcap_client { - char *device; +struct osmo_pcap_handle { + struct llist_head entry; /* item in (struct osmo_pcap_client)->handles */ + struct osmo_pcap_client *client; /* back pointer */ + char *devname; pcap_t *handle; - char errbuf[PCAP_ERRBUF_SIZE]; - + struct osmo_fd fd; u_int last_ps_recv; u_int last_ps_drop; u_int last_ps_ifdrop; struct osmo_timer_list pcap_stat_timer; - struct bpf_program bpf; - char *filter_string; +}; + +struct osmo_pcap_client { + struct llist_head handles; /* list of struct osmo_pcap_handle */ + + char *filter_string; int filter_itself; int gprs_filtering; int snaplen; - struct osmo_fd fd; struct osmo_pcap_client_conn *conn; struct llist_head conns; @@ -111,12 +115,14 @@ struct osmo_pcap_client *osmo_pcap_client_alloc(void *tall_ctx); int vty_client_init(void); -int osmo_client_capture(struct osmo_pcap_client *client, const char *device); +int osmo_client_start_capture(struct osmo_pcap_client *client); int osmo_client_filter(struct osmo_pcap_client *client, const char *filter); struct osmo_pcap_client_conn *osmo_client_find_or_create_conn(struct osmo_pcap_client *, const char *name); struct osmo_pcap_client_conn *osmo_client_find_conn(struct osmo_pcap_client *, const char *name); +struct osmo_pcap_handle *osmo_client_find_handle(struct osmo_pcap_client *client, const char *devname); + struct osmo_pcap_client_conn *osmo_client_conn_alloc(struct osmo_pcap_client *client, const char *name); void osmo_client_conn_free(struct osmo_pcap_client_conn *conn); void osmo_client_conn_send_data(struct osmo_pcap_client_conn *conn, @@ -125,3 +131,8 @@ void osmo_client_conn_connect(struct osmo_pcap_client_conn *conn); void osmo_client_conn_disconnect(struct osmo_pcap_client_conn *conn); void osmo_client_conn_reconnect(struct osmo_pcap_client_conn *conn); + + +struct osmo_pcap_handle *osmo_pcap_handle_alloc(struct osmo_pcap_client *client, const char *devname); +void osmo_pcap_handle_free(struct osmo_pcap_handle *ph); +int osmo_pcap_handle_start_capture(struct osmo_pcap_handle *ph); diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 41f4dfc..009362c 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -102,6 +102,7 @@ static int can_forward_packet( struct osmo_pcap_client *client, + struct osmo_pcap_handle *ph, struct pcap_pkthdr *hdr, const u_char *data) { @@ -116,7 +117,7 @@ if (!client->gprs_filtering) return 1; - ll_type = pcap_datalink(client->handle); + ll_type = pcap_datalink(ph->handle); switch (ll_type) { case DLT_EN10MB: offset = 14; @@ -154,18 +155,19 @@ static int pcap_read_cb(struct osmo_fd *fd, unsigned int what) { - struct osmo_pcap_client *client = fd->data; + struct osmo_pcap_handle *ph = fd->data; + struct osmo_pcap_client *client = ph->client; struct osmo_pcap_client_conn *conn; struct pcap_pkthdr hdr; const u_char *data; - data = pcap_next(client->handle, &hdr); + data = pcap_next(ph->handle, &hdr); if (!data) { rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, CLIENT_CTR_PERR)); return -1; } - if (!can_forward_packet(client, &hdr, data)) + if (!can_forward_packet(client, ph, &hdr, data)) return 0; llist_for_each_entry(conn, &client->conns, entry) @@ -207,138 +209,90 @@ *old_val = new_val; } -static void pcap_check_stats_cb(void *_client) +static void pcap_check_stats_cb(void *_ph) { struct pcap_stat stat; - struct osmo_pcap_client *client = _client; + struct osmo_pcap_handle *ph = _ph; + struct osmo_pcap_client *client = ph->client; int rc; /* reschedule */ - osmo_timer_schedule(&client->pcap_stat_timer, 10, 0); + osmo_timer_schedule(&ph->pcap_stat_timer, 10, 0); memset(&stat, 0, sizeof(stat)); - rc = pcap_stats(client->handle, &stat); + rc = pcap_stats(ph->handle, &stat); if (rc != 0) { LOGP(DCLIENT, LOGL_ERROR, "Failed to query pcap stats: %s\n", - pcap_geterr(client->handle)); + pcap_geterr(ph->handle)); rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, CLIENT_CTR_PERR)); return; } - add_psbl_wrapped_ctr(client, &client->last_ps_recv, stat.ps_recv, CLIENT_CTR_P_RECV); - add_psbl_wrapped_ctr(client, &client->last_ps_drop, stat.ps_drop, CLIENT_CTR_P_DROP); - add_psbl_wrapped_ctr(client, &client->last_ps_ifdrop, stat.ps_ifdrop, CLIENT_CTR_P_IFDROP); + 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); } -static int osmo_install_filter(struct osmo_pcap_client *client) +static int osmo_pcap_handle_install_filter(struct osmo_pcap_handle *ph) { int rc; - pcap_freecode(&client->bpf); + pcap_freecode(&ph->bpf); - if (!client->handle) { + if (!ph->handle) { LOGP(DCLIENT, LOGL_NOTICE, "Filter will only be applied later.\n"); - return 1; + return 0; } - rc = pcap_compile(client->handle, &client->bpf, - client->filter_string, 1, PCAP_NETMASK_UNKNOWN); + rc = pcap_compile(ph->handle, &ph->bpf, + ph->client->filter_string, 1, PCAP_NETMASK_UNKNOWN); if (rc != 0) { LOGP(DCLIENT, LOGL_ERROR, "Failed to compile the filter: %s\n", - pcap_geterr(client->handle)); + pcap_geterr(ph->handle)); return rc; } - rc = pcap_setfilter(client->handle, &client->bpf); + rc = pcap_setfilter(ph->handle, &ph->bpf); if (rc != 0) { LOGP(DCLIENT, LOGL_ERROR, "Failed to set the filter on the interface: %s\n", - pcap_geterr(client->handle)); - pcap_freecode(&client->bpf); + pcap_geterr(ph->handle)); + pcap_freecode(&ph->bpf); return rc; } return rc; } -static void free_all(struct osmo_pcap_client *client) +int osmo_client_start_capture(struct osmo_pcap_client *client) { - if (!client->handle) - return; - - pcap_freecode(&client->bpf); - - if (client->fd.fd >= 0) { - osmo_fd_unregister(&client->fd); - client->fd.fd = -1; - } - - pcap_close(client->handle); - osmo_timer_del(&client->pcap_stat_timer); - client->handle = NULL; -} - -int osmo_client_capture(struct osmo_pcap_client *client, const char *device) -{ + struct osmo_pcap_handle *ph; struct osmo_pcap_client_conn *conn; - int fd; + int rc; - talloc_free(client->device); - free_all(client); - - client->device = talloc_strdup(client, device); - if (!client->device) { - LOGP(DCLIENT, LOGL_ERROR, "Failed to copy string.\n"); - return 1; + llist_for_each_entry(ph, &client->handles, entry) { + rc = osmo_pcap_handle_start_capture(ph); + if (rc < 0) + return rc; } - LOGP(DCLIENT, LOGL_INFO, "Opening device %s for capture with snaplen %zu\n", - client->device, (size_t) client->snaplen); - client->handle = pcap_open_live(client->device, client->snaplen, 0, - 1000, client->errbuf); - if (!client->handle) { - LOGP(DCLIENT, LOGL_ERROR, - "Failed to open the device: %s\n", client->errbuf); - return 2; - } - - fd = pcap_fileno(client->handle); - if (fd == -1) { - LOGP(DCLIENT, LOGL_ERROR, - "No file descriptor provided.\n"); - free_all(client); - return 3; - } - - osmo_fd_setup(&client->fd, fd, OSMO_FD_READ, pcap_read_cb, client, 0); - if (osmo_fd_register(&client->fd) != 0) { - LOGP(DCLIENT, LOGL_ERROR, - "Failed to register the fd.\n"); - client->fd.fd = -1; - free_all(client); - return 4; - } - - client->pcap_stat_timer.data = client; - client->pcap_stat_timer.cb = pcap_check_stats_cb; - pcap_check_stats_cb(client); - llist_for_each_entry(conn, &client->conns, entry) osmo_client_conn_send_link(conn); - - if (client->filter_string) { - osmo_install_filter(client); - } - return 0; } int osmo_client_filter(struct osmo_pcap_client *client, const char *filter) { + struct osmo_pcap_handle *ph; + int rc = 0; talloc_free(client->filter_string); client->filter_string = talloc_strdup(client, filter); - return osmo_install_filter(client); + + llist_for_each_entry(ph, &client->handles, entry) + rc |= osmo_pcap_handle_install_filter(ph); + + return rc; } struct osmo_pcap_client *osmo_pcap_client_alloc(void *tall_ctx) @@ -348,8 +302,8 @@ if (!client) return NULL; - client->fd.fd = -1; client->snaplen = DEFAULT_SNAPLEN; + INIT_LLIST_HEAD(&client->handles); INIT_LLIST_HEAD(&client->conns); return client; @@ -407,3 +361,89 @@ conn = osmo_client_conn_alloc(client, name); return conn; } + +struct osmo_pcap_handle *osmo_client_find_handle(struct osmo_pcap_client *client, const char *devname) +{ + struct osmo_pcap_handle *ph; + + llist_for_each_entry(ph, &client->handles, entry) + if (strcmp(ph->devname, devname) == 0) + return ph; + return NULL; +} + +struct osmo_pcap_handle *osmo_pcap_handle_alloc(struct osmo_pcap_client *client, const char *devname) +{ + struct osmo_pcap_handle *ph; + + ph = talloc_zero(client, struct osmo_pcap_handle); + OSMO_ASSERT(ph); + + ph->devname = talloc_strdup(ph, devname); + OSMO_ASSERT(ph->devname); + + ph->client = client; + ph->fd.fd = -1; + + llist_add_tail(&ph->entry, &client->handles); + return ph; +} + +void osmo_pcap_handle_free(struct osmo_pcap_handle *ph) +{ + if (!ph) + return; + llist_del(&ph->entry); + + osmo_timer_del(&ph->pcap_stat_timer); + + pcap_freecode(&ph->bpf); + + if (ph->fd.fd >= 0) { + osmo_fd_unregister(&ph->fd); + ph->fd.fd = -1; + } + + if (ph->handle) { + pcap_close(ph->handle); + ph->handle = NULL; + } + + talloc_free(ph); +} + +int osmo_pcap_handle_start_capture(struct osmo_pcap_handle *ph) +{ + struct osmo_pcap_client *client = ph->client; + int fd; + char errbuf[PCAP_ERRBUF_SIZE]; + + LOGP(DCLIENT, LOGL_INFO, "Opening device %s for capture with snaplen %zu\n", + ph->devname, (size_t) client->snaplen); + ph->handle = pcap_open_live(ph->devname, client->snaplen, 0, 1000, errbuf); + if (!ph->handle) { + LOGP(DCLIENT, LOGL_ERROR, + "Failed to open the device: %s\n", errbuf); + return -2; + } + + fd = pcap_fileno(ph->handle); + if (fd == -1) { + LOGP(DCLIENT, LOGL_ERROR, "No file descriptor provided.\n"); + return -3; + } + + osmo_fd_setup(&ph->fd, fd, OSMO_FD_READ, pcap_read_cb, ph, 0); + if (osmo_fd_register(&ph->fd) != 0) { + LOGP(DCLIENT, LOGL_ERROR, + "Failed to register the fd.\n"); + return -4; + } + + osmo_timer_setup(&ph->pcap_stat_timer, pcap_check_stats_cb, ph); + pcap_check_stats_cb(ph); + + if (client->filter_string) + osmo_pcap_handle_install_filter(ph); + return 0; +} diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index c7af965..3fa0ae4 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -283,6 +283,11 @@ exit(1); } + rc = osmo_client_start_capture(pcap_client); + if (rc < 0) { + LOGP(DCLIENT, LOGL_ERROR, "Failed to start capturing on interfaces\n"); + exit(1); + } /* attempt to connect to the remote */ if (pcap_client->conn->srv_ip && pcap_client->conn->srv_port > 0) diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index 52246d4..e27a91f 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -169,6 +169,7 @@ struct osmo_pcap_pkthdr *hdr; struct msgb *msg; int offset, ip_len; + struct osmo_pcap_handle *ph; if (in_hdr->len > in_hdr->caplen) { LOGP(DCLIENT, LOGL_ERROR, @@ -204,7 +205,13 @@ rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_PKTS)); break; case PROTOCOL_IPIP: - offset = get_iphdr_offset(pcap_datalink(conn->client->handle)); + /* TODO: support capturing from multiple interfaces here: */ + ph = llist_first_entry_or_null(&conn->client->handles, struct osmo_pcap_handle, entry); + if (!ph) { + msgb_free(msg); + return; + } + offset = get_iphdr_offset(pcap_datalink(ph->handle)); if (offset < 0) { msgb_free(msg); return; @@ -226,6 +233,7 @@ void osmo_client_conn_send_link(struct osmo_pcap_client_conn *conn) { + struct osmo_pcap_handle *ph; struct pcap_file_header *hdr; struct osmo_pcap_data *om_hdr; struct msgb *msg; @@ -234,7 +242,9 @@ if (conn->protocol == PROTOCOL_IPIP) return; - if (!conn->client->handle) { + /* TODO: support capturing from multiple interfaces here: */ + ph = llist_first_entry_or_null(&conn->client->handles, struct osmo_pcap_handle, entry); + if (!ph || !ph->handle) { LOGP(DCLIENT, LOGL_ERROR, "No pcap_handle not sending link info to conn=%s\n", conn->name); return; @@ -258,7 +268,7 @@ hdr->thiszone = 0; hdr->sigfigs = 0; hdr->snaplen = conn->client->snaplen; - hdr->linktype = pcap_datalink(conn->client->handle); + hdr->linktype = pcap_datalink(ph->handle); write_data(conn, msg); } diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index 84f7e05..c976a1a 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -126,11 +126,14 @@ static int config_write_client(struct vty *vty) { + struct osmo_pcap_handle *ph; + vty_out(vty, "client%s", VTY_NEWLINE); - if (pcap_client->device) + llist_for_each_entry(ph, &pcap_client->handles, entry) { vty_out(vty, " pcap device %s%s", - pcap_client->device, VTY_NEWLINE); + ph->devname, VTY_NEWLINE); + } if (pcap_client->snaplen != DEFAULT_SNAPLEN) vty_out(vty, " pcap snaplen %d%s", pcap_client->snaplen, VTY_NEWLINE); @@ -147,12 +150,34 @@ return CMD_SUCCESS; } +DEFUN(cfg_client_no_device, + cfg_client_no_device_cmd, + "no pcap device NAME", + NO_STR 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) { + vty_out(vty, "%% Device %s not found!%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + osmo_pcap_handle_free(ph); + return CMD_SUCCESS; +} + DEFUN(cfg_client_device, cfg_client_device_cmd, "pcap device NAME", PCAP_STRING "the device to filter\n" "device name\n") { - osmo_client_capture(pcap_client, argv[0]); + 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; + } + osmo_pcap_handle_alloc(pcap_client, argv[0]); + } return CMD_SUCCESS; } @@ -161,10 +186,6 @@ "pcap snaplen <1-262144>", /* MAXIMUM_SNAPLEN */ PCAP_STRING "snapshot length\n" "Bytes\n") { - if (pcap_client->handle) { - vty_out(vty, "'pcap snaplen' must be set before 'pcap device' to take effect!%s", VTY_NEWLINE); - return CMD_WARNING; - } pcap_client->snaplen = atoi(argv[0]); return CMD_SUCCESS; } @@ -544,6 +565,7 @@ install_node(&server_node, config_write_server); + install_element(CLIENT_NODE, &cfg_client_no_device_cmd); install_element(CLIENT_NODE, &cfg_client_device_cmd); install_element(CLIENT_NODE, &cfg_client_snaplen_cmd); install_element(CLIENT_NODE, &cfg_client_filter_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39170?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: I02f33f11cbcb7ed5ff6475df9442741618178379 Gerrit-Change-Number: 39170 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

[S] Change in osmo-pcap[master]: pcap-client: Improve pcap_handle logging
by pespin 24 Dec '24

24 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39171?usp=email ) Change subject: pcap-client: Improve pcap_handle logging ...................................................................... pcap-client: Improve pcap_handle logging Change-Id: I917091fa993e903493ede39cd7164a830716250f --- M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_core.c 2 files changed, 14 insertions(+), 18 deletions(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 6725201..7641ef1 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -136,3 +136,6 @@ struct osmo_pcap_handle *osmo_pcap_handle_alloc(struct osmo_pcap_client *client, const char *devname); void osmo_pcap_handle_free(struct osmo_pcap_handle *ph); int osmo_pcap_handle_start_capture(struct osmo_pcap_handle *ph); + +#define LOGPH(ph, lvl, fmt, args...) \ + LOGP(DCLIENT, lvl, "PH(%s) " fmt, (ph)->devname, ## args) diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 009362c..bde40d3 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -126,8 +126,8 @@ offset = 16; break; default: - LOGP(DCLIENT, LOGL_ERROR, "LL type %d/%s not handled.\n", - ll_type, pcap_datalink_val_to_name(ll_type)); + LOGPH(ph, LOGL_ERROR, "LL type %d/%s not handled.\n", + ll_type, pcap_datalink_val_to_name(ll_type)); return 1; } @@ -222,8 +222,7 @@ memset(&stat, 0, sizeof(stat)); rc = pcap_stats(ph->handle, &stat); if (rc != 0) { - LOGP(DCLIENT, LOGL_ERROR, "Failed to query pcap stats: %s\n", - pcap_geterr(ph->handle)); + 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)); return; } @@ -239,28 +238,25 @@ pcap_freecode(&ph->bpf); if (!ph->handle) { - LOGP(DCLIENT, LOGL_NOTICE, - "Filter will only be applied later.\n"); + LOGPH(ph, LOGL_NOTICE, "Filter will only be applied later\n"); return 0; } rc = pcap_compile(ph->handle, &ph->bpf, ph->client->filter_string, 1, PCAP_NETMASK_UNKNOWN); if (rc != 0) { - LOGP(DCLIENT, LOGL_ERROR, - "Failed to compile the filter: %s\n", + LOGPH(ph, LOGL_ERROR, "Failed to compile the filter: %s\n", pcap_geterr(ph->handle)); return rc; } rc = pcap_setfilter(ph->handle, &ph->bpf); if (rc != 0) { - LOGP(DCLIENT, LOGL_ERROR, - "Failed to set the filter on the interface: %s\n", - pcap_geterr(ph->handle)); + LOGPH(ph, LOGL_ERROR, "Failed to set the filter on the interface: %s\n", pcap_geterr(ph->handle)); pcap_freecode(&ph->bpf); return rc; } + LOGPH(ph, LOGL_INFO, "Filter applied\n"); return rc; } @@ -418,25 +414,22 @@ int fd; char errbuf[PCAP_ERRBUF_SIZE]; - LOGP(DCLIENT, LOGL_INFO, "Opening device %s for capture with snaplen %zu\n", - ph->devname, (size_t) client->snaplen); + LOGPH(ph, LOGL_INFO, "Opening device for capture with snaplen %zu\n", (size_t) client->snaplen); ph->handle = pcap_open_live(ph->devname, client->snaplen, 0, 1000, errbuf); if (!ph->handle) { - LOGP(DCLIENT, LOGL_ERROR, - "Failed to open the device: %s\n", errbuf); + LOGPH(ph, LOGL_ERROR, "Failed to open the device: %s\n", errbuf); return -2; } fd = pcap_fileno(ph->handle); if (fd == -1) { - LOGP(DCLIENT, LOGL_ERROR, "No file descriptor provided.\n"); + LOGPH(ph, LOGL_ERROR, "No file descriptor provided.\n"); return -3; } osmo_fd_setup(&ph->fd, fd, OSMO_FD_READ, pcap_read_cb, ph, 0); if (osmo_fd_register(&ph->fd) != 0) { - LOGP(DCLIENT, LOGL_ERROR, - "Failed to register the fd.\n"); + LOGPH(ph, LOGL_ERROR, "Failed to register the fd.\n"); return -4; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39171?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: I917091fa993e903493ede39cd7164a830716250f Gerrit-Change-Number: 39171 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

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

24 Dec '24

Attention is currently required from: pespin. fixeria 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 2: Code-Review+2 (1 comment) File doc/manuals/chapters/server.adoc: https://gerrit.osmocom.org/c/osmo-pcap/+/39201/comment/a1edeca1_3302b2a3?us… : PS2, Line 138: wants users ... want -- 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: 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 14:00:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

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

24 Dec '24

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39200?usp=email ) Change subject: pcap-server: Resolve real path of pcap file before opening ...................................................................... Patch Set 1: Code-Review+2 -- 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: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I8d161010dc8b480dd4cf90e19ca28a77914a50ad Gerrit-Change-Number: 39200 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 13:57:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

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

24 Dec '24

Attention is currently required from: laforge, pespin. fixeria 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 1: Code-Review+1 -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 13:55:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-pcap[master]: pcap-server: Move struct osmo_pcap_server alloc to its own helper fun...
by fixeria 24 Dec '24

24 Dec '24

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39191?usp=email ) Change subject: pcap-server: Move struct osmo_pcap_server alloc to its own helper function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39191?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: Ie3b96ed6f47c966e2e12ab99710ac6af1468f963 Gerrit-Change-Number: 39191 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 13:53:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log