- gerrit-log - lists.osmocom.org

[S] Change in osmo-ccid-firmware[master]: fix wait time extension handling
by laforge 04 Feb '26

04 Feb '26

Attention is currently required from: Hoernchen. laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42049?usp=email ) Change subject: fix wait time extension handling ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42049/comment/18278323_49… : PS1, Line 7: fix wait time extension handling I'm sorry, but the commit log is missing. Of course we fix something in the commit, but what bug exactly is fixed here is the relevant part. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42049?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I7527a4337ae857b9b2a4e982606fac770e677d73 Gerrit-Change-Number: 42049 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Feb 2026 14:09:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in pysim[master]: esim/http_json_api: add alternative API interface
by dexter 04 Feb '26

04 Feb '26

Attention is currently required from: laforge, neels. Hello Jenkins Builder, laforge, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/42043?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: esim/http_json_api: add alternative API interface ...................................................................... esim/http_json_api: add alternative API interface unfortunately the API changes introduced in change I277aa90fddb5171c4bf6c3436259aa371d30d092 broke the API interface of http_json_api.py. This was taken into account and necessary to introduce add the server functionality next to the already existing client functionality. The changes to the API were minimal and all code locations that use http_json_api.py were re-aligned. Unfortunately it was not clear at this point in time that there are out-of-tree projects that could be affected by API changes in http_json_api.py To mitigate the problem this patch introduces an alternative API interface to the JsonHttpApiFunction base class. This alternative API interface works like the old API interface when the class is instantiated in the original way. To make use of the revised client the API use has to pass an additional keyword argument that defines the role. Related: SYS#7866 Change-Id: I2a5d4b59b12e08d5eae7a1215814d3a69c8921f6 --- M pySim/esim/http_json_api.py 1 file changed, 51 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/42043/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42043?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: I2a5d4b59b12e08d5eae7a1215814d3a69c8921f6 Gerrit-Change-Number: 42043 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 0

[M] Change in pysim[master]: esim/http_json_api: add alternative API interface
by dexter 04 Feb '26

04 Feb '26

Attention is currently required from: laforge, neels. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/42043?usp=email ) Change subject: esim/http_json_api: add alternative API interface ...................................................................... Patch Set 5: (2 comments) File pySim/esim/http_json_api.py: https://gerrit.osmocom.org/c/pysim/+/42043/comment/d7c7e735_819bcc53?usp=em… : PS4, Line 237: > I think you probably wanted to remove those print statements before submitting it here? ;) Done https://gerrit.osmocom.org/c/pysim/+/42043/comment/a4286226_1b0a0490?usp=em… : PS4, Line 272: > not sure we want those all the time from sysmo-esim-mgr. […] Its probably enough if we warn once during the instantiation. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42043?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: I2a5d4b59b12e08d5eae7a1215814d3a69c8921f6 Gerrit-Change-Number: 42043 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 04 Feb 2026 14:08:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-dev[master]: sanitize.opts: Add missing osmo-pcap project
by laforge 04 Feb '26

04 Feb '26

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-dev/+/42016?usp=email ) Change subject: sanitize.opts: Add missing osmo-pcap project ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/42016?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I637215c325c28604c9e021dfac8d066238b9f38c Gerrit-Change-Number: 42016 Gerrit-PatchSet: 1 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: Wed, 04 Feb 2026 14:08:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in docker-playground[master]: osmo-ns-master: drop python3-osmopy-utils / --enable-external-tests
by laforge 04 Feb '26

04 Feb '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/41996?usp=email ) Change subject: osmo-ns-master: drop python3-osmopy-utils / --enable-external-tests ...................................................................... osmo-ns-master: drop python3-osmopy-utils / --enable-external-tests --enable-external-tests requires python3-osmopy-utils, however this package is no longer available for debian:10. We're not running tests, so it's not really needed. Removing it fixes ttcn3-ns-test-fr. Change-Id: I342099be87175dfe189a8906b53ee26328c0a417 --- M osmo-ns-master/Dockerfile 1 file changed, 1 insertion(+), 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/osmo-ns-master/Dockerfile b/osmo-ns-master/Dockerfile index 35e360d..a76e459 100644 --- a/osmo-ns-master/Dockerfile +++ b/osmo-ns-master/Dockerfile @@ -8,7 +8,6 @@ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - python3-osmopy-utils \ libmnl-dev && \ apt-get clean \ ;; \ @@ -31,7 +30,7 @@ (git symbolic-ref -q HEAD && git reset --hard origin/$LIBOSMOCORE_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ - CONFIGURE_FLAGS="--disable-doxygen --disable-pcsc --enable-external-tests" && \ + CONFIGURE_FLAGS="--disable-doxygen --disable-pcsc" && \ if [ "$DISTRO" = "debian-buster" ]; then \ CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-uring"; \ fi && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41996?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I342099be87175dfe189a8906b53ee26328c0a417 Gerrit-Change-Number: 41996 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in docker-playground[master]: osmo-ns-master: drop python3-osmopy-utils / --enable-external-tests
by laforge 04 Feb '26

