December 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-mgw[master]: mgcp-cli: Fix filling in wrong local IP address of SDP Origin o=

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39180?usp=email ) Change subject: mgcp-cli: Fix filling in wrong local IP address of SDP Origin o= ...................................................................... mgcp-cli: Fix filling in wrong local IP address of SDP Origin o= If user (VTY) configured the local IP address to use for MGCP, and that IP address was not the one selected by kernel routing table lookup, the IP address filled in the MGCP message would be wrong, not matching the one sending the MGCP message. Change-Id: I35624db853dc1f0fee85503105960613f70473c6 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 34 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/80/39180/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 1c89e69..8a7c1f6 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1320,6 +1320,36 @@ #undef MSGB_PRINTF_OR_RET } +/* Helper function to obtain local IP address used in MGCP towards MGW, + * in string format, to fill the SDP "Origin" ("o=") field. + * return 0 on success, negative on error. + */ +static int get_mgcp_local_addr(const struct mgcp_client *mgcp, char *local_ip, size_t local_ip_len) +{ + int fd; + + /* Try to get the socket local IP address if available: */ + if (mgcp->iofd && ((fd = osmo_iofd_get_fd(mgcp->iofd)) >= 0)) { + if (osmo_sock_get_local_ip(fd, local_ip, local_ip_len) == 0) + return 0; + /* else: continue below */ + } + + /* If MGCP local address was explicitly specified in config, use it: */ + if (mgcp->actual.local_addr) { + osmo_strlcpy(local_ip, mgcp->actual.local_addr, local_ip_len); + return 0; + } + + /* Guess our local address based on system routing towards MGW: */ + OSMO_ASSERT(local_ip_len >= INET6_ADDRSTRLEN); + if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) == 0) + return 0; + + LOGPMGW(mgcp, LOGL_ERROR, "Could not determine local IP-Address!\n"); + return -EINVAL; +} + /* Helper function for mgcp_msg_gen(): Add SDP information to MGCP message */ static int add_sdp(struct msgb *msg, struct mgcp_msg *mgcp_msg, struct mgcp_client *mgcp) { @@ -1329,6 +1359,7 @@ const char *codec; unsigned int pt; uint16_t audio_port; + int rc; #define MSGB_PRINTF_OR_RET(FMT, ARGS...) do { \ if (msgb_printf(msg, FMT, ##ARGS) != 0) { \ @@ -1344,13 +1375,9 @@ MSGB_PRINTF_OR_RET("v=0\r\n"); /* Determine local IP-Address */ - if (mgcp->actual.local_addr) { - OSMO_STRLCPY_ARRAY(local_ip, mgcp->actual.local_addr); - } else if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) < 0) { - LOGPMGW(mgcp, LOGL_ERROR, - "Could not determine local IP-Address!\n"); - return -EINVAL; - } + rc = get_mgcp_local_addr(mgcp, local_ip, sizeof(local_ip)); + if (rc < 0) + return rc; local_ip_family = osmo_ip_str_type(local_ip); if (local_ip_family == AF_UNSPEC) return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39180?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I35624db853dc1f0fee85503105960613f70473c6 Gerrit-Change-Number: 39180 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp-cli: Improve error handling around mgcp_msg_gen() return

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39179?usp=email ) Change subject: mgcp-cli: Improve error handling around mgcp_msg_gen() return ...................................................................... mgcp-cli: Improve error handling around mgcp_msg_gen() return Change-Id: Ib9b02b7e6b37472c8e38b3380bc990a2bbac0657 --- M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c 2 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/79/39179/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 09b1953..1c89e69 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -864,6 +864,10 @@ }; osmo_strlcpy(mgcp_msg_dlcx.endpoint, epname, sizeof(mgcp_msg_dlcx.endpoint)); msgb_dlcx = mgcp_msg_gen(mgcp, &mgcp_msg_dlcx); + if (msgb_dlcx) { + LOGPMGW(mgcp, LOGL_ERROR, "Failed generating MGCP DLCX %s\n", epname); + return; + } mgcp_client_tx(mgcp, msgb_dlcx, &_ignore_mgcp_response, NULL); } @@ -877,6 +881,10 @@ }; OSMO_STRLCPY_ARRAY(mgcp_msg_auep.endpoint, epname); msgb_auep = mgcp_msg_gen(mgcp, &mgcp_msg_auep); + if (msgb_auep) { + LOGPMGW(mgcp, LOGL_ERROR, "Failed generating MGCP AUEP %s\n", epname); + return; + } mgcp_client_tx(mgcp, msgb_auep, &_ignore_mgcp_response, NULL); } @@ -1336,7 +1344,9 @@ MSGB_PRINTF_OR_RET("v=0\r\n"); /* Determine local IP-Address */ - if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) < 0) { + if (mgcp->actual.local_addr) { + OSMO_STRLCPY_ARRAY(local_ip, mgcp->actual.local_addr); + } else if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) < 0) { LOGPMGW(mgcp, LOGL_ERROR, "Could not determine local IP-Address!\n"); return -EINVAL; diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index e638d1e..7a6fed8 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -157,6 +157,7 @@ mgcp_msg->conn_mode = conn_mode; } +/* returns message buffer containing MGXP MDCX on success, NULL on error. */ static struct msgb *make_mdcx_msg(struct mgcp_ctx *mgcp_ctx) { struct mgcp_msg mgcp_msg; @@ -192,6 +193,7 @@ return mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); } +/* returns message buffer containing MGXP DLCX on success, NULL on error. */ struct msgb *make_dlcx_msg(struct mgcp_ctx *mgcp_ctx) { struct mgcp_msg mgcp_msg; @@ -231,8 +233,10 @@ set_conn_mode(&mgcp_msg, &mgcp_ctx->conn_peer_local); msg = mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); - OSMO_ASSERT(msg); - + if (!msg) { + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); + return; + } mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg); mgcp_ctx->mgw_trans_pending = true; rc = mgcp_client_tx(mgcp, msg, mgw_crcx_resp_cb, fi); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39179?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib9b02b7e6b37472c8e38b3380bc990a2bbac0657 Gerrit-Change-Number: 39179 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[XS] Change in osmo-mgw[master]: mgcp-cli: Mark iofd ptr as NULL when freed

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39178?usp=email ) Change subject: mgcp-cli: Mark iofd ptr as NULL when freed ...................................................................... mgcp-cli: Mark iofd ptr as NULL when freed Change-Id: Ie3cd7b49c9cd5514f81289ac5ec1ccee14c8509c --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/78/39178/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index e577b34..09b1953 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1051,6 +1051,7 @@ osmo_iofd_txqueue_clear(mgcp->iofd); LOGPMGW(mgcp, LOGL_INFO, "MGCP association: %s -- closed!\n", osmo_iofd_get_name(mgcp->iofd)); osmo_iofd_free(mgcp->iofd); + mgcp->iofd = NULL; } /*! Get the IP-Aaddress of the associated MGW as string. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39178?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie3cd7b49c9cd5514f81289ac5ec1ccee14c8509c Gerrit-Change-Number: 39178 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[XS] Change in osmo-mgw[master]: mgcp_client_internal.h: Add missing header dependency

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39177?usp=email ) Change subject: mgcp_client_internal.h: Add missing header dependency ...................................................................... mgcp_client_internal.h: Add missing header dependency struct mgcp_client defined here has a field "struct mgcp_client_conf actual", which is defined in osmocom/mgcp_client/mgcp_client.h. Change-Id: I61a67c371dbcfab073fa75ba08a3cac0f46e0ac0 --- M include/osmocom/mgcp_client/mgcp_client_internal.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/77/39177/1 diff --git a/include/osmocom/mgcp_client/mgcp_client_internal.h b/include/osmocom/mgcp_client/mgcp_client_internal.h index 26fbc7d..ac55dfc 100644 --- a/include/osmocom/mgcp_client/mgcp_client_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_internal.h @@ -3,6 +3,8 @@ #include <osmocom/core/osmo_io.h> #include <osmocom/core/timer.h> +#include <osmocom/mgcp_client/mgcp_client.h> + #define MSGB_CB_MGCP_TRANS_ID 0 /* Struct that holds one endpoint name */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39177?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I61a67c371dbcfab073fa75ba08a3cac0f46e0ac0 Gerrit-Change-Number: 39177 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[M] Change in osmo-pcap[master]: pcap-client: Add per iface counter group instance

by pespin

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>

6 months, 1 week

1
0
0 0

[M] Change in osmo-pcap[master]: pcap-client: Move stats to its own file

by pespin

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>

6 months, 1 week

1
0
0 0

[XS] Change in osmo-pcap[master]: pcap-client: Allow recording on several interfaces

by pespin

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>

6 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-client,pcap-server: Use rate_ctr_inc2 and rate_ctr_add2 APIs

by pespin

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>

6 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-client: Improve pcap_handle logging

by pespin

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>

6 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-client: Improve conn logging

by pespin

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>

6 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024