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

[XS] Change in pysim[master]: pyshark_gsmtap: Adjust display filter for some wireshark versions
by laforge 18 Dec '25

18 Dec '25

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/41712?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified-1 by Jenkins Builder Change subject: pyshark_gsmtap: Adjust display filter for some wireshark versions ...................................................................... pyshark_gsmtap: Adjust display filter for some wireshark versions On my debian unstable system with wireshark 4.6.2-3, the pyshark_gsmtap APDU source misses to report any ATRs, as those are not part of what's reported with the 'gsm_sim' display filter. This is due to wireshark.git commit bcd82e2370d18e20983b378d494964d89c191cef first part of the 4.6.0 release, which splits the ATR dissection into a separate sub-dissector. We cannot use the seemingly logical 'gsmtap.type == 4' instead, as old wireshark simply bypasses any output for the gsmtap header if the SIM sub-dissector is used. Hence, 'gsm_sim || iso7816.atr' is something compatible with older and newer wireshark versions. Change-Id: I53c1c8ed58a82c37cd4be4af3890af21da839e86 --- M pySim/apdu_source/pyshark_gsmtap.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/12/41712/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41712?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I53c1c8ed58a82c37cd4be4af3890af21da839e86 Gerrit-Change-Number: 41712 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Support Tx RESET retries in RANAP
by fixeria 18 Dec '25

18 Dec '25

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41723?usp=email ) Change subject: RAN_Emulation: Support Tx RESET retries in RANAP ...................................................................... Patch Set 1: (2 comments) File library/RAN_Emulation.ttcnpp: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41723/comment/9ef55c19_72a9… : PS1, Line 821: [] as_reset_ack(); ```suggestion [] as_reset_ack() { repeat; } ``` Otherwise we are not rescheduling the timer properly. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41723/comment/a35902e2_8f22… : PS1, Line 829: BSSMAP It should still be `RANAP`, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41723?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: I84553ae7aee19efa007bae060d7f7ca218a5f306 Gerrit-Change-Number: 41723 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 19:24:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-bsc[master]: E1: add support for compressed CSD (TW-TS-007)
by falconia 18 Dec '25

