- gerrit-log - lists.osmocom.org

[L] Change in libosmocore[master]: Implement log file target using osmo_io
by pespin 28 Jan '26

28 Jan '26

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/41925?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: Implement log file target using osmo_io ...................................................................... Implement log file target using osmo_io Reuse (struct log_target)->tgt_file->wqueue->except_cb to store the iofd pointer internally, since we are not allowed to change the struct log_target because it's public and we don't want to break the ABI. Using the wqueue except_cb is fine since that field was never used. Related: OS#6918 Change-Id: Ieb6420246454ef59442b1fd7b1d14e2c00fa69a5 --- M src/core/logging_file.c M tests/logging/logging_test.c M tests/logging/logging_test.err 3 files changed, 152 insertions(+), 131 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/41925/10 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41925?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieb6420246454ef59442b1fd7b1d14e2c00fa69a5 Gerrit-Change-Number: 41925 Gerrit-PatchSet: 10 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: logging_file: Avoid reopning file for stderr
by pespin 28 Jan '26

28 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41970?usp=email ) Change subject: logging_file: Avoid reopning file for stderr ...................................................................... logging_file: Avoid reopning file for stderr target->tgt_file.fname is NULL for stderr log target. Change-Id: I4a551b0c434c480e78852a0a4873700eac2f5853 --- M src/core/logging_file.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/41970/1 diff --git a/src/core/logging_file.c b/src/core/logging_file.c index a9a1cb7..6e01c26 100644 --- a/src/core/logging_file.c +++ b/src/core/logging_file.c @@ -55,6 +55,9 @@ OSMO_ASSERT(target->type == LOG_TGT_TYPE_FILE || target->type == LOG_TGT_TYPE_STDERR); OSMO_ASSERT(target->tgt_file.out || target->tgt_file.wqueue); + if (target->type == LOG_TGT_TYPE_STDERR) + return -ENOTSUP; + if (target->tgt_file.out) { fclose(target->tgt_file.out); target->tgt_file.out = fopen(target->tgt_file.fname, "a"); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41970?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4a551b0c434c480e78852a0a4873700eac2f5853 Gerrit-Change-Number: 41970 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in pysim[master]: contrib/csv-to-pgsql: add missing copyright header
by dexter 28 Jan '26

28 Jan '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/41969?usp=email ) Change subject: contrib/csv-to-pgsql: add missing copyright header ...................................................................... contrib/csv-to-pgsql: add missing copyright header Change-Id: Iad8b2c1abb6a80764d05c823fbd03a9eae0ec0ab --- M contrib/csv-to-pgsql.py 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/69/41969/1 diff --git a/contrib/csv-to-pgsql.py b/contrib/csv-to-pgsql.py index dad408d..416d870 100755 --- a/contrib/csv-to-pgsql.py +++ b/contrib/csv-to-pgsql.py @@ -1,5 +1,23 @@ #!/usr/bin/env python3 +# (C) 2025 by sysmocom - s.f.m.c. GmbH +# All Rights Reserved +# +# Author: Philipp Maier +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + import argparse import logging import csv -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41969?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iad8b2c1abb6a80764d05c823fbd03a9eae0ec0ab Gerrit-Change-Number: 41969 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: BSSAP_LE_Emulation: Handle N-PCSTATE.ind to wait for peer availability
by pespin 28 Jan '26

28 Jan '26

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41967?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: BSSAP_LE_Emulation: Handle N-PCSTATE.ind to wait for peer availability ...................................................................... BSSAP_LE_Emulation: Handle N-PCSTATE.ind to wait for peer availability Take the chance to explicitly log and discard other .ind primitives which would otherwise block the processing of messages. Related: OS#6907 Change-Id: I6a40d1ddcd3a7dbde9f6c8b51439e9ab4d1da469 --- M library/BSSAP_LE_CodecPort.ttcn M library/BSSAP_LE_Emulation.ttcn 2 files changed, 67 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/41967/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41967?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: I6a40d1ddcd3a7dbde9f6c8b51439e9ab4d1da469 Gerrit-Change-Number: 41967 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Handle N-PCSTATE.ind to wait for peer availability
by pespin 28 Jan '26

28 Jan '26

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41968?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: RAN_Emulation: Handle N-PCSTATE.ind to wait for peer availability ...................................................................... RAN_Emulation: Handle N-PCSTATE.ind to wait for peer availability Take the chance to explicitly log and discard other .ind primitives which would otherwise block the processing of messages. Change-Id: I86b481fca9b7be84f3cda9fbce83e60820fe7fc1 Related: OS#6907 --- M bsc/BSC_Tests.ttcn M library/BSSAP_CodecPort.ttcn M library/RAN_Emulation.ttcnpp M library/ranap/RANAP_CodecPort.ttcn M msc/MSC_Tests.ttcn 5 files changed, 139 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/41968/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41968?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: I86b481fca9b7be84f3cda9fbce83e60820fe7fc1 Gerrit-Change-Number: 41968 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[XS] Change in osmo-ttcn3-hacks[master]: cosmetic: library/BSSAP_CodecPort.ttcn: Fix trailing whitespace
by pespin 28 Jan '26

28 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41965?usp=email ) Change subject: cosmetic: library/BSSAP_CodecPort.ttcn: Fix trailing whitespace ...................................................................... cosmetic: library/BSSAP_CodecPort.ttcn: Fix trailing whitespace Change-Id: I3bbb035eda0690a862989a0ec4bda265b506db3a --- M library/BSSAP_CodecPort.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/41965/1 diff --git a/library/BSSAP_CodecPort.ttcn b/library/BSSAP_CodecPort.ttcn index 2bb6ab6..ce9248e 100644 --- a/library/BSSAP_CodecPort.ttcn +++ b/library/BSSAP_CodecPort.ttcn @@ -354,7 +354,7 @@ } with {extension "prototype(fast)" } -/* +/* type port BSSAP_CODEC_PT message map to SCCPasp_PT { out BSSAP_N_CONNECT_req to ASP_SCCP_N_CONNECT_req with f_enc_ConnectReq(), BSSAP_N_CONNECT_res to ASP_SCCP_N_CONNECT_res with f_enc_ConnectRes(), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41965?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: I3bbb035eda0690a862989a0ec4bda265b506db3a Gerrit-Change-Number: 41965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: smlc: Drop unused port BSSAP_LE in test_CT
by pespin 28 Jan '26

28 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41966?usp=email ) Change subject: smlc: Drop unused port BSSAP_LE in test_CT ...................................................................... smlc: Drop unused port BSSAP_LE in test_CT Change-Id: If9e45e890d595f6ee837b30b947456bcf39f67c1 --- M smlc/SMLC_Tests.ttcn 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/41966/1 diff --git a/smlc/SMLC_Tests.ttcn b/smlc/SMLC_Tests.ttcn index 1d317bb..5dc86e5 100644 --- a/smlc/SMLC_Tests.ttcn +++ b/smlc/SMLC_Tests.ttcn @@ -61,7 +61,6 @@ type component test_CT extends CTRL_Adapter_CT, StatsD_ConnHdlr { var BSSAP_LE_Adapter g_bssap_le[NUM_BSC]; - port BSSAP_LE_CODEC_PT BSSAP_LE; port TELNETasp_PT SMLCVTY; port TELNETasp_PT STPVTY; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41966?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: If9e45e890d595f6ee837b30b947456bcf39f67c1 Gerrit-Change-Number: 41966 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: BSSAP_LE_Emulation: Handle N-PCSTATE.ind to wait for peer availability
by pespin 28 Jan '26

28 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41967?usp=email ) Change subject: BSSAP_LE_Emulation: Handle N-PCSTATE.ind to wait for peer availability ...................................................................... BSSAP_LE_Emulation: Handle N-PCSTATE.ind to wait for peer availability Take the chance to explicitly log and discard other .ind primitives which would otherwise block the processing of messages. Related: OS#6907 Change-Id: I6a40d1ddcd3a7dbde9f6c8b51439e9ab4d1da469 --- M library/BSSAP_LE_CodecPort.ttcn M library/BSSAP_LE_Emulation.ttcn M msc/MSC_Tests.ttcn 3 files changed, 68 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/41967/1 diff --git a/library/BSSAP_LE_CodecPort.ttcn b/library/BSSAP_LE_CodecPort.ttcn index 418e55a..3e82cab 100644 --- a/library/BSSAP_LE_CodecPort.ttcn +++ b/library/BSSAP_LE_CodecPort.ttcn @@ -375,7 +375,7 @@ ASP_SCCP_N_RESET_ind -> ASP_SCCP_N_RESET_ind: simple; ASP_SCCP_N_RESET_cfm -> ASP_SCCP_N_RESET_cfm: simple; ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple; - ASP_SCCP_N_PCSTATE_ind -> -: discard)" + ASP_SCCP_N_PCSTATE_ind -> ASP_SCCP_N_PCSTATE_ind: simple)" } diff --git a/library/BSSAP_LE_Emulation.ttcn b/library/BSSAP_LE_Emulation.ttcn index 15930d5..2608243 100644 --- a/library/BSSAP_LE_Emulation.ttcn +++ b/library/BSSAP_LE_Emulation.ttcn @@ -371,6 +371,12 @@ var BSSAP_LE_N_CONNECT_cfm conn_cfm; var BSSAP_LE_N_DATA_ind data_ind; var BSSAP_LE_N_DISCONNECT_ind disc_ind; + + var ASP_SCCP_N_RESET_ind n_reset_ind; + var ASP_SCCP_N_RESET_cfm n_reset_cfm; + var ASP_SCCP_N_STATE_ind n_state_ind; + var ASP_SCCP_N_PCSTATE_ind n_pcstate_ind; + var BSSAP_LE_Conn_Req creq; var PDU_BSSAP_LE bssap; var BSSAP_LE_N_UNITDATA_req bssap_ud; @@ -427,6 +433,24 @@ f_handle_userData(vc_conn, conn_cfm.userData); } } + + /* SCCP -> Client: N-RESET.ind */ + [] BSSAP_LE.receive(ASP_SCCP_N_RESET_ind:?) -> value n_reset_ind { + log("Discard ", n_reset_ind) + } + /* SCCP -> Client: N-RESET.cfm */ + [] BSSAP_LE.receive(ASP_SCCP_N_RESET_cfm:?) -> value n_reset_cfm { + log("Discard ", n_reset_cfm) + } + /* SCCP -> Client: N-STATE.ind */ + [] BSSAP_LE.receive(ASP_SCCP_N_STATE_ind:?) -> value n_state_ind { + log("Discard ", n_state_ind) + } + /* SCCP -> Client: N-PCSTATE.ind */ + [] BSSAP_LE.receive(ASP_SCCP_N_PCSTATE_ind:?) -> value n_pcstate_ind { + log("Discard ", n_pcstate_ind) + } + [] CLIENT.receive(PDU_BSSAP_LE:?) -> value bssap sender vc_conn { var integer conn_id := f_conn_id_by_comp(vc_conn); /* send it to dispatcher */ @@ -506,6 +530,45 @@ f_ML3_patch_seq_nr(seq_nr, enc_l3); } +function f_bssap_le_wait_sccp_peer_available(BSSAP_LE_CODEC_PT pt, integer peer_pc, float timeout_sec := 3.0) +{ + timer T; + var ASP_SCCP_N_PCSTATE_ind n_pcstate_ind; + var boolean rx_explicit_down := false; + + log("Waiting for SCCP peer PC=", peer_pc, " to become available"); + T.start(timeout_sec); + + alt { + [] pt.receive(t_ASP_N_PCSTATE_ind(?, ?, *, *)) -> value n_pcstate_ind { + var integer aff_pc := bit2int(n_pcstate_ind.affectedSP); + if (aff_pc != peer_pc) { + log("Waiting for SCCP peer PC=", peer_pc, ": Rx N-PCSTATE.ind for another peer PC=", aff_pc, ", ",n_pcstate_ind); + repeat; + } + if (n_pcstate_ind.spStatus == SCCP_PAR_SP_Status_accessible and + n_pcstate_ind.remSCCPStatus == SCCP_PAR_Remote_SCCP_Status_available) { + log("SCCP peer PC=", aff_pc," is now available"); + /* All peer is available, we are done */ + T.stop; + return; + } + log("SCCP peer PC=", aff_pc," is NOT available: ", n_pcstate_ind); + rx_explicit_down := true; + repeat; + } + [] T.timeout { + if (rx_explicit_down) { + /* explicitly unavailable:*/ + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for SCCP peer PC=", peer_pc)); + } + /* Done, assume PCs for which we didn't receive an explicit "unavailable" are actually available. */ + } + } + log("Done waiting for SCCP peer PC=", peer_pc); +} + function main(BssapLeOps ops, charstring id) runs on BSSAP_LE_Emulation_CT { g_ran_id := id; @@ -514,6 +577,9 @@ f_expect_table_init(); if (isvalue(ops.sccp_addr_peer) and isvalue(ops.sccp_addr_local)) { + if (ispresent(ops.sccp_addr_peer.signPointCode)) { + f_bssap_le_wait_sccp_peer_available(BSSAP_LE, bit2int(ops.sccp_addr_peer.signPointCode)); + } f_bssap_le_reset(ops.sccp_addr_peer, ops.sccp_addr_local); } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index c85a458..51d8755 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2310,8 +2310,7 @@ f_init_bssap_direct(); f_sccp_adapter_start(g_bssap[0].sccpa); - - f_sleep(3.0); + f_bssap_wait_sccp_peer_available(BSSAP_DIRECT, bit2int(g_bssap[0].sccpa.sccp_addr_peer.signPointCode)); /* 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/+/41967?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: I6a40d1ddcd3a7dbde9f6c8b51439e9ab4d1da469 Gerrit-Change-Number: 41967 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Handle N-PCSTATE.ind to wait for peer availability
by pespin 28 Jan '26

28 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41968?usp=email ) Change subject: RAN_Emulation: Handle N-PCSTATE.ind to wait for peer availability ...................................................................... RAN_Emulation: Handle N-PCSTATE.ind to wait for peer availability Take the chance to explicitly log and discard other .ind primitives which would otherwise block the processing of messages. Change-Id: I86b481fca9b7be84f3cda9fbce83e60820fe7fc1 Related: OS#6907 --- M bsc/BSC_Tests.ttcn M library/BSSAP_CodecPort.ttcn M library/RAN_Emulation.ttcnpp M library/ranap/RANAP_CodecPort.ttcn 4 files changed, 138 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/41968/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index db70bd5..f269654 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1222,6 +1222,7 @@ } 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(); } } diff --git a/library/BSSAP_CodecPort.ttcn b/library/BSSAP_CodecPort.ttcn index ce9248e..23000e2 100644 --- a/library/BSSAP_CodecPort.ttcn +++ b/library/BSSAP_CodecPort.ttcn @@ -406,7 +406,7 @@ ASP_SCCP_N_RESET_ind -> ASP_SCCP_N_RESET_ind: simple; ASP_SCCP_N_RESET_cfm -> ASP_SCCP_N_RESET_cfm: simple; ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple; - ASP_SCCP_N_PCSTATE_ind -> -: discard)" + ASP_SCCP_N_PCSTATE_ind -> ASP_SCCP_N_PCSTATE_ind: simple)" } diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 3b3e6bd..19ae324 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -961,6 +961,12 @@ var BSSAP_N_CONNECT_cfm conn_cfm; var BSSAP_N_DATA_ind data_ind; var BSSAP_N_DISCONNECT_ind disc_ind; + + var ASP_SCCP_N_RESET_ind n_reset_ind; + var ASP_SCCP_N_RESET_cfm n_reset_cfm; + var ASP_SCCP_N_STATE_ind n_state_ind; + var ASP_SCCP_N_PCSTATE_ind n_pcstate_ind; + var BSSAP_Conn_Req creq; var PDU_BSSAP bssap; var BSSAP_N_UNITDATA_req bssap_ud; @@ -1017,6 +1023,24 @@ f_handle_userData_BSSAP(vc_conn, conn_cfm.userData); } } + + /* SCCP -> Client: N-RESET.ind */ + [] BSSAP.receive(ASP_SCCP_N_RESET_ind:?) -> value n_reset_ind { + log("Discard ", n_reset_ind) + } + /* SCCP -> Client: N-RESET.cfm */ + [] BSSAP.receive(ASP_SCCP_N_RESET_cfm:?) -> value n_reset_cfm { + log("Discard ", n_reset_cfm) + } + /* SCCP -> Client: N-STATE.ind */ + [] BSSAP.receive(ASP_SCCP_N_STATE_ind:?) -> value n_state_ind { + log("Discard ", n_state_ind) + } + /* SCCP -> Client: N-PCSTATE.ind */ + [] BSSAP.receive(ASP_SCCP_N_PCSTATE_ind:?) -> value n_pcstate_ind { + log("Discard ", n_pcstate_ind) + } + [] CLIENT.receive(PDU_BSSAP:?) -> value bssap sender vc_conn { var integer conn_id := f_conn_id_by_comp(vc_conn); /* send it to dispatcher */ @@ -1087,6 +1111,12 @@ var RANAP_N_CONNECT_cfm rconn_cfm; var RANAP_N_DATA_ind rdata_ind; var RANAP_N_DISCONNECT_ind rdisc_ind; + + var ASP_SCCP_N_RESET_ind n_reset_ind; + var ASP_SCCP_N_RESET_cfm n_reset_cfm; + var ASP_SCCP_N_STATE_ind n_state_ind; + var ASP_SCCP_N_PCSTATE_ind n_pcstate_ind; + var RANAP_Conn_Req creq; var RANAP_PDU ranap; var RANAP_N_UNITDATA_req ranap_ud; @@ -1152,6 +1182,23 @@ } } + /* SCCP -> Client: N-RESET.ind */ + [] RANAP.receive(ASP_SCCP_N_RESET_ind:?) -> value n_reset_ind { + log("Discard ", n_reset_ind) + } + /* SCCP -> Client: N-RESET.cfm */ + [] RANAP.receive(ASP_SCCP_N_RESET_cfm:?) -> value n_reset_cfm { + log("Discard ", n_reset_cfm) + } + /* SCCP -> Client: N-STATE.ind */ + [] RANAP.receive(ASP_SCCP_N_STATE_ind:?) -> value n_state_ind { + log("Discard ", n_state_ind) + } + /* SCCP -> Client: N-PCSTATE.ind */ + [] RANAP.receive(ASP_SCCP_N_PCSTATE_ind:?) -> value n_pcstate_ind { + log("Discard ", n_pcstate_ind) + } + [] CLIENT.receive(RANAP_PDU:?) -> value ranap sender vc_conn { var integer conn_id := f_conn_id_by_comp(vc_conn); /* send it to dispatcher */ @@ -1339,6 +1386,88 @@ } } +#ifdef RAN_EMULATION_BSSAP +function f_bssap_wait_sccp_peer_available(BSSAP_CODEC_PT pt, integer peer_pc, float timeout_sec := 3.0) +{ + timer T; + var ASP_SCCP_N_PCSTATE_ind n_pcstate_ind; + var boolean rx_explicit_down := false; + + log("Waiting for SCCP peer PC=", peer_pc, " to become available"); + T.start(timeout_sec); + + alt { + [] pt.receive(t_ASP_N_PCSTATE_ind(?, ?, *, *)) -> value n_pcstate_ind { + var integer aff_pc := bit2int(n_pcstate_ind.affectedSP); + if (aff_pc != peer_pc) { + log("Waiting for SCCP peer PC=", peer_pc, ": Rx N-PCSTATE.ind for another peer PC=", aff_pc, ", ",n_pcstate_ind); + repeat; + } + if (n_pcstate_ind.spStatus == SCCP_PAR_SP_Status_accessible and + n_pcstate_ind.remSCCPStatus == SCCP_PAR_Remote_SCCP_Status_available) { + log("SCCP peer PC=", aff_pc," is now available"); + /* All peer is available, we are done */ + T.stop; + return; + } + log("SCCP peer PC=", aff_pc," is NOT available: ", n_pcstate_ind); + rx_explicit_down := true; + repeat; + } + [] T.timeout { + if (rx_explicit_down) { + /* explicitly unavailable:*/ + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for SCCP peer PC=", peer_pc)); + } + /* Done, assume PCs for which we didn't receive an explicit "unavailable" are actually available. */ + } + } + log("Done waiting for SCCP peer PC=", peer_pc); +} +#endif + +#ifdef RAN_EMULATION_RANAP +function f_ranap_wait_sccp_peer_available(RANAP_CODEC_PT pt, integer peer_pc, float timeout_sec := 3.0) +{ + timer T; + var ASP_SCCP_N_PCSTATE_ind n_pcstate_ind; + var boolean rx_explicit_down := false; + + log("Waiting for SCCP peer PC=", peer_pc, " to become available"); + T.start(timeout_sec); + + alt { + [] pt.receive(t_ASP_N_PCSTATE_ind(?, ?, *, *)) -> value n_pcstate_ind { + var integer aff_pc := bit2int(n_pcstate_ind.affectedSP); + if (aff_pc != peer_pc) { + log("Waiting for SCCP peer PC=", peer_pc, ": Rx N-PCSTATE.ind for another peer PC=", aff_pc, ", ",n_pcstate_ind); + repeat; + } + if (n_pcstate_ind.spStatus == SCCP_PAR_SP_Status_accessible and + n_pcstate_ind.remSCCPStatus == SCCP_PAR_Remote_SCCP_Status_available) { + log("SCCP peer PC=", aff_pc," is now available"); + /* All peer is available, we are done */ + T.stop; + return; + } + log("SCCP peer PC=", aff_pc," is NOT available: ", n_pcstate_ind); + rx_explicit_down := true; + repeat; + } + [] T.timeout { + if (rx_explicit_down) { + /* explicitly unavailable:*/ + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for SCCP peer PC=", peer_pc)); + } + /* Done, assume PCs for which we didn't receive an explicit "unavailable" are actually available. */ + } + } + log("Done waiting for SCCP peer PC=", peer_pc); +} +#endif + function main(RanOps ops, charstring id) runs on RAN_Emulation_CT { g_ran_id := id; @@ -1350,11 +1479,17 @@ 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)); + } 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)); + } f_ranap_reset(ops.sccp_addr_peer, ops.sccp_addr_local, ops.grnc_id); } #endif diff --git a/library/ranap/RANAP_CodecPort.ttcn b/library/ranap/RANAP_CodecPort.ttcn index 084d1cf..8d8ead5 100644 --- a/library/ranap/RANAP_CodecPort.ttcn +++ b/library/ranap/RANAP_CodecPort.ttcn @@ -405,7 +405,7 @@ ASP_SCCP_N_RESET_ind -> ASP_SCCP_N_RESET_ind: simple; ASP_SCCP_N_RESET_cfm -> ASP_SCCP_N_RESET_cfm: simple; ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple; - ASP_SCCP_N_PCSTATE_ind -> -: discard)" + ASP_SCCP_N_PCSTATE_ind -> ASP_SCCP_N_PCSTATE_ind: simple)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41968?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: I86b481fca9b7be84f3cda9fbce83e60820fe7fc1 Gerrit-Change-Number: 41968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: jobs/gerrit: debian10 for osmo-gbproxy + deps
by osmith 28 Jan '26

28 Jan '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41964?usp=email ) Change subject: jobs/gerrit: debian10 for osmo-gbproxy + deps ...................................................................... jobs/gerrit: debian10 for osmo-gbproxy + deps Related: SYS#7859 Change-Id: I7ad3412d945de8c29b6ab62fcadfd2f231c19581 --- M jobs/gerrit-verifications.yml 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 09714fa..1f146ac 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -109,6 +109,8 @@ # Which jobs to run in the pipeline pipeline_build: true pipeline_lint: true + # Range from oldest supported Debian version to newest, see: + # https://gerrit.osmocom.org/c/osmo-ci/+/40861/comment/d35a8783_2a3833a4/ pipeline_binpkgs: "debian:11 debian:13" # in alphabetical order @@ -176,7 +178,7 @@ a1: !!python/tuple [arm-none-eabi, amd64] combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")' cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins_arch.sh "$arch"' - pipeline_binpkgs: "centos:7 debian:11 debian:13" # centos7: SYS#6760 + pipeline_binpkgs: "centos:7 debian:10 debian:13" # centos7: SYS#6760, debian10: SYS#7859 - libsmpp34 @@ -299,7 +301,8 @@ -e WITH_MANUALS="$WITH_MANUALS" \ {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh - - osmo-gsm-manuals + - osmo-gsm-manuals: + pipeline_binpkgs: "debian:10 debian:13" # debian10: SYS#7859 - osmo_gsup: repos_url: '{gerrit_url}/erlang/{repos}' @@ -482,7 +485,10 @@ pipeline_binpkgs: "" - osmo-smlc - - osmo-gbproxy + + - osmo-gbproxy: + pipeline_binpkgs: "debian:10 debian:13" # debian10: SYS#7859 + - osmo-hnodeb - osmo-hnbgw: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41964?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7ad3412d945de8c29b6ab62fcadfd2f231c19581 Gerrit-Change-Number: 41964 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log