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

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

by fixeria

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

6 months

1
0
0 0

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

by fixeria

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

6 months

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified 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: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I06722bcadf1e0b81fd11787153b0c1007c08a47b Gerrit-Change-Number: 39169 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

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 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: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ide92b28938b89ea1130d89dd0243607c861045f2 Gerrit-Change-Number: 39168 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 wrapped ctr generic calculation to helper function

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39169?usp=email ) Change subject: pcap-client: Split wrapped ctr generic calculation to helper function ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I06722bcadf1e0b81fd11787153b0c1007c08a47b Gerrit-Change-Number: 39169 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 13:30:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

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

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39168?usp=email ) Change subject: pcap-client: Add missing '_conn' in function names ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ide92b28938b89ea1130d89dd0243607c861045f2 Gerrit-Change-Number: 39168 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Dec 2024 13:29:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[XS] Change in osmo-pcap[master]: pcap-server: remove unneeded check for null base_path

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email ) Change subject: pcap-server: remove unneeded check for null base_path ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-pcap/+/39192/comment/225121da_0b25f4db?us… : PS1, Line 10: it can only be replaced with another string through VTY. > well, theoretically the talloc_strdup() in osmo_talloc_replace_string() could fail, and return NULL. […] That's definetly not expected at all, and if that happened it would surely crash in 100 places more. And in practice I doubt that will ever fail in linux, the process will simple be frozen until the kernel can allocate more memory for it. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2f503f6f9af35d6ae6fbd03e85cade4f0eb93df2 Gerrit-Change-Number: 39192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 24 Dec 2024 13:27:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

6 months

1
0
0 0