18 Dec '25

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41647?usp=email ) Change subject: E1: add support for compressed CSD (TW-TS-007) ...................................................................... E1: add support for compressed CSD (TW-TS-007) Using TW-TS-007 format for CSD instead of CLEARMODE across AoIP interface drastically reduces IP bandwidth usage, making CSD equal to speech calls. If the CN requests use of this compressed RTP format for CSD and the MGW supports it (currently the case with tw-e1abis-mgw for E1 BTS), then enable it on AoIP side. Depends: I74c9e76ebcce32ad20501134ec5089794acb4f62 (libosmocore.git) Change-Id: I5d98309cfc5d443278479252846c66a7da8b4ce4 --- M TODO-RELEASE M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c 3 files changed, 20 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 1d65ba1..fa4fe07 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # 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 >1.15.0 new API of fmtp in struct ptmap +libosmogsm >1.12.0 OSMO_AOIP_RTP_PT_TWTS007 in gsm_48_103.h diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index c5363b8..f0a2781 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -568,6 +568,9 @@ if ((requested_ext & OSMO_RTP_EXT_TWTS006) && is_e1_bts(bts)) accepted_ext |= OSMO_RTP_EXT_TWTS006; + if ((requested_ext & OSMO_RTP_EXT_TWTS007) && is_e1_bts(bts)) + accepted_ext |= OSMO_RTP_EXT_TWTS007; + conn->user_plane.rtp_extensions = accepted_ext; } diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 7d80a73..4d0217b 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -947,6 +947,7 @@ { enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->activate.ch_mode_rate.chan_mode, lchan->type == GSM_LCHAN_TCH_H? false : true); + uint8_t rtp_ext = lchan->conn->user_plane.rtp_extensions; int pt, amr_oa; if (codec < 0) { @@ -993,7 +994,7 @@ * OsmoBTS in the future, it will strictly require no-alteration * pass-through from the BSC-associated MGW. Therefore, * indicate this format on both sides when it is enabled. */ - if (lchan->conn->user_plane.rtp_extensions & OSMO_RTP_EXT_TWTS006) { + if (rtp_ext & OSMO_RTP_EXT_TWTS006) { OSMO_STRLCPY_ARRAY(verb_info->ptmap[0].fmtp, "octet-align=1;tw-ts-006=1"); break; @@ -1009,13 +1010,25 @@ break; case CODEC_GSM_8000_1: case CODEC_GSMEFR_8000_1: - if (lchan->conn->user_plane.rtp_extensions & OSMO_RTP_EXT_TWTS001) + if (rtp_ext & OSMO_RTP_EXT_TWTS001) OSMO_STRLCPY_ARRAY(verb_info->ptmap[0].fmtp, "tw-ts-001=1"); break; case CODEC_GSMHR_8000_1: - if (lchan->conn->user_plane.rtp_extensions & OSMO_RTP_EXT_TWTS002) + if (rtp_ext & OSMO_RTP_EXT_TWTS002) OSMO_STRLCPY_ARRAY(verb_info->ptmap[0].fmtp, "tw-ts-002=1"); break; + case CODEC_CLEARMODE: + /* There are no fmtp parameters for CSData - however, if + * TW-TS-007 compressed CSD format was requested by the CN, + * then we need to tell our MGW to use this format. But only + * on AoIP side - the representation of CSD toward IP-based BTS + * remains CLEARMODE until and unless we decide to implement + * TW-TS-007 compressed CSD format in OsmoBTS. */ + if ((rtp_ext & OSMO_RTP_EXT_TWTS007) && !bss_side) { + verb_info->ptmap[0].codec = CODEC_COMPR_CSD; + verb_info->ptmap[0].pt = OSMO_AOIP_RTP_PT_TWTS007; + } + break; default: break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5d98309cfc5d443278479252846c66a7da8b4ce4 Gerrit-Change-Number: 41647 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bsc[master]: E1: add support for compressed CSD (TW-TS-007)
by fixeria 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, laforge. fixeria has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41647?usp=email ) Change subject: E1: add support for compressed CSD (TW-TS-007) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5d98309cfc5d443278479252846c66a7da8b4ce4 Gerrit-Change-Number: 41647 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 18 Dec 2025 18:55:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-msc[master]: add vty setting for ThemWi RTP formats
by fixeria 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, pespin. fixeria has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-msc/+/41698?usp=email ) Change subject: add vty setting for ThemWi RTP formats ...................................................................... Patch Set 6: (1 comment) File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/41698/comment/5df4a316_98bf05ba?usp… : PS5, Line 694: "tw-rtp-formats (fr|hr|amr|csd) [(fr|hr|amr|csd)] [(fr|hr|amr|csd)] [(fr|hr|amr|csd)]", > You can put "(fr|hr|amr|csd)" in a define above and use it here 4 times. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icea152f5f2cdbcb0df09ef5b7211d1461b499f14 Gerrit-Change-Number: 41698 Gerrit-PatchSet: 6 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 18:55:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-msc[master]: add vty setting for ThemWi RTP formats
by fixeria 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, pespin. fixeria has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-msc/+/41698?usp=email ) Change subject: add vty setting for ThemWi RTP formats ...................................................................... Patch Set 6: Code-Review+1 (1 comment) File TODO-RELEASE: https://gerrit.osmocom.org/c/osmo-msc/+/41698/comment/ed6eb1c6_f379fc94?usp… : PS5, Line 10: vty >1.12.0 working optional-multi-choice > libosmovty […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icea152f5f2cdbcb0df09ef5b7211d1461b499f14 Gerrit-Change-Number: 41698 Gerrit-PatchSet: 6 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 18:55:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-msc[master]: add vty setting for ThemWi RTP formats
by falconia 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/41698?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: add vty setting for ThemWi RTP formats ...................................................................... add vty setting for ThemWi RTP formats For every GSM speech codec and for CSD, Osmocom BSS supports both the standard RTP format prescribed by 3GPP and an alternative enhanced RTP format invented by Themyscira Wireless: TW-TS-001, TW-TS-002, TW-TS-006 and TW-TS-007. In order to enable these enhanced RTP formats, the MSC needs to include an extension IE in the Assignment Request it sends to the BSS. Until now there was no way to do so in mainline OsmoMSC, only via local code patches - fix this omission. The following considerations apply to this new tw-rtp-formats vty setting: * When internal MNCC is used, it is beneficial to enable enhanced TW RTP formats, especially when using E1 BTS with tw-e1abis-mgw: the DL call leg receives more complete information content from the UL call leg in each direction. * When external MNCC is used with non-ThemWi CN software (e.g., with a PBX via osmo-sip-connector), tw-rtp-formats should NOT be enabled - off-the-shelf PBX etc software won't understand them. * Future patches will allow osmo-msc to operate with a ThemWi transcoding MGW (TC to G.711) in the place of non-TC osmo-mgw; in that configuration TW RTP formats will become mandatory, as they are strictly required by ThemWi TC implementation. Depends: I4c184db53bec28ab42bcd45e033733d850eea5d2 (libosmocore.git) Change-Id: Icea152f5f2cdbcb0df09ef5b7211d1461b499f14 --- M TODO-RELEASE M include/osmocom/msc/gsm_data.h M include/osmocom/msc/ran_msg.h M src/libmsc/msc_a.c M src/libmsc/msc_vty.c M src/libmsc/ran_msg_a.c M tests/test_nodes.vty 7 files changed, 78 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/98/41698/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icea152f5f2cdbcb0df09ef5b7211d1461b499f14 Gerrit-Change-Number: 41698 Gerrit-PatchSet: 6 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in pysim[master]: card_key_provider: add PostgreSQL support
by fixeria 18 Dec '25

