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

[XS] Change in osmo-pcap[master]: pcap-client: Move conns llist initialization to constructor

by pespin

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

6 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-client: Alloc default client conn similarly to other ones

by pespin

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>

6 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-client: Split client-conn allocation to its own constructor func...

by pespin

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>

6 months, 1 week

1
0
0 0

[M] Change in osmo-pcap[master]: pcap-client: Add missing '_conn' in function names

by pespin

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>

6 months, 1 week

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-client: Split wrapped ctr generic calculation to helper function

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39169?usp=email ) Change subject: pcap-client: Split wrapped ctr generic calculation to helper function ...................................................................... pcap-client: Split wrapped ctr generic calculation to helper function This gives more freedom later on (follow-up patch) to rework how the osmocom rate_ctrs are incremented. Change-Id: I06722bcadf1e0b81fd11787153b0c1007c08a47b --- M src/osmo_client_core.c 1 file changed, 21 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/69/39169/1 diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index e6e5a38..41f4dfc 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -179,24 +179,31 @@ return ~val; } +static uint64_t get_psbl_wrapped_ctr(u_int old_val, u_int new_val) +{ + uint64_t ret; + /* + * Wrapped.. + * So let's at from N to XYZ_MAX + * and then from 0 to new_val + * Only issue is we don't know sizeof(u_int) + */ + if (old_val > new_val) { + ret = P_CAP_UINT_MAX() - old_val; + ret += new_val; + return ret; + } + /* old_val <= new_val, Just increment it */ + 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) { - /* - * Wrapped.. - * So let's at from N to XYZ_MAX - * and then from 0 to new_val - * Only issue is we don't know sizeof(u_int) - */ - if (*old_val > new_val) { - rate_ctr_add(rate_ctr_group_get_ctr(client->ctrg, ctr), P_CAP_UINT_MAX() - *old_val); - rate_ctr_add(rate_ctr_group_get_ctr(client->ctrg, ctr), new_val); - *old_val = new_val; - return; - } + uint64_t inc; - /* Just increment it */ - rate_ctr_add(rate_ctr_group_get_ctr(client->ctrg, ctr), new_val - *old_val); + inc = get_psbl_wrapped_ctr(*old_val, new_val); + rate_ctr_add(rate_ctr_group_get_ctr(client->ctrg, ctr), inc); *old_val = new_val; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39169?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: I06722bcadf1e0b81fd11787153b0c1007c08a47b Gerrit-Change-Number: 39169 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[L] Change in osmo-pcap[master]: pcap-client: Decouple dev capture handling from client

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/70/39170/1 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: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I02f33f11cbcb7ed5ff6475df9442741618178379 Gerrit-Change-Number: 39170 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: Move conns llist initialization to constructor

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39165?usp=email ) 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/1 diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 4bb4b4e..313fbeb 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -351,8 +351,11 @@ client = talloc_zero(tall_ctx, struct osmo_pcap_client); if (!client) return NULL; + client->fd.fd = -1; client->snaplen = DEFAULT_SNAPLEN; + INIT_LLIST_HEAD(&pcap_client->conns); + return client; } diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index 818a2f1..c523df3 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -262,7 +262,6 @@ } /* initialize the queue */ - INIT_LLIST_HEAD(&pcap_client->conns); osmo_client_conn_init(&pcap_client->conn, pcap_client); pcap_client->conn.name = "default"; -- 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: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ib67efa0579755a117c7680f490916e37165204cc Gerrit-Change-Number: 39165 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits

by daniel

Attention is currently required from: fixeria, laforge, lynxis lazus. daniel has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email ) Change subject: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied4367a519cf75291ff8766c9efebb0f8a12b11f Gerrit-Change-Number: 39011 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 18 Dec 2024 15:22:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

[M] Change in osmo-ggsn[master]: gtp: Rework gtp_resp() into gtp_resp_pdp()

by daniel

Attention is currently required from: laforge, lynxis lazus. daniel has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/38933?usp=email ) Change subject: gtp: Rework gtp_resp() into gtp_resp_pdp() ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/38933?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Id9ff95e0e2a10a22e65ecf42b2a2b06a0f2d1a45 Gerrit-Change-Number: 38933 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 18 Dec 2024 15:20:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[master]: ipaccess: Set name on oml and rsl stream listen socket

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39148?usp=email ) Change subject: ipaccess: Set name on oml and rsl stream listen socket ...................................................................... ipaccess: Set name on oml and rsl stream listen socket Change-Id: I0b96605aa5012ee3eafa405172ac06cb1c7e7c33 --- M src/input/ipaccess.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 5cb1123..6a7d753 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -948,6 +948,7 @@ { int ret = -ENOENT; struct ipaccess_line *il; + char conn_name[128]; if (!line->driver_data) line->driver_data = talloc_zero(line, struct ipaccess_line); @@ -971,6 +972,8 @@ oml_link = osmo_stream_srv_link_create(tall_ipa_ctx); OSMO_ASSERT(oml_link); + snprintf(conn_name, sizeof(conn_name), "ts-%u-oml", line->num); + osmo_stream_srv_link_set_name(oml_link, conn_name); osmo_stream_srv_link_set_proto(oml_link, IPPROTO_TCP); osmo_stream_srv_link_set_addr(oml_link, ipa); osmo_stream_srv_link_set_port(oml_link, IPA_TCP_PORT_OML); @@ -989,6 +992,8 @@ rsl_link = osmo_stream_srv_link_create(tall_ipa_ctx); OSMO_ASSERT(rsl_link); + snprintf(conn_name, sizeof(conn_name), "ts-%u-rsl", line->num); + osmo_stream_srv_link_set_name(rsl_link, conn_name); osmo_stream_srv_link_set_proto(rsl_link, IPPROTO_TCP); osmo_stream_srv_link_set_addr(rsl_link, ipa); osmo_stream_srv_link_set_port(rsl_link, IPA_TCP_PORT_RSL); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39148?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0b96605aa5012ee3eafa405172ac06cb1c7e7c33 Gerrit-Change-Number: 39148 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024