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

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 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: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I4ead7b1b04a97a329cd1a299bde9de18b5f643a7 Gerrit-Change-Number: 39167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months

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 submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve 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: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I0cea59f9a94cf1233c2df6ea844a1c5599123d64 Gerrit-Change-Number: 39166 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-server: Avoid pcap time-based rotation if wall clock went backwards

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39164?usp=email ) Change subject: pcap-server: Avoid pcap time-based rotation if wall clock went backwards ...................................................................... pcap-server: Avoid pcap time-based rotation if wall clock went backwards Keep writing to the last pcap created instead of creating a new pcap with older timestamp if clock jumped backwards. Change-Id: If2f609f6980156a70a12a8759110038df44c6655 --- M doc/manuals/chapters/server.adoc M src/osmo_server_network.c 2 files changed, 31 insertions(+), 14 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/doc/manuals/chapters/server.adoc b/doc/manuals/chapters/server.adoc index f67f451..c6404ab 100644 --- a/doc/manuals/chapters/server.adoc +++ b/doc/manuals/chapters/server.adoc @@ -122,6 +122,6 @@ instead of 3 during that hour. WARNING:: If wall clock goes backward (eg. due to drift correction or Daylight -Saving procedure) and `rotate-localtime` is enabled, osmo-pcap-server may end up -recreating (and truncating) a previous pcap file if it is generated with the -same localtime timestamp. +Saving procedure), osmo-pcap-server may end up recreating (and truncating) a +previous pcap file if it is generated with the same localtime timestamp, for +instance because connection from osmo-pcap-client was re-established. diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 6b70ef8..1c8d442 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -146,26 +146,42 @@ return close_connection(conn); } +/* Update conn->last_write if needed. This field is used to keep the last time + * period where we wrote to the pcap file. Once a new write period (based on + * rotation VTY config) is detected, the pcap file we write to is rotated. */ +static void update_last_write(struct osmo_pcap_conn *conn, time_t now) +{ + time_t last = mktime(&conn->last_write); + + /* Skip time udpates if wall clock went backwards (ie. due to drift + * correction or DST). As a result, time rotation checks will skip + * opening a new pcap file with an older timestamp, and instead keep + * using the current one. */ + if (now > last) + localtime_r(&now, &conn->last_write); +} + static void restart_pcap(struct osmo_pcap_conn *conn) { time_t now = time(NULL); - struct tm *tm = localtime(&now); + struct tm tm; int rc; osmo_pcap_server_close_trace(conn); /* omit any storing/creation of the file */ if (conn->no_store) { - conn->last_write = *tm; + update_last_write(conn, now); talloc_free(conn->curr_filename); conn->curr_filename = NULL; return; } + localtime_r(&now, &tm); conn->curr_filename = talloc_asprintf(conn, "%s/trace-%s-%d%.2d%.2d_%.2d%.2d%.2d.pcap", conn->server->base_path, conn->name, - tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec); if (!conn->curr_filename) { LOGP(DSERVER, LOGL_ERROR, "Failed to assemble filename for %s.\n", conn->name); @@ -187,7 +203,7 @@ return; } - conn->last_write = *tm; + update_last_write(conn, now); } static int link_data(struct osmo_pcap_conn *conn, struct osmo_pcap_data *data) @@ -335,12 +351,14 @@ } } -static bool check_restart_pcap_localtime(struct osmo_pcap_conn *conn, const struct tm *tm) +static bool check_restart_pcap_localtime(struct osmo_pcap_conn *conn, time_t now) { + struct tm tm; if (!pcap_server->rotate_localtime.enabled) return false; - if (!check_localtime(&conn->last_write, tm, + localtime_r(&now, &tm); + if (!check_localtime(&conn->last_write, &tm, pcap_server->rotate_localtime.intv, pcap_server->rotate_localtime.modulus)) return false; @@ -355,13 +373,12 @@ static int write_data(struct osmo_pcap_conn *conn, struct osmo_pcap_data *data) { time_t now = time(NULL); - struct tm *tm = localtime(&now); int rc; client_data(conn, data); if (conn->no_store) { - conn->last_write = *tm; + update_last_write(conn, now); return 1; } @@ -371,9 +388,9 @@ } if (!check_restart_pcap_max_size(conn, data)) - check_restart_pcap_localtime(conn, tm); + check_restart_pcap_localtime(conn, now); - conn->last_write = *tm; + update_last_write(conn, now); rc = write(conn->local_fd, &data->data[0], data->len); if (rc != data->len) { LOGP(DSERVER, LOGL_ERROR, "Failed to write for %s\n", conn->name); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39164?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If2f609f6980156a70a12a8759110038df44c6655 Gerrit-Change-Number: 39164 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 4bb4b4e..11ba7c9 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(&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: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ib67efa0579755a117c7680f490916e37165204cc Gerrit-Change-Number: 39165 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

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

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39167?usp=email ) Change subject: pcap-client: Alloc default client conn similarly to other ones ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I4ead7b1b04a97a329cd1a299bde9de18b5f643a7 Gerrit-Change-Number: 39167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 12:42:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

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

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39166?usp=email ) Change subject: pcap-client: Split client-conn allocation to its own constructor function ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I0cea59f9a94cf1233c2df6ea844a1c5599123d64 Gerrit-Change-Number: 39166 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 12:35:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

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

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39165?usp=email ) Change subject: pcap-client: Move conns llist initialization to constructor ...................................................................... Patch Set 3: Code-Review+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: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ib67efa0579755a117c7680f490916e37165204cc Gerrit-Change-Number: 39165 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 12:34:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-server: Avoid pcap time-based rotation if wall clock went backwards

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39164?usp=email ) Change subject: pcap-server: Avoid pcap time-based rotation if wall clock went backwards ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39164?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: If2f609f6980156a70a12a8759110038df44c6655 Gerrit-Change-Number: 39164 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 12:33:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[S] Change in osmo-mgw[master]: TODO: move mgcp_rtp_end_config

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39218?usp=email ) Change subject: TODO: move mgcp_rtp_end_config ...................................................................... TODO: move mgcp_rtp_end_config Change-Id: I7f2209f50424903cfefad53b4278b712fda51ce5 --- M include/osmocom/mgcp/mgcp_rtp_end.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_rtp_end.c 3 files changed, 26 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/18/39218/1 diff --git a/include/osmocom/mgcp/mgcp_rtp_end.h b/include/osmocom/mgcp/mgcp_rtp_end.h index 02554cb..5d644b1 100644 --- a/include/osmocom/mgcp/mgcp_rtp_end.h +++ b/include/osmocom/mgcp/mgcp_rtp_end.h @@ -51,3 +51,10 @@ void mgcp_rtp_end_set_packet_duration_ms(struct mgcp_rtp_end *end, uint32_t packet_duration_ms); bool mgcp_rtp_end_remote_addr_available(const struct mgcp_rtp_end *rtp_end); void mgcp_rtp_end_free_port(struct mgcp_rtp_end *end); + +void mgcp_rtp_end_config(struct mgcp_endpoint *endp, int expect_ssrc_change, + struct mgcp_rtp_end *rtp); + +uint32_t mgcp_rtp_packet_duration(const struct mgcp_endpoint *endp, + const struct mgcp_rtp_end *rtp); + diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 48bb28b..33b48e1 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -722,24 +722,6 @@ return 0; } -void mgcp_rtp_end_config(struct mgcp_endpoint *endp, int expect_ssrc_change, - struct mgcp_rtp_end *rtp) -{ - struct mgcp_trunk *trunk = endp->trunk; - - bool patch_ssrc = expect_ssrc_change && trunk->force_constant_ssrc; - - rtp->force_aligned_timing = trunk->force_aligned_timing; - rtp->force_constant_ssrc = patch_ssrc ? 1 : 0; - rtp->rfc5993_hr_convert = trunk->rfc5993_hr_convert; - - LOGPENDP(endp, DLMGCP, LOGL_DEBUG, - "Configuring RTP endpoint: local port %d%s%s\n", - osmo_sockaddr_port(&rtp->addr.u.sa), - rtp->force_aligned_timing ? ", force constant timing" : "", - rtp->force_constant_ssrc ? ", force constant ssrc" : ""); -} - uint32_t mgcp_rtp_packet_duration(const struct mgcp_endpoint *endp, const struct mgcp_rtp_end *rtp) { diff --git a/src/libosmo-mgcp/mgcp_rtp_end.c b/src/libosmo-mgcp/mgcp_rtp_end.c index c9dbc54..85794f6 100644 --- a/src/libosmo-mgcp/mgcp_rtp_end.c +++ b/src/libosmo-mgcp/mgcp_rtp_end.c @@ -98,3 +98,22 @@ end->rtcp = NULL; } } + +/* TODO: move this here, maybe split this actually into 2 funcs due to a VTY command setting a loopback using it: */ +void mgcp_rtp_end_config(struct mgcp_endpoint *endp, int expect_ssrc_change, + struct mgcp_rtp_end *rtp) +{ + struct mgcp_trunk *trunk = endp->trunk; + + bool patch_ssrc = expect_ssrc_change && trunk->force_constant_ssrc; + + rtp->force_aligned_timing = trunk->force_aligned_timing; + rtp->force_constant_ssrc = patch_ssrc ? 1 : 0; + rtp->rfc5993_hr_convert = trunk->rfc5993_hr_convert; + + LOGPENDP(endp, DLMGCP, LOGL_DEBUG, + "Configuring RTP endpoint: local port %d%s%s\n", + osmo_sockaddr_port(&rtp->addr.u.sa), + rtp->force_aligned_timing ? ", force constant timing" : "", + rtp->force_constant_ssrc ? ", force constant ssrc" : ""); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39218?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: I7f2209f50424903cfefad53b4278b712fda51ce5 Gerrit-Change-Number: 39218 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: Move force_ptime logic outside of main CRCX func handler

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39217?usp=email ) Change subject: mgw: Move force_ptime logic outside of main CRCX func handler ...................................................................... mgw: Move force_ptime logic outside of main CRCX func handler Apply the forced value automatically during init, and then only override it based on received input from MGCP when it has not been forced by VTY config. Change-Id: I02a92a090887caa8e05917a44c8b2351fa7b9b50 --- M include/osmocom/mgcp/mgcp_rtp_end.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_rtp_end.c M src/libosmo-mgcp/mgcp_sdp.c 5 files changed, 28 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/17/39217/1 diff --git a/include/osmocom/mgcp/mgcp_rtp_end.h b/include/osmocom/mgcp/mgcp_rtp_end.h index c08f00d..02554cb 100644 --- a/include/osmocom/mgcp/mgcp_rtp_end.h +++ b/include/osmocom/mgcp/mgcp_rtp_end.h @@ -11,6 +11,7 @@ /* 'mgcp_rtp_end': basically a wrapper around the RTP+RTCP ports */ struct mgcp_rtp_end { + struct mgcp_conn_rtp *conn_rtp; /* backpointer */ /* remote IP address of the RTP socket */ struct osmo_sockaddr addr; @@ -45,7 +46,8 @@ char local_addr[INET6_ADDRSTRLEN]; }; -void mgcp_rtp_end_init(struct mgcp_rtp_end *end); +void mgcp_rtp_end_init(struct mgcp_rtp_end *end, struct mgcp_conn_rtp *conn_rtp); void mgcp_rtp_end_cleanup(struct mgcp_rtp_end *end); +void mgcp_rtp_end_set_packet_duration_ms(struct mgcp_rtp_end *end, uint32_t packet_duration_ms); bool mgcp_rtp_end_remote_addr_available(const struct mgcp_rtp_end *rtp_end); void mgcp_rtp_end_free_port(struct mgcp_rtp_end *end); diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 088d3e3..48a9f19 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -112,7 +112,7 @@ conn_rtp->state.in_stream.err_ts_ctr = rate_ctr_group_get_ctr(conn_rtp->ctrg, IN_STREAM_ERR_TSTMP_CTR); conn_rtp->state.out_stream.err_ts_ctr = rate_ctr_group_get_ctr(conn_rtp->ctrg, OUT_STREAM_ERR_TSTMP_CTR); - mgcp_rtp_end_init(&conn_rtp->end); + mgcp_rtp_end_init(&conn_rtp->end, conn_rtp); return 0; } diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 45f2c4f..48bb28b 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1089,11 +1089,6 @@ rc = mgcp_conn_iuup_init(conn_rtp); } - if (pdata->cfg->force_ptime) { - conn_rtp->end.packet_duration_ms = pdata->cfg->force_ptime; - conn_rtp->end.force_output_ptime = 1; - } - mgcp_rtp_end_config(endp, 0, &conn_rtp->end); /* Find a local address for conn based on policy and initial SDP remote diff --git a/src/libosmo-mgcp/mgcp_rtp_end.c b/src/libosmo-mgcp/mgcp_rtp_end.c index e48eaeb..c9dbc54 100644 --- a/src/libosmo-mgcp/mgcp_rtp_end.c +++ b/src/libosmo-mgcp/mgcp_rtp_end.c @@ -30,13 +30,19 @@ #include <osmocom/core/osmo_io.h> #include <osmocom/mgcp/mgcp_rtp_end.h> #include <osmocom/mgcp/mgcp_codec.h> +#include <osmocom/mgcp/mgcp_conn.h> +#include <osmocom/mgcp/mgcp_endp.h> +#include <osmocom/mgcp/mgcp_trunk.h> /*********************** * mgcp_rtp_end **********************/ -void mgcp_rtp_end_init(struct mgcp_rtp_end *end) +void mgcp_rtp_end_init(struct mgcp_rtp_end *end, struct mgcp_conn_rtp *conn_rtp) { + struct mgcp_config *cfg = conn_rtp->conn->endp->trunk->cfg; + + end->conn_rtp = conn_rtp; end->rtp = NULL; end->rtcp = NULL; memset(&end->addr, 0, sizeof(end->addr)); @@ -44,10 +50,17 @@ /* Set default values */ end->frames_per_packet = 0; /* unknown */ - end->packet_duration_ms = DEFAULT_RTP_AUDIO_PACKET_DURATION_MS; end->output_enabled = false; end->maximum_packet_time = -1; + + if (cfg->force_ptime) { + end->packet_duration_ms = cfg->force_ptime; + end->force_output_ptime = 1; + } else { + end->packet_duration_ms = DEFAULT_RTP_AUDIO_PACKET_DURATION_MS; + } + /* Make sure codec table is reset */ mgcp_codecset_reset(&end->cset); } @@ -58,6 +71,13 @@ mgcp_codecset_reset(&end->cset); } +void mgcp_rtp_end_set_packet_duration_ms(struct mgcp_rtp_end *end, uint32_t packet_duration_ms) +{ + if (end->force_output_ptime) + return; + end->packet_duration_ms = packet_duration_ms; +} + bool mgcp_rtp_end_remote_addr_available(const struct mgcp_rtp_end *rtp_end) { return (osmo_sockaddr_port(&rtp_end->addr.u.sa) != 0) && diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 4d13388..ffd0f18 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -361,9 +361,9 @@ if (sscanf(line, "a=ptime:%d-%d", &ptime, &ptime2) >= 1) { if (ptime2 > 0 && ptime2 != ptime) - rtp->packet_duration_ms = 0; + mgcp_rtp_end_set_packet_duration_ms(rtp, 0); else - rtp->packet_duration_ms = ptime; + mgcp_rtp_end_set_packet_duration_ms(rtp, ptime); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39217?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: I02a92a090887caa8e05917a44c8b2351fa7b9b50 Gerrit-Change-Number: 39217 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024