18 Dec '25

Attention is currently required from: daniel, dexter, laforge. fixeria has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41508?usp=email ) Change subject: card_key_provider: add PostgreSQL support ...................................................................... Patch Set 5: (3 comments) File contrib/csv-to-pgsql.py: https://gerrit.osmocom.org/c/pysim/+/41508/comment/2a3b526c_05475850?usp=em… : PS5, Line 38: table_name Maybe do the `self.table = lower(table_name)` here to avoid doing this in each query? https://gerrit.osmocom.org/c/pysim/+/41508/comment/f78ee9bd_3c7e041e?usp=em… : PS5, Line 132: %s;", (self.table.lower(),)) Why not using `SQL("...").format(...)` here like you do above? File setup.py: https://gerrit.osmocom.org/c/pysim/+/41508/comment/3e9c6337_a820596a?usp=em… : PS4, Line 37: psycopg2-binary > What if we leave it out and mention it in the manual that it is needed when someone wants to use the CardKeyProviderPgsql? Would that be an option? This is indeed an option. Also, we do have `extras_require` below - this is where you can specify optional dependencies. You would also need to take care of importing the `psycopg2` not globally, but in a specific place (e.g. during the class instance instantiation). -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41508?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: Icba625c02a60d7e1f519b506a46bda5ded0537d3 Gerrit-Change-Number: 41508 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 18:51:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in osmo-msc[master]: add vty setting for ThemWi RTP formats
by pespin 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, fixeria. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-msc/+/41698?usp=email ) Change subject: add vty setting for ThemWi RTP formats ...................................................................... Patch Set 5: (2 comments) File TODO-RELEASE: https://gerrit.osmocom.org/c/osmo-msc/+/41698/comment/8d1ddf0d_1107615a?usp… : PS5, Line 10: vty >1.12.0 working optional-multi-choice libosmovty You can use ">=1.12.1" here, since it's more precise and I already did a patch release today with it. File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/41698/comment/471d19fc_3f03baff?usp… : PS5, Line 694: "tw-rtp-formats (fr|hr|amr|csd) [(fr|hr|amr|csd)] [(fr|hr|amr|csd)] [(fr|hr|amr|csd)]", You can put "(fr|hr|amr|csd)" in a define above and use it here 4 times. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icea152f5f2cdbcb0df09ef5b7211d1461b499f14 Gerrit-Change-Number: 41698 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 17:50:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-ttcn3-hacks[master]: BSSAP_LE_Emulation: Support Tx RESET retries
by pespin 18 Dec '25

