- gerrit-log - lists.osmocom.org

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

18 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39175?usp=email ) 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/75/39175/1 diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 8b7c06e..605d80b 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -50,6 +50,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, @@ -87,6 +95,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; @@ -95,10 +104,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; @@ -143,4 +155,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 9fde091..6271f54 100644 --- a/src/osmo_client_stats.c +++ b/src/osmo_client_stats.c @@ -36,6 +36,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: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I0a35f8258eedb785ddb3311f94b42707f0045c32 Gerrit-Change-Number: 39175 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

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

18 Dec '24

pespin has uploaded this change for review. ( 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, 74 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/73/39173/1 diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 8ad5ffa..8b7c06e 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -28,13 +28,14 @@ #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 +48,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..9fde091 --- /dev/null +++ b/src/osmo_client_stats.c @@ -0,0 +1,59 @@ +/* + * 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 <osmocom/vty/logging.h> +#include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/stats.h> +#include <osmocom/vty/misc.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: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I4b5ecdd6f9b0c646dd03ca3bc7fa24624fb9fcbc Gerrit-Change-Number: 39173 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

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

18 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39176?usp=email ) 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/76/39176/1 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: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I082b0bd38cf1829937c5e643f0ee31f9d56a07a7 Gerrit-Change-Number: 39176 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

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

18 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39174?usp=email ) 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/74/39174/1 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 ce9c6e9..7babb24 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: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Idcc20646d252ad7bf61a740d900b31ca37ada280 Gerrit-Change-Number: 39174 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

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

18 Dec '24

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/71/39171/1 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: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I917091fa993e903493ede39cd7164a830716250f Gerrit-Change-Number: 39171 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

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

18 Dec '24

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/72/39172/1 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: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I078557144a2604e343ed0b44f72035a4eda8a674 Gerrit-Change-Number: 39172 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: pcap-client: Move conns llist initialization to constructor
by pespin 18 Dec '24

18 Dec '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcap/+/39165?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: pcap-client: Move conns llist initialization to constructor ...................................................................... pcap-client: Move conns llist initialization to constructor Change-Id: Ib67efa0579755a117c7680f490916e37165204cc --- M src/osmo_client_core.c M src/osmo_client_main.c 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/65/39165/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39165?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: Ib67efa0579755a117c7680f490916e37165204cc Gerrit-Change-Number: 39165 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in osmo-pcap[master]: pcap-client: Alloc default client conn similarly to other ones
by pespin 18 Dec '24

