- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: bts: fix unbound variable in as_rsl_fail_err()
by fixeria 10 Dec '25

10 Dec '25

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41644?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: bts: fix unbound variable in as_rsl_fail_err() ...................................................................... bts: fix unbound variable in as_rsl_fail_err() Change-Id: Ifcbdfb8b5a0e08ca3f8e610ca4940a2bdafa3cac --- M bts/BTS_Tests_LAPDm.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/41644/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41644?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifcbdfb8b5a0e08ca3f8e610ca4940a2bdafa3cac Gerrit-Change-Number: 41644 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: create all components alive
by pespin 10 Dec '25

10 Dec '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41643?usp=email ) Change subject: bts: create all components alive ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41643?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: I68929b45d66d60617079a4f92d40ffea439bf4be Gerrit-Change-Number: 41643 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Dec 2025 15:08:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: bts: fix unbound variable in as_rsl_fail_err()
by fixeria 10 Dec '25

10 Dec '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41644?usp=email ) Change subject: bts: fix unbound variable in as_rsl_fail_err() ...................................................................... bts: fix unbound variable in as_rsl_fail_err() Change-Id: Ifcbdfb8b5a0e08ca3f8e610ca4940a2bdafa3cac --- M bts/BTS_Tests_LAPDm.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/41644/1 diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index 5b33795..8b091f7 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -507,7 +507,7 @@ /* fail if we receive an RSL ERROR IND */ private altstep as_rsl_fail_err() runs on ConnHdlr { var RSL_Message rx_rsl; - [] RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, ?, ?)) { + [] RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, ?, ?)) -> rx_rsl { setverdict(fail, "Received RSL ERROR IND ", rx_rsl); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41644?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: Ifcbdfb8b5a0e08ca3f8e610ca4940a2bdafa3cac Gerrit-Change-Number: 41644 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: create all components alive
by fixeria 10 Dec '25

