April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-msc[master]: CM Serv Rej: do not crash on use count mismatch

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/27916 ) Change subject: CM Serv Rej: do not crash on use count mismatch ...................................................................... CM Serv Rej: do not crash on use count mismatch We may issue a CM Service Reject also in obscure situations, where no CM Service Request was permitted. In those cases, there will be no use count. Do not crash then, just don't decrement. Related: OS#5532 Change-Id: I2009df42d1f27ec0d011e22bfc46dbc17afe7239 --- M src/libmsc/gsm_04_08.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/27916/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index b5d46fd..0983295 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1513,8 +1513,15 @@ enum gsm48_reject_value cause) { struct msc_a *msc_a = msc_conn_ref; + const char *use_token; msc_gsm48_tx_mm_serv_rej(msc_a, cause); - msc_a_put(msc_a, msc_a_cm_service_type_to_use(cm_service_type)); + + /* Normally, there is a use count to be removed by the CM Service Reject. + * There has been a report though of an error situation (OS#5532) where no use count remains to be removed here. + * In that case, do not crash osmo-msc, just don't decrement it. */ + use_token = msc_a_cm_service_type_to_use(cm_service_type); + if (osmo_use_count_by(&msc_a->use_count, use_token)) + msc_a_put(msc_a, use_token); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/27916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2009df42d1f27ec0d011e22bfc46dbc17afe7239 Gerrit-Change-Number: 27916 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call: send BSSMAP Clear Req cause as preemption

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27914 ) Change subject: emerg call: send BSSMAP Clear Req cause as preemption ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I20108f7b4769400b89b7b0d65c8dab883bf87c46 Gerrit-Change-Number: 27914 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 24 Apr 2022 21:40:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: TC_emerg_premption: check BSSMAP Clear Req cause

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27915 ) Change subject: bsc: TC_emerg_premption: check BSSMAP Clear Req cause ...................................................................... bsc: TC_emerg_premption: check BSSMAP Clear Req cause On the first TCH, establish Layer 3 so that the BSC will issue a Clear Request at all. Verify the cause value of the Clear Request. Tear down the established Layer 3: clean up for the leak check. Related: OS#5535 Depends: I20108f7b4769400b89b7b0d65c8dab883bf87c46 (osmo-bsc) Change-Id: Ib13be73119cfc96712f32899c02e655e1751d547 --- M bsc/BSC_Tests.ttcn 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/27915/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f06d7a1..41696af 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -8969,6 +8969,12 @@ var octetstring l3 := '00010203040506'O; f_ipa_tx(0, ts_RSL_EST_IND(first_tch, valueof(ts_RslLinkID_DCCH(0)), l3)); + /* Accept BSSAP conn, so we get to test the Clear Request cause */ + var BSSAP_N_CONNECT_ind rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + var integer sccp_conn_id := rx_c_ind.connectionId; + BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); + /* Send Channel request for emegergency call */ f_ipa_tx(0, ts_RSL_CHAN_RQD('A5'O, 23)); @@ -8976,6 +8982,15 @@ f_expect_chan_rel(0, first_tch, expect_rr_chan_rel := true, expect_rll_rel_req := false, expect_rr_cause := GSM48_RR_CAUSE_PREMPTIVE_REL); + /* Also expect a BSSMAP Clear Request with PREEMPTION */ + var BSSAP_N_DATA_ind rx_clear_req; + const myBSSMAP_Cause preemption := GSM0808_CAUSE_PREEMPTION; + BSSAP.receive(tr_BSSAP_DATA_ind(sccp_conn_id, tr_BSSMAP_ClearRequest)) -> value rx_clear_req; + log("XXX ", rx_clear_req); + if (rx_clear_req.userData.pdu.bssmap.clearRequest.cause.causeValue != int2bit(enum2int(preemption), 7)) { + setverdict(fail, "BSSMAP Clear Request: expected cause PREEMPTION"); + } + /* Expect the BSC to send activate/assign the channel for the emergency call */ rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); if (first_tch != rx_rsl.ies[0].body.chan_nr) { @@ -8984,6 +8999,12 @@ f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(first_tch, 33)); rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); + /* complete the BSSMAP Clear to satisfy the conn leak check */ + BSSAP.send(ts_BSSAP_DATA_req(sccp_conn_id, ts_BSSMAP_ClearCommand(enum2int(preemption)))); + BSSAP.receive(tr_BSSAP_DATA_ind(sccp_conn_id, tr_BSSMAP_ClearComplete)) { + BSSAP.send(ts_BSSAP_DISC_req(sccp_conn_id, 0)); + } + f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib13be73119cfc96712f32899c02e655e1751d547 Gerrit-Change-Number: 27915 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call: send BSSMAP Clear Req cause as preemption

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27914 ) Change subject: emerg call: send BSSMAP Clear Req cause as preemption ...................................................................... emerg call: send BSSMAP Clear Req cause as preemption After the lchan release, the gscon would go into the Clear dance with an arbitrary cause value. Instead, explicitly ask for a Clear upon pre-emption, with the proper cause value. Related: OS#5535 Change-Id: I20108f7b4769400b89b7b0d65c8dab883bf87c46 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bsc_subscr_conn_fsm.c 3 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/27914/1 diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index 0e495aa..0ab4843 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -66,6 +66,7 @@ void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg, int link_id, int allow_sacch); int gscon_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg); +void gscon_bssmap_clear(struct gsm_subscriber_connection *conn, enum gsm0808_cause cause); struct osmo_mgcpc_ep *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection *conn, uint16_t msc_assigned_cic, struct gsm_lchan *for_lchan); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index e94d688..2034e6f 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2058,6 +2058,11 @@ "CHAN RQD/EMERGENCY-PRIORITY: inducing termination of lchan %s (state:%s) in favor of incoming EMERGENCY CALL!\n", gsm_lchan_name(release_lchan), osmo_fsm_inst_state_name(release_lchan->fi)); + /* Make sure the Clear Request to the MSC has the proper cause */ + if (release_lchan->conn) + gscon_bssmap_clear(release_lchan->conn, GSM0808_CAUSE_PREEMPTION); + /* The gscon FSM would only release the lchan after the MSC responds with a Clear Command. + * But we need it released right now. Also with the right RR cause. */ lchan_release(release_lchan, !!(release_lchan->conn), true, GSM48_RR_CAUSE_PREMPTIVE_REL, gscon_last_eutran_plmn(release_lchan->conn)); diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index bb96aeb..428d200 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -144,8 +144,7 @@ return rc; } -static void gscon_bssmap_clear(struct gsm_subscriber_connection *conn, - enum gsm0808_cause cause) +void gscon_bssmap_clear(struct gsm_subscriber_connection *conn, enum gsm0808_cause cause) { /* already clearing? */ switch (conn->fi->state) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I20108f7b4769400b89b7b0d65c8dab883bf87c46 Gerrit-Change-Number: 27914 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call deny: fix RR release cause

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27902 ) Change subject: emerg call deny: fix RR release cause ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia195621165cb7bbe33e6c2e915abc42ab16a2a4f Gerrit-Change-Number: 27902 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 24 Apr 2022 21:05:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call: tweak log, comments

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27901 ) Change subject: emerg call: tweak log, comments ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27901/comment/9311339c_88f6868d PS1, Line 1071: BSC > I guess it should be MSC? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I01e457ae6a9a951a2525c2159cb5979a0cb8bd95 Gerrit-Change-Number: 27901 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 24 Apr 2022 21:05:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: TC_emerg_premption: clarify chan_nr

