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

[S] Change in osmo-mgw[master]: mgcp_codec_decide: remove redundant lookup

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35301?usp=email ) ( 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mgcp_codec_decide: remove redundant lookup ...................................................................... mgcp_codec_decide: remove redundant lookup We already did a lookup from conn_src[i] and found a matching codec_conn_dst, no need to do another reverse lookup to end up at the same conn_src[i] codec. Change-Id: Iecc7f22c551fd17b23db434fdb177266407d2621 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 20 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index d340e11..4626d03 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -431,13 +431,13 @@ * of a match set this codec on both connections. This would be an ideal selection since no codec conversion would be * required. */ for (i = 0; i < conn_src->end.codecs_assigned; i++) { - struct mgcp_rtp_codec *codec_conn_dst = mgcp_codec_find_same(conn_dst, &conn_src->end.codecs[i]); + struct mgcp_rtp_codec *codec_conn_src = &conn_src->end.codecs[i]; + struct mgcp_rtp_codec *codec_conn_dst = mgcp_codec_find_same(conn_dst, codec_conn_src); if (codec_conn_dst) { /* We found the a codec that is exactly the same (same codec, same payload format etc.) on both * sides. We now set this codec on both connections. */ conn_dst->end.codec = codec_conn_dst; - conn_src->end.codec = mgcp_codec_find_same(conn_src, codec_conn_dst); - OSMO_ASSERT(conn_src->end.codec); + conn_src->end.codec = codec_conn_src; return 0; } } @@ -445,13 +445,12 @@ /* In case we could not find a codec that is exactly the same, let's at least try to find a codec that we are able * to convert. */ for (i = 0; i < conn_src->end.codecs_assigned; i++) { - struct mgcp_rtp_codec *codec_conn_dst = codec_find_convertible(conn_dst, &conn_src->end.codecs[i]); + struct mgcp_rtp_codec *codec_conn_src = &conn_src->end.codecs[i]; + struct mgcp_rtp_codec *codec_conn_dst = codec_find_convertible(conn_dst, codec_conn_src); if (codec_conn_dst) { - /* We found the a codec that we are able to convert on both sides. We now set this codec on both - * connections. */ + /* We found the a codec that we can convert to. Set each side to its codec. */ conn_dst->end.codec = codec_conn_dst; - conn_src->end.codec = codec_find_convertible(conn_src, codec_conn_dst); - OSMO_ASSERT(conn_src->end.codec); + conn_src->end.codec = codec_conn_src; return 0; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35301?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iecc7f22c551fd17b23db434fdb177266407d2621 Gerrit-Change-Number: 35301 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_test: fix false negatives in test output

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35303?usp=email ) ( 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mgcp_test: fix false negatives in test output ...................................................................... mgcp_test: fix false negatives in test output If one test fails, do not print failure for all following tests as well. Change-Id: I196880b4b34a672ef45042c25f89bc1684363567 --- M tests/mgcp/mgcp_test.c 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 621ee77..c76bd9d 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -2137,7 +2137,7 @@ static void test_mgcp_codec_decide(void) { int i; - bool ok = true; + bool ok_all = true; printf("\nTesting mgcp_codec_find_convertible()\n"); for (i = 0; i < ARRAY_SIZE(test_mgcp_codec_find_convertible_cases); i++) { @@ -2146,6 +2146,7 @@ int rc; int conn_i; int c; + bool ok = true; printf("#%d: %s\n", i, t->descr); @@ -2186,9 +2187,12 @@ printf(" ===> SUCCESS: codec decision as expected!\n"); else printf(" ===> FAIL: unexpected codec decision!\n"); + + if (!ok) + ok_all = false; } - OSMO_ASSERT(ok); + OSMO_ASSERT(ok_all); } void test_conn_id_matching(void) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35303?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I196880b4b34a672ef45042c25f89bc1684363567 Gerrit-Change-Number: 35303 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: do not fail MGCP on codec mismatch

by neels

Attention is currently required from: dexter, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email ) Change subject: mgw: do not fail MGCP on codec mismatch ...................................................................... Patch Set 6: (1 comment) File src/libosmo-mgcp/mgcp_codec.c: https://gerrit.osmocom.org/c/osmo-mgw/+/35302/comment/1ae82040_e48118a8 PS1, Line 478: LOGP(DLMGCP, LOGL_ERROR, "no matching codec found\n"); > maybe it makes sense to put a comment here that explains exactly what is done here and why it is don […] it would mostly be a FIXME comment because this entire code path is wrong =) Explained in https://osmocom.org/issues/6293 So the result from this patch is not intended to remain this way, it is more the currently least complicated small increment in a transition to solving OS#6293. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 Gerrit-Change-Number: 35302 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 02:29:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_test: fix false negatives in test output

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35303?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mgcp_test: fix false negatives in test output ...................................................................... mgcp_test: fix false negatives in test output If one test fails, do not print failure for all following tests as well. Change-Id: I196880b4b34a672ef45042c25f89bc1684363567 --- M tests/mgcp/mgcp_test.c 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/35303/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35303?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I196880b4b34a672ef45042c25f89bc1684363567 Gerrit-Change-Number: 35303 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-mgw[master]: tweak DEBUG log

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35304?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: tweak DEBUG log ...................................................................... tweak DEBUG log Printing the debug log line a little later will include the MGCP verb information. Change-Id: Icb230cf4d623cdbc4ab52bd52d2a72525c0168c7 --- M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/04/35304/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35304?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icb230cf4d623cdbc4ab52bd52d2a72525c0168c7 Gerrit-Change-Number: 35304 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_codec_decide: remove redundant lookup

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35301?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mgcp_codec_decide: remove redundant lookup ...................................................................... mgcp_codec_decide: remove redundant lookup We already did a lookup from conn_src[i] and found a matching codec_conn_dst, no need to do another reverse lookup to end up at the same conn_src[i] codec. Change-Id: Iecc7f22c551fd17b23db434fdb177266407d2621 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 20 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/01/35301/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35301?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iecc7f22c551fd17b23db434fdb177266407d2621 Gerrit-Change-Number: 35301 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: do not fail MGCP on codec mismatch

by neels

Attention is currently required from: dexter, neels, pespin. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by dexter, Verified+1 by Jenkins Builder Change subject: mgw: do not fail MGCP on codec mismatch ...................................................................... mgw: do not fail MGCP on codec mismatch Before this patch, when an CRCX+MDCX wants to set a codec list that has no match with the codecs for the other conn of that same endpoint, osmo-mgw returns an MGCP "FAIL" response. When a client wants to change the codec, it has to do that one RTP port at a time. So osmo-mgw *must* allow to configure an MGCP conn with a codec choice that mismatches the other conn. This is crucial to allow codec negotiation in osmo-msc: if MO has already assigned a specific codec, and later wants to re-assign to the codec that MT has chosen, the codec needs to be changed at osmo-mgw. This patch is the minimal fix required to get re-assignment to a different codec to work (via osmo-msc). There is more work to be done about this bit of code in osmo-mgw, but keep that to a separate patch. In detail, before this patch, we fail both - when a side has no codecs, - or when there is no single match between codecs of the two sides of the endpoint. Remove only the second condition; after this patch, still fail when a side has no codecs -- this allows mgcp_test.c to still pass. Related: OS#6293 Related: osmo-msc I8760feaa8598047369ef8c3ab2673013bac8ac8a Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 45 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/02/35302/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 Gerrit-Change-Number: 35302 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-upf[master]: manual: fix typo in running.adoc

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/35664?usp=email ) Change subject: manual: fix typo in running.adoc ...................................................................... manual: fix typo in running.adoc Change-Id: Ibb1b548f588b27b23af687e5c44d18e81bca7c87 --- M doc/manuals/chapters/running.adoc 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 0f56521..5c0a7b4 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -177,4 +177,4 @@ ---- When running more than one osmo-upf process on a system, pick distinct table -names to avoid name collisions in the nftables reulesets. +names to avoid name collisions in the nftables rulesets. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/35664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ibb1b548f588b27b23af687e5c44d18e81bca7c87 Gerrit-Change-Number: 35664 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in osmo-upf[master]: manual: 'Running': flatten section depths a bit

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/35665?usp=email ) Change subject: manual: 'Running': flatten section depths a bit ...................................................................... manual: 'Running': flatten section depths a bit I'd like to add more sub-levels in an upcoming commit, and the levels are becoming too many. So let's get rid of one depth level in the 'Running osmo-upf' chapter. Change-Id: I0bd43300aa4b45315ea58ab35c77da005d1a4fa4 --- M doc/manuals/chapters/running.adoc 1 file changed, 17 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 5c0a7b4..683c444 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -59,9 +59,7 @@ table-name osmo-upf-2 ---- -=== Configuring Primary Links - -==== Configure PFCP Server +=== Configure PFCP Server The following example configures OsmoUPF to listen for PFCP association requests from Control Plane Function entities on local interface 10.9.8.7, port 8805: @@ -83,7 +81,7 @@ must not be "0.0.0.0", which is an unfortunate consequence. This is likely to improve in the future, see https://osmocom.org/issues/5682 . -==== Configure Linux Kernel GTP Features +=== Linux Kernel Features OsmoUPF uses two distinct Linux kernel features: @@ -103,7 +101,7 @@ forwarding proxy, without encapsulation/decapsulation of GTP payloads. [[gtp_module]] -===== Configure Linux Kernel GTP Module for `tunend` +=== Configure Linux Kernel GTP Module for `tunend` The Linux kernel GTP module is used for the `tunend` use case, i.e. GTP encapsulation/decapsulation from/to "the internet". @@ -160,7 +158,7 @@ this GTP device. When using ANY, there should be exactly one GTP dev configured. [[nftables]] -===== Configure Linux netfilter for `tunmap` +=== Configure Linux netfilter for `tunmap` The Linux kernel netfilter module is used for GTP tunnel proxying, also known as tunnel forwarding or tunnel mapping. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/35665?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I0bd43300aa4b45315ea58ab35c77da005d1a4fa4 Gerrit-Change-Number: 35665 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in osmo-mgw[master]: drop cfg 'sdp audio fmtp-extra'

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35437?usp=email ) Change subject: drop cfg 'sdp audio fmtp-extra' ...................................................................... drop cfg 'sdp audio fmtp-extra' There is considerable code complexity in place for this ancient hack. It dates back to 5ea1bc77a3947f541d576f95e7ecc7249fc65b9b " mgcp: Allow to freely control the a=fmtp line for experiments In case of AMR one can specify the available codecs out-of-band. Allow to configure this line statically in the configuration file. " Looking in mgcp_test.c output, the fmtp-extra tests do not even make sense: they result in fmtp for pt=126 being added, even though there is no payload type 126 listed in the SDP... Related: OS#6313 Change-Id: Icee0cd1f5a751fa760d5a9deca29089e78e7eb93 --- M TODO-RELEASE M include/osmocom/mgcp/mgcp_network.h M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_sdp.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 8 files changed, 43 insertions(+), 87 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 964ffe1..ea29b6a 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -38,3 +38,4 @@ libosmo-mgcp-client deprecate public API New code should no longer use codecs[], instead use ptmap[].codec. There is backwards compat code that moves codecs[] entries, if any, over to ptmap[], so callers may migrate at own leisure. +osmo-mgw remove cfg Remove VTY config item 'sdp audio fmtp-extra' (see OS#6313) diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index e95907d..a7bd333 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -108,7 +108,6 @@ int frames_per_packet; uint32_t packet_duration_ms; int maximum_packet_time; /* -1: not set */ - char *fmtp_extra; /* are we transmitting packets (true) or dropping (false) outbound packets */ bool output_enabled; /* FIXME: This parameter can be set + printed, but is nowhere used! */ diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index e608161..1679239 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -27,7 +27,6 @@ unsigned int trunk_nr; enum mgcp_trunk_type trunk_type; - char *audio_fmtp_extra; int audio_send_ptime; int audio_send_name; diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 283a213..d9bc573 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -110,8 +110,6 @@ end->rtcp.fd = -1; memset(&end->addr, 0, sizeof(end->addr)); end->rtcp_port = 0; - talloc_free(end->fmtp_extra); - end->fmtp_extra = NULL; /* Set default values */ end->frames_per_packet = 0; /* unknown */ diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 2249a98..ac5c682 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1076,9 +1076,6 @@ rc = mgcp_conn_iuup_init(conn); } - conn->end.fmtp_extra = talloc_strdup(trunk->endpoints, - trunk->audio_fmtp_extra); - if (pdata->cfg->force_ptime) { conn->end.packet_duration_ms = pdata->cfg->force_ptime; conn->end.force_output_ptime = 1; diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 183c4ec..77825f6 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -488,34 +488,10 @@ } /* Add fmtp strings to sdp payload */ -static int add_fmtp(struct msgb *sdp, struct sdp_fmtp_param *fmtp_params, unsigned int fmtp_params_len, - const char *fmtp_extra) +static int add_fmtp(struct msgb *sdp, struct sdp_fmtp_param *fmtp_params, unsigned int fmtp_params_len) { unsigned int i; int rc; - int fmtp_extra_pt = -1; - char *fmtp_extra_pars = ""; - - /* When no fmtp parameters ara available but an fmtp extra string - * is configured, just add the fmtp extra string */ - if (fmtp_params_len == 0 && fmtp_extra) { - return msgb_printf(sdp, "%s\r\n", fmtp_extra); - } - - /* When there is fmtp extra configured we dissect it in order to drop - * in the configured extra parameters at the right place when - * generating the fmtp strings. */ - if (fmtp_extra) { - if (sscanf(fmtp_extra, "a=fmtp:%d ", &fmtp_extra_pt) != 1) - fmtp_extra_pt = -1; - - fmtp_extra_pars = strstr(fmtp_extra, " "); - - if (!fmtp_extra_pars) - fmtp_extra_pars = ""; - else - fmtp_extra_pars++; - } for (i = 0; i < fmtp_params_len; i++) { rc = msgb_printf(sdp, "a=fmtp:%u", fmtp_params[i].payload_type); @@ -532,13 +508,6 @@ return -EINVAL; } - /* Append extra parameters from fmtp extra */ - if (fmtp_params[i].payload_type == fmtp_extra_pt) { - rc = msgb_printf(sdp, " %s", fmtp_extra_pars); - if (rc < 0) - return -EINVAL; - } - rc = msgb_printf(sdp, "\r\n"); if (rc < 0) return -EINVAL; @@ -558,7 +527,6 @@ const char *addr) { const struct mgcp_rtp_codec *codec; - const char *fmtp_extra; const char *audio_name; int payload_type; struct sdp_fmtp_param fmtp_param; @@ -575,7 +543,6 @@ OSMO_ASSERT(addr); codec = conn->end.codec; - fmtp_extra = conn->end.fmtp_extra; audio_name = codec->audio_name; payload_type = codec->payload_type; @@ -617,7 +584,7 @@ fmtp_params[0] = fmtp_param; fmtp_params_len = 1; } - rc = add_fmtp(sdp, fmtp_params, fmtp_params_len, fmtp_extra); + rc = add_fmtp(sdp, fmtp_params, fmtp_params_len); if (rc < 0) goto buffer_too_small; } diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 784894c..b82f3df 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -111,9 +111,6 @@ VTY_NEWLINE); } else vty_out(vty, " no rtp-patch%s", VTY_NEWLINE); - if (trunk->audio_fmtp_extra) - vty_out(vty, " sdp audio fmtp-extra %s%s", - trunk->audio_fmtp_extra, VTY_NEWLINE); vty_out(vty, " %ssdp audio-payload send-ptime%s", trunk->audio_send_ptime ? "" : "no ", VTY_NEWLINE); vty_out(vty, " %ssdp audio-payload send-name%s", @@ -187,7 +184,7 @@ " Payload Type: %d Rate: %u Channels: %d %s" " Frame Duration: %u Frame Denominator: %u%s" " FPP: %d Packet Duration: %u%s" - " FMTP-Extra: %s Audio-Name: %s Sub-Type: %s%s" + " Audio-Name: %s Sub-Type: %s%s" " Output-Enabled: %d Force-PTIME: %d%s", tx_packets->current, tx_bytes->current, VTY_NEWLINE, rx_packets->current, rx_bytes->current, VTY_NEWLINE, @@ -198,7 +195,7 @@ codec->payload_type, codec->rate, codec->channels, VTY_NEWLINE, codec->frame_duration_num, codec->frame_duration_den, VTY_NEWLINE, end->frames_per_packet, end->packet_duration_ms, - VTY_NEWLINE, end->fmtp_extra, codec->audio_name, + VTY_NEWLINE, codec->audio_name, codec->subtype_name, VTY_NEWLINE, end->output_enabled, end->force_output_ptime, VTY_NEWLINE); if (mgcp_conn_rtp_is_osmux(conn)) { @@ -681,21 +678,15 @@ return CMD_SUCCESS; } -DEFUN_USRATTR(cfg_mgcp_sdp_fmtp_extra, - cfg_mgcp_sdp_fmtp_extra_cmd, - X(MGW_CMD_ATTR_NEWCONN), - "sdp audio fmtp-extra .NAME", - "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" - "Extra Information\n") -{ - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); - OSMO_ASSERT(trunk); - char *txt = argv_concat(argv, argc, 0); - if (!txt) - return CMD_WARNING; +#define SDP_STR "SDP File related options\n" +#define AUDIO_STR "Audio payload options\n" - osmo_talloc_replace_string(g_cfg, &trunk->audio_fmtp_extra, txt); - talloc_free(txt); +DEFUN_DEPRECATED(cfg_mgcp_sdp_fmtp_extra, + cfg_mgcp_sdp_fmtp_extra_cmd, + "sdp audio fmtp-extra .NAME", + SDP_STR AUDIO_STR "Deprecated, without effect since osmo-mgw v1.13\n" "Deprecated, without effect\n") +{ + vty_out(vty, "%% deprecated: the config option 'sdp audio fmtp-extra' has been removed.%s", VTY_NEWLINE); return CMD_SUCCESS; } @@ -715,8 +706,6 @@ return CMD_SUCCESS; } -#define SDP_STR "SDP File related options\n" -#define AUDIO_STR "Audio payload options\n" DEFUN_DEPRECATED(cfg_mgcp_sdp_payload_number, cfg_mgcp_sdp_payload_number_cmd, "sdp audio-payload number <0-255>", @@ -1062,28 +1051,17 @@ VTY_NEWLINE); } else vty_out(vty, " no rtp-patch%s", VTY_NEWLINE); - if (trunk->audio_fmtp_extra) - vty_out(vty, " sdp audio fmtp-extra %s%s", - trunk->audio_fmtp_extra, VTY_NEWLINE); } return CMD_SUCCESS; } -DEFUN_USRATTR(cfg_trunk_sdp_fmtp_extra, +DEFUN_DEPRECATED(cfg_trunk_sdp_fmtp_extra, cfg_trunk_sdp_fmtp_extra_cmd, - X(MGW_CMD_ATTR_NEWCONN), "sdp audio fmtp-extra .NAME", - "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" - "Extra Information\n") + SDP_STR AUDIO_STR "Deprecated, without effect since osmo-mgw v1.13\n" "Deprecated, without effect\n") { - struct mgcp_trunk *trunk = vty->index; - char *txt = argv_concat(argv, argc, 0); - if (!txt) - return CMD_WARNING; - - osmo_talloc_replace_string(g_cfg, &trunk->audio_fmtp_extra, txt); - talloc_free(txt); + vty_out(vty, "%% deprecated: the config option 'sdp audio fmtp-extra' has been removed.%s", VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index e37bb57..621ee77 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -127,7 +127,6 @@ "t=0 0\r\n" \ "m=audio 16006 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=fmtp:126 0/1/2\r\n" \ "a=ptime:40\r\n" #define MDCX4_ADDR0000 \ @@ -336,7 +335,6 @@ "t=0 0\r\n" \ "m=audio 16006 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=fmtp:126 0/1/2\r\n" \ "a=ptime:40\r\n" #define CRCX_ZYN \ @@ -586,7 +584,6 @@ const char *req; const char *exp_resp; int ptype; - const char *extra_fmtp; }; static const struct mgcp_test tests[] = { @@ -614,10 +611,9 @@ {"RQNT1", RQNT, RQNT1_RET}, {"RQNT2", RQNT2, RQNT2_RET}, {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE}, - {"CRCX", CRCX, CRCX_FMTP_RET, 97,.extra_fmtp = "a=fmtp:126 0/1/2"}, - {"MDCX3", MDCX3, MDCX3_FMTP_RET, PTYPE_NONE,.extra_fmtp = - "a=fmtp:126 0/1/2"}, - {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE,.extra_fmtp = "a=fmtp:126 0/1/2"}, + {"CRCX", CRCX, CRCX_FMTP_RET, 97}, + {"MDCX3", MDCX3, MDCX3_FMTP_RET, PTYPE_NONE}, + {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE}, {"CRCX", CRCX_NO_LCO_NO_SDP, CRCX_NO_LCO_NO_SDP_RET, 97}, {"CRCX", CRCX_X_OSMO_IGN, CRCX_X_OSMO_IGN_RET, 97}, {"MDCX_TOO_LONG_CI", MDCX_TOO_LONG_CI, MDCX_TOO_LONG_CI_RET}, @@ -831,9 +827,6 @@ dummy_packets = 0; - osmo_talloc_replace_string(cfg, &trunk->audio_fmtp_extra, - t->extra_fmtp); - inp = create_msg(t->req, last_conn_id); msg = mgcp_handle_message(cfg, inp); msgb_free(inp); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icee0cd1f5a751fa760d5a9deca29089e78e7eb93 Gerrit-Change-Number: 35437 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024