10 Dec '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41643?usp=email ) Change subject: bts: create all components alive ...................................................................... bts: create all components alive This mitigates sporadic dynamic-testcase errors triggered by messages being sent to components that have terminated before receiving them. Change-Id: I68929b45d66d60617079a4f92d40ffea439bf4be --- M bts/BTS_Tests.ttcn M bts/BTS_Tests_LAPDm.ttcn 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/41643/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index de02359..455e696 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -241,8 +241,8 @@ var ASP_RSL_Unitdata rx_ud; timer T; - vc_IPA := IPA_Emulation_CT.create(id & "-RSL-IPA"); - vc_RSL := RSL_Emulation_CT.create(id & "-RSL"); + vc_IPA := IPA_Emulation_CT.create(id & "-RSL-IPA") alive; + vc_RSL := RSL_Emulation_CT.create(id & "-RSL") alive; map(vc_IPA:IPA_PORT, system:IPA_CODEC_PT); connect(vc_IPA:IPA_RSL_PORT, vc_RSL:IPA_PT); @@ -695,7 +695,7 @@ var charstring id := testcasename(); var ConnHdlr vc_conn; - vc_conn := ConnHdlr.create(id); + vc_conn := ConnHdlr.create(id) alive; /* connect to RSL Emulation main component */ connect(vc_conn:RSL, vc_RSL:CLIENT_PT); connect(vc_conn:RSL_PROC, vc_RSL:RSL_PROC); @@ -2626,7 +2626,7 @@ uint7_t rtp_pt := 0) runs on ConnHdlr { /* Step 0: initialize, connect and start the emulation component */ - vc_RTPEM := RTP_Emulation_CT.create(testcasename() & "-RTPEM"); + vc_RTPEM := RTP_Emulation_CT.create(testcasename() & "-RTPEM") alive; map(vc_RTPEM:RTP, system:RTP); map(vc_RTPEM:RTCP, system:RTCP); connect(vc_RTPEM:CTRL, self:RTPEM_CTRL); @@ -2676,7 +2676,7 @@ var OsmuxTxHandle tx_hdl; var OsmuxRxHandle rx_hdl; /* Step 0: initialize, connect and start the emulation component */ - vc_OsmuxEM := OSMUX_Emulation_CT.create(testcasename() & "-OsmuxEM"); + vc_OsmuxEM := OSMUX_Emulation_CT.create(testcasename() & "-OsmuxEM") alive; map(vc_OsmuxEM:OSMUX, system:OSMUX); connect(vc_OsmuxEM:CTRL, self:OsmuxEM_CTRL); connect(vc_OsmuxEM:DATA, self:OsmuxEM_DATA); diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index 7dda8b8..5b33795 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -24,7 +24,7 @@ function f_lapdm_init() runs on lapdm_test_CT { /* create the LAPDm component */ - lapdm_component := lapdm_CT.create; + lapdm_component := lapdm_CT.create alive; /* connect our own LAPDM port to the LAPDM Service Provider of the LAPDm component */ connect(self:LAPDM, lapdm_component:LAPDM_SP); /* connect the LAPDm compoent's lower-side port to the system L1CTL port (which is internally -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41643?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: I68929b45d66d60617079a4f92d40ffea439bf4be Gerrit-Change-Number: 41643 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: setup.py: Align cmd2 minimum version with requirements.txt
by osmith 10 Dec '25

10 Dec '25

Attention is currently required from: dexter, laforge, neels. osmith has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/41642?usp=email ) Change subject: setup.py: Align cmd2 minimum version with requirements.txt ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I believe it's worth mentioning that `debian:trixie` provides `2.5. […] Good points. I think we need to figure out which versions of cmd2 we want to support. We could do e.g. the following: 1) Use this patch as-is and just require cmd2 >= 2.6.2 for PySim. We can then remove the backwards compatibility code you mentioned in a follow-up patch. The big advantage is that users won't have ancient cmd2 versions, against which we potentially might have incompatibilities over time without realizing it. It would make sense to update the description in README.md for installing pysim to rely on pip packages instead of debian packages: ``` $ python3 -m venv .venv $ . .venv/bin/activate $ pip install -r requirements.txt ``` 2) Require cmd2 >= 1.5 (as before) in both setup.py and requirements.txt, and force in contrib/jenkins.sh that cmd2 >= 2.6.2 is installed similar to https://gitea.osmocom.org/sim-card/pysim/commit/004b06eab1d89ba2b29d7de9b77…. This has the advantage that people can still use their older versions from distro packages. We don't build pysim in the Osmocom OBS. Personally I would be fine with 1), but maybe others have different opinions. Thoughts? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41642?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I71cee0ec3ed2abec68ec567beaab13c868721dad Gerrit-Change-Number: 41642 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Dec 2025 14:40:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-epdg[master]: s2b: when socket opening fails, stop the S2b module
by fixeria 10 Dec '25

10 Dec '25

Attention is currently required from: laforge, lynxis lazus, pespin. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901?usp=email ) Change subject: s2b: when socket opening fails, stop the S2b module ...................................................................... Patch Set 5: Code-Review+1 (1 comment) File src/epdg_gtpc_s2b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901/comment/6a49d79a_2d79… : PS3, Line 150: io_lib:format > I agree with fixeria Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I49a6a1ec0c938aa70444c19c0b7b644f2e42f1fd Gerrit-Change-Number: 37901 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 10 Dec 2025 14:24:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in pysim[master]: setup.py: Align cmd2 minimum version with requirements.txt
by fixeria 10 Dec '25

10 Dec '25

Attention is currently required from: dexter, laforge, neels. fixeria has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/41642?usp=email ) Change subject: setup.py: Align cmd2 minimum version with requirements.txt ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I believe it's worth mentioning that `debian:trixie` provides `2.5.11`, and `pySim-shell` still works fine with that older version. The only problem was artifacts in auto-generated documentation (https://osmocom.org/issues/6776). The version was bumped here: https://gerrit.osmocom.org/c/pysim/+/40952 and honestly I am not sure if this alone is a strong reason to require `2.6.2`. Another thing I wanted to bring up with backwards compatibility quirks in `pySim-shell.py` (grep for `cmd2.__version__`). If we go for bumping the minimum version to `2.6.2`, it no longer makes sense to have the quirks for `<2.3.0` and `<2.0.0`. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41642?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I71cee0ec3ed2abec68ec567beaab13c868721dad Gerrit-Change-Number: 41642 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Dec 2025 14:20:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in pysim[master]: setup.py: Align cmd2 minimum version with requirements.txt
by fixeria 10 Dec '25