by neels

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/+/27905 to look at the new patch set (#2). Change subject: bsc: TC_emerg_premption: clarify chan_nr ...................................................................... bsc: TC_emerg_premption: clarify chan_nr Rename chan_nr to first_tch, and more clearly show that the TCH that is released gets assigned to the emergency call. Related: OS#5534 Change-Id: I0c540d76eedfd4115b410921bf5a0b6c2d00b5c2 --- M bsc/BSC_Tests.ttcn 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/27905/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c540d76eedfd4115b410921bf5a0b6c2d00b5c2 Gerrit-Change-Number: 27905 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: TC_emerg_premption: test RR rel cause

by neels

Attention is currently required from: neels. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27906 to look at the new patch set (#2). Change subject: bsc: TC_emerg_premption: test RR rel cause ...................................................................... bsc: TC_emerg_premption: test RR rel cause Related: OS#5534 Depends: I0423621d15ace11a53ae1653e5e7f5cb93605edb (osmo-bsc) Change-Id: I47e919edc25a8427f49d654f97f05e46a89da16d --- M bsc/BSC_Tests.ttcn 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/27906/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I47e919edc25a8427f49d654f97f05e46a89da16d Gerrit-Change-Number: 27906 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: TC_emerg_premption: cosmetic

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27905 ) Change subject: bsc: TC_emerg_premption: cosmetic ...................................................................... Patch Set 1: (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27905/comment/ebf0314f_35f1… PS1, Line 8976: if (first_tch != rx_rsl.ies[0].body.chan_nr) { > This goes beyond the scope of a 'cosmetic' change. You're basically adding more checks. debatable, because this check can never trigger. We occupy all lchans, then free one and again activate that one. Just before, it wasn't as obvious that it will be the same one. We would take the chan_nr from the RSL, but it *has* to be the same first_tch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c540d76eedfd4115b410921bf5a0b6c2d00b5c2 Gerrit-Change-Number: 27905 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 24 Apr 2022 20:17:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: emerg call: fix RR release cause for pre-emption

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27900 ) Change subject: emerg call: fix RR release cause for pre-emption ...................................................................... emerg call: fix RR release cause for pre-emption If an lchan needs to be released to make room for an emergency call, send the proper release cause ("pre-emption"). Related: OS#5534 Change-Id: I0423621d15ace11a53ae1653e5e7f5cb93605edb --- M src/osmo-bsc/abis_rsl.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 03e409d..0ede339 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2058,13 +2058,13 @@ "CHAN RQD/EMERGENCY-PRIORITY: inducing termination of lchan %s (state:%s) in favor of incoming EMERGENCY CALL!\n", gsm_lchan_name(release_lchan), osmo_fsm_inst_state_name(release_lchan->fi)); - lchan_release(release_lchan, !!(release_lchan->conn), true, 0, + lchan_release(release_lchan, !!(release_lchan->conn), true, GSM48_RR_CAUSE_PREMPTIVE_REL, gscon_last_eutran_plmn(release_lchan->conn)); /* Also release any overlapping VAMOS multiplexes on this lchan */ release_lchan = gsm_lchan_primary_to_vamos(release_lchan); if (release_lchan) - lchan_release(release_lchan, !!(release_lchan->conn), true, 0, + lchan_release(release_lchan, !!(release_lchan->conn), true, GSM48_RR_CAUSE_PREMPTIVE_REL, gscon_last_eutran_plmn(release_lchan->conn)); } else { /* BTS is shutting down, give up... */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0423621d15ace11a53ae1653e5e7f5cb93605edb Gerrit-Change-Number: 27900 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022