18 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41724?usp=email ) Change subject: BSSAP_LE_Emulation: Support Tx RESET retries ...................................................................... BSSAP_LE_Emulation: Support Tx RESET retries Have same code as we use in RAN_Emulation.ttcnpp. Change-Id: I475f93ff0b8cbfa5aa4900d02ddcb2e97fa5ca6a --- M bsc/MSC_ConnectionHandler.ttcn M library/BSSAP_LE_Emulation.ttcn M smlc/BSC_ConnectionHandler.ttcn 3 files changed, 23 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/41724/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 3c6e1b0..f18e294 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -641,6 +641,7 @@ unitdata_cb := refers(BSSAP_LE_UnitdataCallback), decode_dtap := false, role_ms := false, + bssap_le_reset_retries := 1, sccp_addr_local := omit, sccp_addr_peer := omit } diff --git a/library/BSSAP_LE_Emulation.ttcn b/library/BSSAP_LE_Emulation.ttcn index fe85e58..44afc89 100644 --- a/library/BSSAP_LE_Emulation.ttcn +++ b/library/BSSAP_LE_Emulation.ttcn @@ -310,21 +310,29 @@ private function f_bssap_le_reset(SCCP_PAR_Address peer, SCCP_PAR_Address own) runs on BSSAP_LE_Emulation_CT { timer T := 5.0; + var integer attempts := g_ran_ops.bssap_le_reset_retries; - BSSAP_LE.send(ts_BSSAP_LE_UNITDATA_req(peer, own, ts_BSSMAP_LE_Reset(GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE))); - T.start; - alt { - [] BSSAP_LE.receive(tr_BSSAP_LE_UNITDATA_ind(own, peer, tr_BSSMAP_LE_ResetAck)) { - log("BSSMAP-LE: Received RESET-ACK in response to RESET, we're ready to go!"); - g_reset_ack_ready := true; - } - [] as_reset_ack(); - [] BSSAP_LE.receive { repeat }; - [] T.timeout { - setverdict(fail, "BSSMAP-LE: Timeout waiting for RESET-ACK after sending RESET"); - mtc.stop; + while (attempts > 0) { + attempts := attempts - 1; + + BSSAP_LE.send(ts_BSSAP_LE_UNITDATA_req(peer, own, ts_BSSMAP_LE_Reset(GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE))); + T.start; + alt { + [] BSSAP_LE.receive(tr_BSSAP_LE_UNITDATA_ind(own, peer, tr_BSSMAP_LE_ResetAck)) { + log("BSSMAP-LE: Received RESET-ACK in response to RESET, we're ready to go!"); + g_reset_ack_ready := true; + return; + } + [] as_reset_ack(); + [] BSSAP_LE.receive { repeat }; + [] T.timeout { + continue; + } } } + + setverdict(fail, "BSSMAP: Timeout waiting for RESET-ACK after sending RESET"); + mtc.stop; } private function f_bssap_l3_is_rr(PDU_BSSAP_LE bssap) return boolean { @@ -339,6 +347,7 @@ BssmapLeUnitdataCallback unitdata_cb optional, boolean decode_dtap, boolean role_ms, + integer bssap_le_reset_retries, /* needed for performing BSSMAP RESET */ SCCP_PAR_Address sccp_addr_local optional, SCCP_PAR_Address sccp_addr_peer optional diff --git a/smlc/BSC_ConnectionHandler.ttcn b/smlc/BSC_ConnectionHandler.ttcn index bd787c7..fa5d66a 100644 --- a/smlc/BSC_ConnectionHandler.ttcn +++ b/smlc/BSC_ConnectionHandler.ttcn @@ -72,6 +72,7 @@ unitdata_cb := refers(BSSAP_LE_UnitdataCallback), decode_dtap := false, role_ms := false, + bssap_le_reset_retries := 1, sccp_addr_local := omit, sccp_addr_peer := omit } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41724?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: I475f93ff0b8cbfa5aa4900d02ddcb2e97fa5ca6a Gerrit-Change-Number: 41724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2025

2024

2023

2022

gerrit-log December 2025