18 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39167?usp=email ) Change subject: pcap-client: Alloc default client conn similarly to other ones ...................................................................... pcap-client: Alloc default client conn similarly to other ones Allocate the 1st default conn the same way as the other ones. The only real difference between the 1st one and the subsequent ones is how is it represented in the VTY tree. Change-Id: I4ead7b1b04a97a329cd1a299bde9de18b5f643a7 --- M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_core.c M src/osmo_client_main.c M src/osmo_client_vty.c 4 files changed, 18 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/67/39167/1 diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 5bc203a..159e6ae 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -99,7 +99,7 @@ int snaplen; struct osmo_fd fd; - struct osmo_pcap_client_conn conn; + struct osmo_pcap_client_conn *conn; struct llist_head conns; /* statistics */ @@ -126,4 +126,4 @@ 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); -void osmo_client_conn_init(struct osmo_pcap_client_conn *conn, struct osmo_pcap_client *client); +struct osmo_pcap_client_conn *osmo_client_conn_alloc(struct osmo_pcap_client *client, const char *name); diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index f858e17..931dd98 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -168,7 +168,6 @@ if (!can_forward_packet(client, &hdr, data)) return 0; - osmo_client_send_data(&client->conn, &hdr, data); llist_for_each_entry(conn, &client->conns, entry) osmo_client_send_data(conn, &hdr, data); return 0; @@ -318,7 +317,6 @@ client->pcap_stat_timer.cb = pcap_check_stats_cb; pcap_check_stats_cb(client); - osmo_client_send_link(&client->conn); llist_for_each_entry(conn, &client->conns, entry) osmo_client_send_link(conn); @@ -336,15 +334,6 @@ return osmo_install_filter(client); } -void osmo_client_conn_init(struct osmo_pcap_client_conn *conn, - struct osmo_pcap_client *client) -{ - conn->client = client; - conn->tls_verify = true; - osmo_wqueue_init(&conn->wqueue, WQUEUE_MAXLEN_DEFAULT); - conn->wqueue.bfd.fd = -1; -} - struct osmo_pcap_client *osmo_pcap_client_alloc(void *tall_ctx) { struct osmo_pcap_client *client; @@ -391,7 +380,11 @@ conn->name = talloc_strdup(conn, name); OSMO_ASSERT(conn->name); - osmo_client_conn_init(conn, client); + conn->client = client; + conn->tls_verify = true; + osmo_wqueue_init(&conn->wqueue, WQUEUE_MAXLEN_DEFAULT); + conn->wqueue.bfd.fd = -1; + llist_add_tail(&conn->entry, &client->conns); return conn; } diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index c523df3..d8d7a07 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -261,10 +261,6 @@ exit(1); } - /* initialize the queue */ - osmo_client_conn_init(&pcap_client->conn, pcap_client); - pcap_client->conn.name = "default"; - /* initialize the stats interface */ pcap_client->ctrg = rate_ctr_group_alloc(pcap_client, &pcap_client_ctr_group_desc, 0); if (!pcap_client->ctrg) { @@ -272,6 +268,9 @@ exit(1); } + /* Default conn, always present. */ + pcap_client->conn = osmo_client_conn_alloc(pcap_client, "default"); + if (vty_read_config_file(config_file, NULL) < 0) { LOGP(DCLIENT, LOGL_ERROR, "Failed to parse the config file: %s\n", config_file); @@ -286,8 +285,8 @@ /* attempt to connect to the remote */ - if (pcap_client->conn.srv_ip && pcap_client->conn.srv_port > 0) - osmo_client_connect(&pcap_client->conn); + if (pcap_client->conn->srv_ip && pcap_client->conn->srv_port > 0) + osmo_client_connect(pcap_client->conn); if (daemonize) { rc = osmo_daemonize(); diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index 8e21d67..8888e66 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -40,7 +40,7 @@ static struct osmo_pcap_client_conn *get_conn(struct vty *vty) { if (vty->node == CLIENT_NODE) - return &pcap_client->conn; + return pcap_client->conn; return vty->index; } @@ -115,6 +115,8 @@ struct osmo_pcap_client_conn *conn; llist_for_each_entry(conn, &pcap_client->conns, entry) { + if (conn == pcap_client->conn) + continue; vty_out(vty, " pcap-store-connection %s%s", conn->name, VTY_NEWLINE); write_client_conn_data(vty, conn, " "); vty_out(vty, " connect%s", VTY_NEWLINE); @@ -141,7 +143,7 @@ vty_out(vty, " pcap add-filter gprs%s", VTY_NEWLINE); - write_client_conn_data(vty, &pcap_client->conn, ""); + write_client_conn_data(vty, pcap_client->conn, ""); return CMD_SUCCESS; } @@ -445,7 +447,7 @@ { struct osmo_pcap_client_conn *conn; conn = osmo_client_find_or_create_conn(pcap_client, argv[0]); - if (!conn) { + if (!conn || conn == pcap_client->conn) { vty_out(vty, "%%Failed to find/create conection %s%s", argv[0], VTY_NEWLINE); return CMD_WARNING; @@ -463,7 +465,7 @@ { struct osmo_pcap_client_conn *conn; conn = osmo_client_find_conn(pcap_client, argv[0]); - if (!conn) { + if (!conn || conn == pcap_client->conn) { vty_out(vty, "%%Failed to find connection %s%ss", argv[0], VTY_NEWLINE); return CMD_WARNING; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39167?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I4ead7b1b04a97a329cd1a299bde9de18b5f643a7 Gerrit-Change-Number: 39167 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: pcap-client: Split client-conn allocation to its own constructor func...
by pespin 18 Dec '24

18 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39166?usp=email ) Change subject: pcap-client: Split client-conn allocation to its own constructor function ...................................................................... pcap-client: Split client-conn allocation to its own constructor function Preparation patch towards follow-up changes. Also makes it easier to spot whre this struct is allocated. Change-Id: I0cea59f9a94cf1233c2df6ea844a1c5599123d64 --- M src/osmo_client_core.c 1 file changed, 21 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/66/39166/1 diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 11ba7c9..f858e17 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -379,28 +379,31 @@ return NULL; } +struct osmo_pcap_client_conn *osmo_client_conn_alloc( + struct osmo_pcap_client *client, + const char *name) +{ + struct osmo_pcap_client_conn *conn; + + conn = talloc_zero(client, struct osmo_pcap_client_conn); + OSMO_ASSERT(conn); + + conn->name = talloc_strdup(conn, name); + OSMO_ASSERT(conn->name); + + osmo_client_conn_init(conn, client); + llist_add_tail(&conn->entry, &client->conns); + return conn; +} + struct osmo_pcap_client_conn *osmo_client_find_or_create_conn( struct osmo_pcap_client *client, const char *name) { - struct osmo_pcap_client_conn *conn = osmo_client_find_conn(client, name);; + struct osmo_pcap_client_conn *conn; - if (conn) - return conn; - - conn = talloc_zero(client, struct osmo_pcap_client_conn); - if (!conn) { - LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate conn for %s\n", name); - return NULL; - } - conn->name = talloc_strdup(conn, name); - if (!conn->name) { - LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate name for %s\n", name); - talloc_free(conn); - return NULL; - } - - osmo_client_conn_init(conn, client); - llist_add_tail(&conn->entry, &client->conns); + conn = osmo_client_find_conn(client, name); + if (!conn) + conn = osmo_client_conn_alloc(client, name); return conn; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39166?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I0cea59f9a94cf1233c2df6ea844a1c5599123d64 Gerrit-Change-Number: 39166 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-pcap[master]: pcap-client: Add missing '_conn' in function names
by pespin 18 Dec '24

18 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39168?usp=email ) Change subject: pcap-client: Add missing '_conn' in function names ...................................................................... pcap-client: Add missing '_conn' in function names Change-Id: Ide92b28938b89ea1130d89dd0243607c861045f2 --- 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, 30 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/68/39168/1 diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 159e6ae..ce2fb8f 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -114,16 +114,14 @@ int osmo_client_capture(struct osmo_pcap_client *client, const char *device); int osmo_client_filter(struct osmo_pcap_client *client, const char *filter); -void osmo_client_send_data(struct osmo_pcap_client_conn *client, - struct pcap_pkthdr *hdr, const uint8_t *data); -void osmo_client_send_link(struct osmo_pcap_client_conn *client); -void osmo_client_connect(struct osmo_pcap_client_conn *); -void osmo_client_disconnect(struct osmo_pcap_client_conn *); -void osmo_client_free(struct osmo_pcap_client_conn *); - -void osmo_client_reconnect(struct osmo_pcap_client_conn *); - 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_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, + struct pcap_pkthdr *hdr, const uint8_t *data); +void osmo_client_conn_send_link(struct osmo_pcap_client_conn *conn); +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); diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 931dd98..e6e5a38 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -169,7 +169,7 @@ return 0; llist_for_each_entry(conn, &client->conns, entry) - osmo_client_send_data(conn, &hdr, data); + osmo_client_conn_send_data(conn, &hdr, data); return 0; } @@ -318,7 +318,7 @@ pcap_check_stats_cb(client); llist_for_each_entry(conn, &client->conns, entry) - osmo_client_send_link(conn); + osmo_client_conn_send_link(conn); if (client->filter_string) { osmo_install_filter(client); @@ -348,9 +348,9 @@ return client; } -void osmo_client_free(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_free(struct osmo_pcap_client_conn *conn) { - osmo_client_disconnect(conn); + osmo_client_conn_disconnect(conn); llist_del(&conn->entry); talloc_free(conn); } diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index d8d7a07..c7af965 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -286,7 +286,7 @@ /* attempt to connect to the remote */ if (pcap_client->conn->srv_ip && pcap_client->conn->srv_port > 0) - osmo_client_connect(pcap_client->conn); + osmo_client_conn_connect(pcap_client->conn); if (daemonize) { rc = osmo_daemonize(); diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index 9a430ab..52246d4 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -42,16 +42,16 @@ #include <string.h> #include <unistd.h> -static void _osmo_client_connect(void *_data) +static void _osmo_client_conn_connect(void *_data) { - osmo_client_connect((struct osmo_pcap_client_conn *) _data); + osmo_client_conn_connect((struct osmo_pcap_client_conn *) _data); } static void lost_connection(struct osmo_pcap_client_conn *conn) { - osmo_client_disconnect(conn); + osmo_client_conn_disconnect(conn); - conn->timer.cb = _osmo_client_connect; + conn->timer.cb = _osmo_client_conn_connect; conn->timer.data = conn; osmo_timer_schedule(&conn->timer, 2, 0); } @@ -107,7 +107,7 @@ conn = container_of(session, struct osmo_pcap_client_conn, tls_session); osmo_wqueue_clear(&conn->wqueue); - osmo_client_send_link(conn); + osmo_client_conn_send_link(conn); } static void tls_error_cb(struct osmo_tls_session *session) @@ -141,7 +141,7 @@ conn->wqueue.bfd.cb = osmo_wqueue_bfd_cb; conn->wqueue.bfd.data = conn; osmo_wqueue_clear(&conn->wqueue); - osmo_client_send_link(conn); + osmo_client_conn_send_link(conn); } } @@ -162,8 +162,8 @@ } } -void osmo_client_send_data(struct osmo_pcap_client_conn *conn, - struct pcap_pkthdr *in_hdr, const uint8_t *data) +void osmo_client_conn_send_data(struct osmo_pcap_client_conn *conn, + struct pcap_pkthdr *in_hdr, const uint8_t *data) { struct osmo_pcap_data *om_hdr; struct osmo_pcap_pkthdr *hdr; @@ -224,7 +224,7 @@ write_data(conn, msg); } -void osmo_client_send_link(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_send_link(struct osmo_pcap_client_conn *conn) { struct pcap_file_header *hdr; struct osmo_pcap_data *om_hdr; @@ -263,14 +263,14 @@ write_data(conn, msg); } -void osmo_client_connect(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_connect(struct osmo_pcap_client_conn *conn) { int rc; uint16_t srv_port; int sock_type, sock_proto; unsigned int when; - osmo_client_disconnect(conn); + osmo_client_conn_disconnect(conn); conn->wqueue.read_cb = read_cb; conn->wqueue.write_cb = write_cb; @@ -309,12 +309,12 @@ rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_CONNECT)); } -void osmo_client_reconnect(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_reconnect(struct osmo_pcap_client_conn *conn) { lost_connection(conn); } -void osmo_client_disconnect(struct osmo_pcap_client_conn *conn) +void osmo_client_conn_disconnect(struct osmo_pcap_client_conn *conn) { if (conn->wqueue.bfd.fd >= 0) { osmo_tls_release(&conn->tls_session); diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index 8888e66..84f7e05 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -230,7 +230,7 @@ if (!conn->tls_on) { if (conn->wqueue.bfd.fd >= 0) - osmo_client_reconnect(conn); + osmo_client_conn_reconnect(conn); } conn->tls_on = true; @@ -245,7 +245,7 @@ struct osmo_pcap_client_conn *conn = get_conn(vty); if (conn->tls_on) - osmo_client_reconnect(conn); + osmo_client_conn_reconnect(conn); conn->tls_on = false; return CMD_SUCCESS; @@ -471,7 +471,7 @@ return CMD_WARNING; } - osmo_client_free(conn); + osmo_client_conn_free(conn); return CMD_SUCCESS; } @@ -482,7 +482,7 @@ { struct osmo_pcap_client_conn *conn = get_conn(vty); - osmo_client_connect(conn); + osmo_client_conn_connect(conn); return CMD_SUCCESS; } @@ -493,7 +493,7 @@ { struct osmo_pcap_client_conn *conn = get_conn(vty); - osmo_client_disconnect(conn); + osmo_client_conn_disconnect(conn); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39168?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ide92b28938b89ea1130d89dd0243607c861045f2 Gerrit-Change-Number: 39168 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log