10 Dec '25

Attention is currently required from: dexter, laforge, neels. fixeria has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/41642?usp=email ) Change subject: setup.py: Align cmd2 minimum version with requirements.txt ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41642?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I71cee0ec3ed2abec68ec567beaab13c868721dad Gerrit-Change-Number: 41642 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Dec 2025 14:09:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-epdg[master]: s2b: when socket opening fails, stop the S2b module
by laforge 10 Dec '25

10 Dec '25

Attention is currently required from: fixeria, lynxis lazus, pespin. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901?usp=email ) Change subject: s2b: when socket opening fails, stop the S2b module ...................................................................... Patch Set 5: (1 comment) File src/epdg_gtpc_s2b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901/comment/57f630fc_bcc8… : PS3, Line 150: io_lib:format > Well, the general approach is that formatted strings are for humans. […] I agree with fixeria -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I49a6a1ec0c938aa70444c19c0b7b644f2e42f1fd Gerrit-Change-Number: 37901 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 10 Dec 2025 13:39:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-mgw[master]: mgcp_client: add fmtp string to struct ptmap
by laforge 10 Dec '25

10 Dec '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/41629?usp=email ) Change subject: mgcp_client: add fmtp string to struct ptmap ...................................................................... mgcp_client: add fmtp string to struct ptmap Allow MGCP clients to pass arbitrary fmtp strings to MGWs, beyond the fixed set of parameters captured in legacy struct mgcp_codec_param, and set a different fmtp string per payload type, as opposed to global. Credit: this patch is a derivative work based on Neels Hofmeyr's patch If58590bda8627519ff07e0b6f43aa47a274f052b from WIP branch neels/sdp, reduced to just libosmo-mgcp-client. Present necessity: this functional addition is needed in order to allow osmo-bsc to pass this construct to its MGW when the CN requested the use of TW-TS-006 extended payload format for AMR: a=rtpmap:112 AMR/8000/1 a=fmtp:112 octet-align=1; tw-ts-006=1 AMR codec fmtp parameter tw-ts-006 (defined in TW-TS-006 spec section B.1) is not supported by osmo-mgw; however, it is supported by tw-e1abis-mgw, which is the OsmoBSC-compatible MGW needed for E1 BTS with AMR and CSD. Change-Id: I84ba2ed5ab9d379ac0b675520796446ad6ee0710 --- M TODO-RELEASE M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c 4 files changed, 49 insertions(+), 30 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..582e4ce 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-mgcp-client ABI break struct ptmap extended diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index d53f442..2cddf00 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -78,6 +78,9 @@ /*! payload type number (96-127) */ unsigned int pt; + + /*! the MGCP 'a=fmtp:N <...>' string, e.g. "mode-set=1,2,3;octet-align=0". */ + char fmtp[256]; }; int ptmap_cmp(const struct ptmap *a, const struct ptmap *b); diff --git a/include/osmocom/mgcp_client/mgcp_client_fsm.h b/include/osmocom/mgcp_client/mgcp_client_fsm.h index dbd5128..3e31e9c 100644 --- a/include/osmocom/mgcp_client/mgcp_client_fsm.h +++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h @@ -57,10 +57,11 @@ * address is set. If != MGCP_CONN_NONE, force this conn mode. */ enum mgcp_connection_mode conn_mode; - /*! If the codec requires additional format parameters (fmtp), those cann be set here, see also - * mgcp_common.h */ - bool param_present; - struct mgcp_codec_param param; + /*! Deprectated, use ptmap[].fmtp instead. + * Global codec params. In case the codec requires additional format parameters (fmtp), those can be set + * here, see also mgcp_common.h. The format parameters will be applied on all codecs where applicable. */ + bool param_present OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use ptmap[].fmtp instead"); + struct mgcp_codec_param param OSMO_DEPRECATED_OUTSIDE_LIBOSMOMGCPCLIENT("use ptmap[].fmtp instead"); }; struct osmo_fsm_inst *mgcp_conn_create(struct mgcp_client *mgcp, struct osmo_fsm_inst *parent_fi, uint32_t parent_term_evt, diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 4924be4..09c273c 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1425,34 +1425,45 @@ MSGB_PRINTF_OR_RET("\r\n"); /* Add optional codec parameters (fmtp) */ - if (mgcp_msg->param_present) { - for (i = 0; i < mgcp_msg->ptmap_len; i++) { - pt = mgcp_msg->ptmap[i].pt; - switch (mgcp_msg->ptmap[i].codec) { - case CODEC_AMR_8000_1: - case CODEC_AMRWB_16000_1: - if (!mgcp_msg->param.amr_octet_aligned_present) - break; - MSGB_PRINTF_OR_RET("a=fmtp:%u octet-align=%d\r\n", - pt, (int)mgcp_msg->param.amr_octet_aligned); + for (i = 0; i < mgcp_msg->ptmap_len; i++) { + pt = mgcp_msg->ptmap[i].pt; + + /* Add fmtp string, if any is set. */ + if (mgcp_msg->ptmap[i].fmtp[0]) { + MSGB_PRINTF_OR_RET("a=fmtp:%u %s\r\n", pt, + mgcp_msg->ptmap[i].fmtp); + continue; + } + + /* LEGACY COMPAT. Fill in fmtp with the legacy mgcp_msg->param, + * if any, when no individual fmtp is set on the codec. */ + if (!mgcp_msg->param_present) + continue; + + switch (mgcp_msg->ptmap[i].codec) { + case CODEC_AMR_8000_1: + case CODEC_AMRWB_16000_1: + if (!mgcp_msg->param.amr_octet_aligned_present) break; - case CODEC_GSM_8000_1: - case CODEC_GSMEFR_8000_1: - if (!mgcp_msg->param.fr_efr_twts001_present) - break; - MSGB_PRINTF_OR_RET("a=fmtp:%u tw-ts-001=%d\r\n", - pt, (int)mgcp_msg->param.fr_efr_twts001); + MSGB_PRINTF_OR_RET("a=fmtp:%u octet-align=%d\r\n", + pt, (int)mgcp_msg->param.amr_octet_aligned); + break; + case CODEC_GSM_8000_1: + case CODEC_GSMEFR_8000_1: + if (!mgcp_msg->param.fr_efr_twts001_present) break; - case CODEC_GSMHR_8000_1: - if (!mgcp_msg->param.hr_twts002_present) - break; - MSGB_PRINTF_OR_RET("a=fmtp:%u tw-ts-002=%d\r\n", - pt, (int)mgcp_msg->param.hr_twts002); + MSGB_PRINTF_OR_RET("a=fmtp:%u tw-ts-001=%d\r\n", + pt, (int)mgcp_msg->param.fr_efr_twts001); + break; + case CODEC_GSMHR_8000_1: + if (!mgcp_msg->param.hr_twts002_present) break; - default: - /* no parameters for the remaining codecs */ - break; - } + MSGB_PRINTF_OR_RET("a=fmtp:%u tw-ts-002=%d\r\n", + pt, (int)mgcp_msg->param.hr_twts002); + break; + default: + /* no parameters for the remaining codecs */ + break; } } @@ -1686,5 +1697,8 @@ rc = OSMO_CMP(a->codec, b->codec); if (rc) return rc; - return OSMO_CMP(a->pt, b->pt); + rc = OSMO_CMP(a->pt, b->pt); + if (rc) + return rc; + return strcmp(a->fmtp, b->fmtp); } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/41629?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I84ba2ed5ab9d379ac0b675520796446ad6ee0710 Gerrit-Change-Number: 41629 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

2025

2024

2023

2022

gerrit-log