[XS] Change in osmo-mgw[master]: mgw: Move several params setting to mgcp_rtp_end_init()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39220?usp=email ) Change subject: mgw: Move several params setting to mgcp_rtp_end_init() ...................................................................... mgw: Move several params setting to mgcp_rtp_end_init() There's no need to set those 2 params later on, simply set them during init() to simplify code. Change-Id: I38e2cfbe03c1e2de48e48f30a04af746bc2368a4 --- M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_rtp_end.c 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/20/39220/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 48bb28b..97eb43d 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -729,9 +729,7 @@ 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", diff --git a/src/libosmo-mgcp/mgcp_rtp_end.c b/src/libosmo-mgcp/mgcp_rtp_end.c index c9dbc54..819a922 100644 --- a/src/libosmo-mgcp/mgcp_rtp_end.c +++ b/src/libosmo-mgcp/mgcp_rtp_end.c @@ -40,7 +40,8 @@ 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; + struct mgcp_trunk *trunk = conn_rtp->conn->endp->trunk; + struct mgcp_config *cfg = trunk->cfg; end->conn_rtp = conn_rtp; end->rtp = NULL; @@ -53,6 +54,8 @@ end->output_enabled = false; end->maximum_packet_time = -1; + end->force_aligned_timing = trunk->force_aligned_timing; + end->rfc5993_hr_convert = trunk->rfc5993_hr_convert; if (cfg->force_ptime) { end->packet_duration_ms = cfg->force_ptime; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39220?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: I38e2cfbe03c1e2de48e48f30a04af746bc2368a4 Gerrit-Change-Number: 39220 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw: Simplify and redo code around ssrc patch feature

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39221?usp=email ) Change subject: mgw: Simplify and redo code around ssrc patch feature ...................................................................... mgw: Simplify and redo code around ssrc patch feature The previous logic to configure SSRC patching was over complex and confusing, with even some broken logic like "patch only once", which is not really needed. Hence, simplify the internal logic to either patch SSRC always or don't do it, based on VTY configuration. The "force SSRC" feature was added in db2d431697609d473de433b7028f81ce499a02c0 and further changed in e2292f3aa1e9ae1faf5521a9cb108775f1ac0540, due to the need for nanoBTS to always keep the same SSRC on received packets. However, it makes no sense that is actually needed only once: if remote end changed several times, then we should keep patching in that case. This change allows getting rid of confusing applying of settings at a later time through mgcp_rtp_end_config(), which is no longer needed and can be dropped, simplifying steps during CRCX/MDCX/DLCX. Change-Id: Ib7216a775f4ad126e62b9e99aff381fd45015819 --- M include/osmocom/mgcp/mgcp_protocol.h M include/osmocom/mgcp/mgcp_rtp_end.h M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_rtp_end.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 8 files changed, 15 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/39221/1 diff --git a/include/osmocom/mgcp/mgcp_protocol.h b/include/osmocom/mgcp/mgcp_protocol.h index ddb226b..77f17d5 100644 --- a/include/osmocom/mgcp/mgcp_protocol.h +++ b/include/osmocom/mgcp/mgcp_protocol.h @@ -26,8 +26,6 @@ struct mgcp_rtp_end; struct mgcp_endpoint; -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/include/osmocom/mgcp/mgcp_rtp_end.h b/include/osmocom/mgcp/mgcp_rtp_end.h index 02554cb..df06569 100644 --- a/include/osmocom/mgcp/mgcp_rtp_end.h +++ b/include/osmocom/mgcp/mgcp_rtp_end.h @@ -30,7 +30,7 @@ int force_output_ptime; /* RTP patching */ - int force_constant_ssrc; /* -1: always, 0: don't, 1: once */ + bool force_constant_ssrc; /* should we perform align_rtp_timestamp_offset() (1) or not (0) */ int force_aligned_timing; bool rfc5993_hr_convert; diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index 1679239..68d37dd 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -34,7 +34,7 @@ int keepalive_interval; /* RTP patching */ - int force_constant_ssrc; /* 0: don't, 1: once */ + bool force_constant_ssrc; int force_aligned_timing; bool rfc5993_hr_convert; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 476e3b1..894ca2a 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -542,16 +542,16 @@ if (!state->initialized) { state->initialized = 1; + state->packet_duration = mgcp_rtp_packet_duration(endp, rtp_end); state->in_stream.last_seq = seq - 1; - state->in_stream.ssrc = state->patch.orig_ssrc = ssrc; + state->in_stream.ssrc = ssrc; state->in_stream.last_tsdelta = 0; - state->packet_duration = - mgcp_rtp_packet_duration(endp, rtp_end); state->out_stream.last_seq = seq - 1; - state->out_stream.ssrc = state->patch.orig_ssrc = ssrc; state->out_stream.last_tsdelta = 0; state->out_stream.last_timestamp = timestamp; state->out_stream.ssrc = ssrc - 1; /* force output SSRC change */ + state->patch.orig_ssrc = ssrc; + state->patch.patch_ssrc = rtp_end->force_constant_ssrc; LOGPENDP(endp, DRTP, LOGL_INFO, "initializing stream, SSRC: %u timestamp: %u " "pkt-duration: %d, from %s:%d\n", @@ -578,7 +578,7 @@ osmo_sockaddr_port(&addr->u.sa)); state->in_stream.ssrc = ssrc; - if (rtp_end->force_constant_ssrc) { + if (state->patch.patch_ssrc) { int16_t delta_seq; /* Always increment seqno by 1 */ @@ -594,10 +594,7 @@ adjust_rtp_timestamp_offset(endp, state, rtp_end, addr, delta_seq, timestamp, marker_bit); - state->patch.patch_ssrc = true; ssrc = state->patch.orig_ssrc; - if (rtp_end->force_constant_ssrc != -1) - rtp_end->force_constant_ssrc -= 1; LOGPENDP(endp, DRTP, LOGL_NOTICE, "SSRC patching enabled, SSRC: %u " diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 97eb43d..bbd38da 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -722,22 +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_constant_ssrc = patch_ssrc ? 1 : 0; - - 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) { @@ -1087,8 +1071,6 @@ rc = mgcp_conn_iuup_init(conn_rtp); } - mgcp_rtp_end_config(endp, 0, &conn_rtp->end); - /* Find a local address for conn based on policy and initial SDP remote information, then find a free port for it */ if (mgcp_get_local_addr(conn_rtp->end.local_addr, conn_rtp) < 0) { @@ -1340,8 +1322,6 @@ goto error3; } - mgcp_rtp_end_config(endp, 1, &conn_rtp->end); - /* modify */ LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "MDCX: modified conn:%s\n", mgcp_conn_dump(conn)); diff --git a/src/libosmo-mgcp/mgcp_rtp_end.c b/src/libosmo-mgcp/mgcp_rtp_end.c index 819a922..34614fe 100644 --- a/src/libosmo-mgcp/mgcp_rtp_end.c +++ b/src/libosmo-mgcp/mgcp_rtp_end.c @@ -55,6 +55,7 @@ end->maximum_packet_time = -1; end->force_aligned_timing = trunk->force_aligned_timing; + end->force_constant_ssrc = trunk->force_constant_ssrc; end->rfc5993_hr_convert = trunk->rfc5993_hr_convert; if (cfg->force_ptime) { diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index e90ceaa..1d9079c 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -857,7 +857,7 @@ { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); - trunk->force_constant_ssrc = 1; + trunk->force_constant_ssrc = true; return CMD_SUCCESS; } @@ -868,7 +868,7 @@ { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); - trunk->force_constant_ssrc = 0; + trunk->force_constant_ssrc = false; return CMD_SUCCESS; } @@ -923,7 +923,7 @@ { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); - trunk->force_constant_ssrc = 0; + trunk->force_constant_ssrc = false; trunk->force_aligned_timing = 0; trunk->rfc5993_hr_convert = false; return CMD_SUCCESS; @@ -1197,7 +1197,7 @@ "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n") { struct mgcp_trunk *trunk = vty->index; - trunk->force_constant_ssrc = 1; + trunk->force_constant_ssrc = true; return CMD_SUCCESS; } @@ -1207,7 +1207,7 @@ "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n") { struct mgcp_trunk *trunk = vty->index; - trunk->force_constant_ssrc = 0; + trunk->force_constant_ssrc = false; return CMD_SUCCESS; } @@ -1257,7 +1257,7 @@ "no rtp-patch", NO_STR RTP_PATCH_STR) { struct mgcp_trunk *trunk = vty->index; - trunk->force_constant_ssrc = 0; + trunk->force_constant_ssrc = false; trunk->force_aligned_timing = 0; trunk->rfc5993_hr_convert = false; return CMD_SUCCESS; @@ -1361,7 +1361,7 @@ if (conn->type == MGCP_CONN_TYPE_RTP) { /* Handle it like a MDCX, switch on SSRC patching if enabled */ struct mgcp_conn_rtp *conn_rtp = mgcp_conn_get_conn_rtp(conn); - mgcp_rtp_end_config(endp, 1, &conn_rtp->end); + conn_rtp->state.patch.patch_ssrc = true; } else { /* FIXME: Introduce support for other connection (E1) * types when implementation is available */ diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 9aa7326..1c1a41e 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1479,7 +1479,6 @@ OSMO_ASSERT(info->len >= 0); msg->l3h = msgb_put(msg, info->len); memcpy((char*)msgb_l3(msg), info->data, info->len); - mgcp_rtp_end_config(&endp, 1, rtp); mgcp_patch_and_count(&endp, &state, rtp, &addr, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39221?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: Ib7216a775f4ad126e62b9e99aff381fd45015819 Gerrit-Change-Number: 39221 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mgw: Improve log and teardown upon unexpected mgcp resp received

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39219?usp=email ) Change subject: mgw: Improve log and teardown upon unexpected mgcp resp received ...................................................................... mgw: Improve log and teardown upon unexpected mgcp resp received Change-Id: I233075f5a88ed7f1f7de496664cdc7281aefa900 --- M mgw/MGCP_Test.ttcn 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/39219/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 84e5943..934179c 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -270,14 +270,14 @@ T.start; alt { [] MGCP.receive(mrt) -> value mrf { } - [] MGCP.receive(tr_MGCP_RecvFrom_R(?)) { - setverdict(fail, "Response didn't match template"); - mtc.stop; + [] MGCP.receive(tr_MGCP_RecvFrom_R(?)) -> value mrf { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected MGCP Response: ", mrf, " vs exp ", mrt)); } [] MGCP.receive { repeat; } [] T.timeout { - setverdict(fail, "Timeout waiting for response to ", cmd); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for response to ", cmd)); } } T.stop; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39219?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I233075f5a88ed7f1f7de496664cdc7281aefa900 Gerrit-Change-Number: 39219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024