04 Feb '26

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/docker-playground/+/41996?usp=email ) Change subject: osmo-ns-master: drop python3-osmopy-utils / --enable-external-tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41996?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I342099be87175dfe189a8906b53ee26328c0a417 Gerrit-Change-Number: 41996 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Feb 2026 14:07:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: cosmetic: xua_as_fsm.c: Improve spec documentation
by laforge 04 Feb '26

04 Feb '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42030?usp=email ) Change subject: cosmetic: xua_as_fsm.c: Improve spec documentation ...................................................................... cosmetic: xua_as_fsm.c: Improve spec documentation The specific spec paragraph talks about "Alternate ASP_Active" scenario in quotes, which I could find right away by grepping in the code. Improve the documentation so it can be easily matched in code. Change-Id: I79f5123d87dab79620657c2a2ebfd9fe22f178c3 --- M src/xua_as_fsm.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index fd44e70..092db55 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -310,8 +310,10 @@ return false; } -/* Tell other previously-active ASPs that a new ASP has been activated and mark - them as inactive. Used in override mode when an ASP becomes active. */ +/* RFC4666 4.3.4.3 "Alternate ASP_Active": + * Tell other previously-active ASPs that a new ASP has been activated and mark + * them as inactive. Used in override mode when an ASP becomes active." + * */ static void notify_any_other_active_asp_as_inactive(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp_cmp) { unsigned int i; @@ -612,7 +614,7 @@ break; case XUA_ASPAS_ASP_ACTIVE_IND: asp = data; - /* RFC466 sec 4.3.4.3 ASP Active Procedures*/ + /* RFC466 sec 4.3.4.3 ASP Active Procedures */ if (xafp->as->cfg.mode == OSMO_SS7_AS_TMOD_OVERRIDE) notify_any_other_active_asp_as_inactive(xafp->as, asp); /* SG role: No need to send DUNA for unknown destinations here -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42030?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I79f5123d87dab79620657c2a2ebfd9fe22f178c3 Gerrit-Change-Number: 42030 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in libosmo-sigtran[master]: cosmetic: xua_as_fsm.c: Improve spec documentation
by laforge 04 Feb '26

04 Feb '26

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42030?usp=email ) Change subject: cosmetic: xua_as_fsm.c: Improve spec documentation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42030?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I79f5123d87dab79620657c2a2ebfd9fe22f178c3 Gerrit-Change-Number: 42030 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Feb 2026 14:07:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: Fix race condition in TC_stat_stp_sctp_disconnected
by laforge 04 Feb '26

04 Feb '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42023?usp=email ) Change subject: hnbgw: Fix race condition in TC_stat_stp_sctp_disconnected ...................................................................... hnbgw: Fix race condition in TC_stat_stp_sctp_disconnected It can happen that first time check for sgsn/msc state they are still connecting to stp (M3UA) or to ttcn3 process (SCCP/RANAP). Use wait_converge=true to simply wait until they are conncted. Change-Id: I15a6a9b9cf47f95d88bca75d0c6f88547f1dad40 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 2a55eb6..f679205 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -2673,7 +2673,7 @@ {name := msc0_prefix & "connected", mtype := "g", min := 0, max := 0}, {name := sgsn0_prefix & "connected", mtype := "g", min := 0, max := 0} }; - f_statsd_expect(expect_connected); + f_statsd_expect(expect_connected, wait_converge := true); disconnect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assignment), f_TestHdlrParams(3)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42023?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I15a6a9b9cf47f95d88bca75d0c6f88547f1dad40 Gerrit-Change-Number: 42023 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>

1 0

[M] Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Assume SCCP peer available if rx BSSAP/RANAP Reset
by laforge 04 Feb '26

04 Feb '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42024?usp=email ) Change subject: RAN_Emulation: Assume SCCP peer available if rx BSSAP/RANAP Reset ...................................................................... RAN_Emulation: Assume SCCP peer available if rx BSSAP/RANAP Reset This way we speed up tests, and also avoid extra verbosity by avoiding receiving and transmitting extra RESET. Change-Id: Id9020320b61d89720e17e1024b629f0227445266 --- M bsc/BSC_Tests.ttcn M library/RAN_Emulation.ttcnpp M msc/MSC_Tests.ttcn 3 files changed, 58 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 6b3aa96..a9d063d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1219,14 +1219,20 @@ connect(self:SCCPLITE_IPA_CTRL, g_bssap[bssap_idx].vc_RAN:CTRL_CLIENT); f_ran_adapter_start(g_bssap[bssap_idx]); } else { + var boolean rx_reset; f_sccp_adapter_init(g_bssap[bssap_idx].sccpa, mp_bssap_cfg[bssap_idx].sccp, "VirtMSC"); if (isbound(g_bssap[bssap_idx].sccpa.vc_IPA)) { connect(self:SCCPLITE_IPA_CFG_PORT[bssap_idx], g_bssap[bssap_idx].sccpa.vc_IPA:CFG_PORT); } connect(self:BSSAP, g_bssap[bssap_idx].sccpa.vc_SCCP:SCCP_SP_PORT); f_sccp_adapter_start(g_bssap[bssap_idx].sccpa); - f_bssap_wait_sccp_peer_available(BSSAP, bit2int(g_bssap[bssap_idx].sccpa.sccp_addr_peer.signPointCode)); - f_legacy_bssap_reset(); + rx_reset := f_bssap_wait_sccp_peer_available(BSSAP, + g_bssap[bssap_idx].sccpa.sccp_addr_peer, + g_bssap[bssap_idx].sccpa.sccp_addr_own, + g_osmux_enabled_cn and g_bssap[bssap_idx].sccpa.cfg.transport == SCCP_TRANSPORT_SIGTRAN); + if (not rx_reset) { + f_legacy_bssap_reset(); + } } } diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index d308355..f3eea3e 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -1387,11 +1387,18 @@ } #ifdef RAN_EMULATION_BSSAP -function f_bssap_wait_sccp_peer_available(BSSAP_CODEC_PT pt, integer peer_pc, float timeout_sec := 3.0) +/* returns true if upper layer (RANAP) is also ready (RESET received and acked) */ +function f_bssap_wait_sccp_peer_available(BSSAP_CODEC_PT pt, + SCCP_PAR_Address addr_peer, + template (present) SCCP_PAR_Address addr_local := ?, + boolean append_osmux_support := false, + float timeout_sec := 3.0) return boolean { timer T; var ASP_SCCP_N_PCSTATE_ind n_pcstate_ind; + var BSSAP_N_UNITDATA_ind ud_ind; var boolean rx_explicit_down := false; + var integer peer_pc := bit2int(addr_peer.signPointCode); log("Waiting for SCCP peer PC=", peer_pc, " to become available"); T.start(timeout_sec); @@ -1408,12 +1415,20 @@ log("SCCP peer PC=", aff_pc," is now available"); /* All peer is available, we are done */ T.stop; - return; + return false; } log("SCCP peer PC=", aff_pc," is NOT available: ", n_pcstate_ind); rx_explicit_down := true; repeat; } + [] pt.receive(tr_BSSAP_UNITDATA_ind(addr_local, addr_peer, tr_BSSMAP_Reset(append_osmux_support))) -> value ud_ind { + log("Waiting for SCCP peer PC=", peer_pc, ": Rx BSSMAP RANAP RESET, ACKing"); + pt.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress, + ts_BSSMAP_ResetAck(append_osmux_support))); + /* Peer is available on BSSAP, so it must also be available on SCCP; done. */ + T.stop; + return true; + } [] pt.receive { log("Waiting for SCCP peer PC=", peer_pc, ": Discarding message"); repeat; @@ -1428,15 +1443,23 @@ } } log("Done waiting for SCCP peer PC=", peer_pc); + return false; } #endif #ifdef RAN_EMULATION_RANAP -function f_ranap_wait_sccp_peer_available(RANAP_CODEC_PT pt, integer peer_pc, float timeout_sec := 3.0) +/* returns true if upper layer (RANAP) is also ready (RESET received and acked) */ +private function f_ranap_wait_sccp_peer_available(RANAP_CODEC_PT pt, + SCCP_PAR_Address addr_peer, + template (present) SCCP_PAR_Address addr_local := ?, + template (value) GlobalRNC_ID grnc_id, + float timeout_sec := 3.0) return boolean { timer T; var ASP_SCCP_N_PCSTATE_ind n_pcstate_ind; + var RANAP_N_UNITDATA_ind rud_ind; var boolean rx_explicit_down := false; + var integer peer_pc := bit2int(addr_peer.signPointCode); log("Waiting for SCCP peer PC=", peer_pc, " to become available"); T.start(timeout_sec); @@ -1453,12 +1476,22 @@ log("SCCP peer PC=", aff_pc," is now available"); /* All peer is available, we are done */ T.stop; - return; + return false; } log("SCCP peer PC=", aff_pc," is NOT available: ", n_pcstate_ind); rx_explicit_down := true; repeat; } + [] pt.receive(tr_RANAP_UNITDATA_ind(addr_local, addr_peer, tr_RANAP_Reset)) -> value rud_ind { + log("Waiting for SCCP peer PC=", peer_pc, ": Rx Iu RANAP RESET, ACKing"); + var CN_DomainIndicator dom; + dom := rud_ind.userData.initiatingMessage.value_.Reset.protocolIEs[1].value_.cN_DomainIndicator; + pt.send(ts_RANAP_UNITDATA_req(rud_ind.callingAddress, rud_ind.calledAddress, + f_ts_RANAP_ResetAck(dom, grnc_id))); + /* Peer is available on RANAP, so it must also be available on SCCP; done. */ + T.stop; + return true; + } [] pt.receive { log("Waiting for SCCP peer PC=", peer_pc, ": Discarding message"); repeat; @@ -1473,6 +1506,7 @@ } } log("Done waiting for SCCP peer PC=", peer_pc); + return false; } #endif @@ -1484,21 +1518,26 @@ f_expect_table_init(); if (isvalue(ops.sccp_addr_peer) and isvalue(ops.sccp_addr_local)) { + var boolean received_reset := false; select (g_ran_ops.protocol) { #ifdef RAN_EMULATION_BSSAP case (RAN_PROTOCOL_BSSAP) { if (ispresent(ops.sccp_addr_peer.signPointCode)) { - f_bssap_wait_sccp_peer_available(BSSAP, bit2int(ops.sccp_addr_peer.signPointCode)); + received_reset := f_bssap_wait_sccp_peer_available(BSSAP, ops.sccp_addr_peer, ops.sccp_addr_local, append_osmux_ie()); } - f_bssap_reset(ops.sccp_addr_peer, ops.sccp_addr_local); + if (not received_reset) { + f_bssap_reset(ops.sccp_addr_peer, ops.sccp_addr_local); + } } #endif #ifdef RAN_EMULATION_RANAP case (RAN_PROTOCOL_RANAP) { if (ispresent(ops.sccp_addr_peer.signPointCode)) { - f_ranap_wait_sccp_peer_available(RANAP, bit2int(ops.sccp_addr_peer.signPointCode)); + received_reset := f_ranap_wait_sccp_peer_available(RANAP, ops.sccp_addr_peer, ops.sccp_addr_local, ops.grnc_id); } - f_ranap_reset(ops.sccp_addr_peer, ops.sccp_addr_local, ops.grnc_id); + if (not received_reset) { + f_ranap_reset(ops.sccp_addr_peer, ops.sccp_addr_local, ops.grnc_id); + } } #endif } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 51d8755..5464355 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2310,7 +2310,9 @@ f_init_bssap_direct(); f_sccp_adapter_start(g_bssap[0].sccpa); - f_bssap_wait_sccp_peer_available(BSSAP_DIRECT, bit2int(g_bssap[0].sccpa.sccp_addr_peer.signPointCode)); + f_bssap_wait_sccp_peer_available(BSSAP_DIRECT, + g_bssap[0].sccpa.sccp_addr_peer, + g_bssap[0].sccpa.sccp_addr_own); /* Make a blind connection attemt, to trigger the deadlock condition */ BSSAP_DIRECT.send(ts_BSSAP_CONNECT_req(g_bssap[0].sccpa.sccp_addr_peer, g_bssap[0].sccpa.sccp_addr_own, 1, omit)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id9020320b61d89720e17e1024b629f0227445266 Gerrit-Change-Number: 42024 Gerrit-PatchSet: 5 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>

1 0

2026

2025

2024

2023

2022

gerrit-log