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

Change in osmo-ttcn3-hacks[master]: bsc: CBSP code refcator: Add f_exp_rsl_etws()

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27968 ) Change subject: bsc: CBSP code refcator: Add f_exp_rsl_etws() ...................................................................... bsc: CBSP code refcator: Add f_exp_rsl_etws() This function reduces code duplication between CBSP tests. Change-Id: I69bedd43bc88bc619b80bf9038da901bbff9f04b --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 35 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/27968/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 5f470ab..48769aa 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -868,6 +868,37 @@ } } +private function f_exp_rsl_etws(integer rsl_idx := 0, boolean enabled) runs on cbsp_test_CT { + var template (present) octetstring tr_apdu; + timer T := 5.0; + T.start; + + if (enabled) { + tr_apdu := f_gen_etws_pn(g_cbsp_ser_no, g_cbsp_msg_id); + } else { + tr_apdu := ''O; + } + + alt { + [] IPA_RSL[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), tr_apdu))) { + setverdict(pass); + } + [] IPA_RSL[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { + setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); + mtc.stop; + } + [] IPA_RSL[rsl_idx].receive { repeat; } + [] T.timeout { + if (enabled) { + setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD (enable)"); + } else { + setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD (disable)"); + } + mtc.stop; + } + } +} + /* Write ETWS PN to single BTS; verify it arrives on CCHAN */ testcase TC_cbsp_emerg_write_bts_cgi_cchan() runs on cbsp_test_CT { var CBSP_IEs pages := {f_gen_page()}; @@ -879,23 +910,8 @@ cell_list := ts_BSSMAP_CIL_CGI({bssmap_cgi(mp_cgi_bts0)}); f_cbsp_write_emerg(g_cbsp_msg_id, g_cbsp_ser_no, cell_list); - var template (present) octetstring tr_apdu := f_gen_etws_pn(g_cbsp_ser_no, g_cbsp_msg_id); - timer T := 5.0; - T.start; - alt { - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), tr_apdu))) { - setverdict(pass); - } - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { - setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); - mtc.stop; - } - [] IPA_RSL[0].receive { repeat; } - [] T.timeout { - setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD"); - mtc.stop; - } - } + + f_exp_rsl_etws(0, true); } /* Write ETWS PN to single BTS; verify it arrives on CCHAN */ @@ -911,40 +927,10 @@ f_cbsp_write_emerg(g_cbsp_msg_id, g_cbsp_ser_no, cell_list); /* first expect the PN to be enabled */ - var template (present) octetstring tr_apdu := f_gen_etws_pn(g_cbsp_ser_no, g_cbsp_msg_id); - timer T := 5.0; - T.start; - alt { - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), tr_apdu))) { - setverdict(pass); - } - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { - setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); - mtc.stop; - } - [] IPA_RSL[0].receive { repeat; } - [] T.timeout { - setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD (enable)"); - mtc.stop; - } - } + f_exp_rsl_etws(0, true); /* then expect it to be disabled after the warning period (5s) */ - T.start; - alt { - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), ''O))) { - setverdict(pass); - } - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { - setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); - mtc.stop; - } - [] IPA_RSL[0].receive { repeat; } - [] T.timeout { - setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD (disable)"); - mtc.stop; - } - } + f_exp_rsl_etws(0, false); } /* Send a MSG STATUS QUERY for an unknown message; expect no completion list and present failure list */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27968 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: I69bedd43bc88bc619b80bf9038da901bbff9f04b Gerrit-Change-Number: 27968 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Increase test coverage for CBSP emergency broadcasts

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27969 ) Change subject: bsc: Increase test coverage for CBSP emergency broadcasts ...................................................................... bsc: Increase test coverage for CBSP emergency broadcasts This adds new tests: * TC_cbsp_emerg_write_bts_cgi_noreplace * TC_cbsp_emerg_write_bts_cgi_replace * TC_cbsp_emerg_write_bts_cgi_kill All of the above relate to improved / fixed handling of emergency broadcasts in some corner cases. Related: SYS#5906 Related: OS#5539, OS#5540 Change-Id: Ic0f0b3d620f3ca73bab3d45997d0c1b9433ac1f7 --- M bsc/BSC_Tests_CBSP.ttcn M library/CBSP_Templates.ttcn 2 files changed, 121 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/27969/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 48769aa..bede026 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -320,6 +320,36 @@ } } +/* send a REPLACE emergency to the BSC; expect either COMPLETE or FAILURE in response*/ +function f_cbsp_replace_emerg(uint16_t msg_id, uint16_t new_ser_no, uint16_t old_ser_no, + template (value) BSSMAP_FIELD_CellIdentificationList cell_list := ts_BSSMAP_CIL_BSS, + template (value) uint8_t emerg_ind := 1, + template (value) uint16_t warn_type := oct2int('0780'O), + template (value) uint16_t warn_per := 5, + template BSSMAP_FIELD_CellIdentificationList success_list := ?, + template CBSP_FailureListItems fail_list := omit) runs on cbsp_test_CT { + var template (value) CBSP_PDU tx; + var template CBSP_PDU rx; + var CBSP_IEs pages := {f_gen_page()}; + + tx := ts_CBSP_REPLACE_EMERG(msg_id, new_ser_no, old_ser_no, cell_list, emerg_ind, warn_type, warn_per); + CBSP[0].send(ts_CBSP_Send(g_cbsp_conn_id[0], tx)); + if (istemplatekind(fail_list, "omit")) { + rx := tr_CBSP_REPLACE_CBS_COMPL(msg_id, new_ser_no, old_ser_no, omit, success_list, omit); + } else { + rx := tr_CBSP_REPLACE_CBS_FAIL(msg_id, new_ser_no, old_ser_no, fail_list, omit, success_list, omit); + } + alt { + [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], rx)) { + setverdict(pass); + } + [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { + setverdict(fail, "Received unexpected CBSP"); + mtc.stop; + } + } +} + /* send a REPLACE CBS to the BSC; expect either COMPLETE or FAILURE in response*/ function f_cbsp_replace(uint16_t msg_id, uint16_t new_ser_no, uint16_t old_ser_no, template (value) BSSMAP_FIELD_CellIdentificationList cell_list := ts_BSSMAP_CIL_BSS, @@ -933,9 +963,80 @@ f_exp_rsl_etws(0, false); } +/* Write (!replace) ETWS PN to a single BTS which already has an ongoing PN; expect failure (OS#5539) */ +testcase TC_cbsp_emerg_write_bts_cgi_noreplace() runs on cbsp_test_CT { + var CBSP_IEs pages := {f_gen_page()}; + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list; + var ASP_RSL_Unitdata rx_rsl_ud; + + g_pars := valueof(ts_CBSP_Pars_default(false, 18001, 18501)); + f_init(); + + cell_list := ts_BSSMAP_CIL_CGI({bssmap_cgi(mp_cgi_bts0)}); + f_cbsp_write_emerg(g_cbsp_msg_id, g_cbsp_ser_no, cell_list); + + /* first expect the PN to be enabled */ + f_exp_rsl_etws(0, true); + + /* write another emergency while first one is still ongoing; expect it to fail */ + f_cbsp_write_emerg(g_cbsp_msg_id, g_cbsp_ser_no+1, cell_list, success_list:=omit, fail_list:=?); + + /* then expect first one to be disabled after the warning period (5s) */ + f_exp_rsl_etws(0, false); + + /* write another emergency after the first one has expired; expect it to succeed */ + g_cbsp_ser_no := g_cbsp_ser_no + 2; + f_cbsp_write_emerg(g_cbsp_msg_id, g_cbsp_ser_no, cell_list, success_list:=?, fail_list:=omit); + f_exp_rsl_etws(0, true); +} + +/* Replace ETWS PN to a single BTS which already has an ongoing PN; expect success */ +testcase TC_cbsp_emerg_write_bts_cgi_replace() runs on cbsp_test_CT { + var CBSP_IEs pages := {f_gen_page()}; + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list; + var ASP_RSL_Unitdata rx_rsl_ud; + + g_pars := valueof(ts_CBSP_Pars_default(false, 19001, 19501)); + f_init(); + + cell_list := ts_BSSMAP_CIL_CGI({bssmap_cgi(mp_cgi_bts0)}); + f_cbsp_write_emerg(g_cbsp_msg_id, g_cbsp_ser_no, cell_list); + + /* first expect the PN to be enabled */ + f_exp_rsl_etws(0, true); + + /* write another emergency while first one is still ongoing; expect it to fail */ + f_cbsp_replace_emerg(g_cbsp_msg_id, g_cbsp_ser_no+1, g_cbsp_ser_no, cell_list); +} + +/* Write ETWS PN to a single BTS, then kill it during its lifetime (OS#5540) */ +testcase TC_cbsp_emerg_write_bts_cgi_kill() runs on cbsp_test_CT { + var CBSP_IEs pages := {f_gen_page()}; + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list; + var ASP_RSL_Unitdata rx_rsl_ud; + + g_pars := valueof(ts_CBSP_Pars_default(false, 20001, 20501)); + f_init(); + + cell_list := ts_BSSMAP_CIL_CGI({bssmap_cgi(mp_cgi_bts0)}); + f_cbsp_write_emerg(g_cbsp_msg_id, g_cbsp_ser_no, cell_list, warn_per := 10); + + /* first expect the PN to be enabled */ + f_exp_rsl_etws(0, true); + + /* kill it; expect non-zero success list, and no completion or failure lists */ + f_cbsp_kill(g_cbsp_msg_id, g_cbsp_ser_no, omit, cell_list, success_list:=cell_list, + compl_list:=omit, fail_list:=omit); + + /* then expect it to be disabled */ + f_exp_rsl_etws(0, false); +} + + + /* Send a MSG STATUS QUERY for an unknown message; expect no completion list and present failure list */ testcase TC_cbsp_status_q_empty() runs on cbsp_test_CT { - g_pars := valueof(ts_CBSP_Pars_default(false, 18001, 18501)); + g_pars := valueof(ts_CBSP_Pars_default(false, 21001, 21501)); f_init(); f_cbsp_msg_status_query(g_cbsp_msg_id, g_cbsp_ser_no, compl_list := omit, fail_list := ?); @@ -943,7 +1044,7 @@ /* Send a SMSCB to entire BSS followed by MSG_STATUS_QUERY; expect completion list and no failure list */ testcase TC_cbsp_status_q_bts_cgi() runs on cbsp_test_CT { - g_pars := valueof(ts_CBSP_Pars_default(false, 19001, 19501)); + g_pars := valueof(ts_CBSP_Pars_default(false, 22001, 22501)); f_init(); var CBSP_IEs pages := {f_gen_page()}; @@ -1005,6 +1106,9 @@ execute( TC_cbsp_emerg_write_bts_cgi_dchan() ); execute( TC_cbsp_emerg_write_bts_cgi_cchan() ); execute( TC_cbsp_emerg_write_bts_cgi_cchan_disable() ); + execute( TC_cbsp_emerg_write_bts_cgi_noreplace() ); + execute( TC_cbsp_emerg_write_bts_cgi_replace() ); + execute( TC_cbsp_emerg_write_bts_cgi_kill() ); } diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn index 17d933a..d166bcf 100644 --- a/library/CBSP_Templates.ttcn +++ b/library/CBSP_Templates.ttcn @@ -314,7 +314,6 @@ template (value) BSSMAP_FIELD_CellIdentificationList cell_list, template (value) uint8_t emerg_ind, template (value) uint16_t warn_type, - template (value) uint16_t num_bcast_req, template (value) uint8_t warn_per ) := ts_CBSP(CBSP_MSGT_WRITE_REPLACE, { @@ -331,7 +330,6 @@ template BSSMAP_FIELD_CellIdentificationList cell_list := ?, template uint8_t emerg_ind := ?, template uint16_t warn_type := ?, - template uint16_t num_bcast_req := ?, template uint8_t warn_per := ? ) := tr_CBSP(CBSP_MSGT_WRITE_REPLACE, { @@ -541,15 +539,21 @@ } /* 8.1.3.4 KILL */ -template (value) CBSP_PDU ts_CBSP_KILL(template (value) uint16_t msg_id, - template (value) uint16_t old_ser_nr, - template (value) BSSMAP_FIELD_CellIdentificationList cell_list, - template (omit) uint8_t channel_ind) := - ts_CBSP(CBSP_MSGT_KILL, { - ts_CbspMsgId(msg_id), - ts_OldSerNo(old_ser_nr), - ts_CbspCellList(cell_list), - ts_CbspChannelInd(channel_ind)}); +function ts_CBSP_KILL(template (value) uint16_t msg_id, + template (value) uint16_t old_ser_nr, + template (value) BSSMAP_FIELD_CellIdentificationList cell_list, + template (omit) uint8_t channel_ind) +return template (value) CBSP_PDU { + var template (value) CBSP_IEs ies := { + ts_CbspMsgId(msg_id), + ts_OldSerNo(old_ser_nr), + ts_CbspCellList(cell_list) + }; + if (not istemplatekind(channel_ind, "omit")) { + ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind); + } + return ts_CBSP(CBSP_MSGT_KILL, ies); +} function tr_CBSP_KILL(template uint16_t msg_id := ?, template uint16_t old_ser_nr := ?, template BSSMAP_FIELD_CellIdentificationList cell_list := ?, template uint8_t channel_ind := ?) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27969 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: Ic0f0b3d620f3ca73bab3d45997d0c1b9433ac1f7 Gerrit-Change-Number: 27969 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: CBSP: tr_CBSP_REPLACE_CBS_COMPL: num_compl_list is optional

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27966 ) Change subject: CBSP: tr_CBSP_REPLACE_CBS_COMPL: num_compl_list is optional ...................................................................... CBSP: tr_CBSP_REPLACE_CBS_COMPL: num_compl_list is optional The list might be empty because either there were no broadcasts completed in case of a CBS message, or because it was an emergency message where this IE is never used. Change-Id: I2b24ac7e5857bdd50a821399b3c383cea9d408ad --- M library/CBSP_Templates.ttcn 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/27966/1 diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn index f86241e..17d933a 100644 --- a/library/CBSP_Templates.ttcn +++ b/library/CBSP_Templates.ttcn @@ -408,9 +408,17 @@ var template CBSP_IEs ies := { tr_CbspMsgId(msg_id), tr_NewSerNo(new_ser_nr), - tr_OldSerNo(old_ser_nr), - tr_CbspNumComplList(compl_list) + tr_OldSerNo(old_ser_nr) }; + if (istemplatekind(compl_list, "*")) { + testcase.stop("TITAN > 6.5.0 doesn't support this"); + //ies[lengthof(ies)] := tr_CbspNumComplList ifpresent; + } else if (istemplatekind(compl_list, "?")) { + ies[lengthof(ies)] := tr_CbspNumComplList(?); + } else if (not istemplatekind(compl_list, "omit")) { + ies[lengthof(ies)] := tr_CbspNumComplList(compl_list); + } + if (istemplatekind(cell_list, "*")) { testcase.stop("TITAN > 6.5.0 doesn't support this"); //ies[lengthof(ies)] := tr_CbspCellList ifpresent; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27966 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: I2b24ac7e5857bdd50a821399b3c383cea9d408ad Gerrit-Change-Number: 27966 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: paging: Improve logging

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27964 ) Change subject: paging: Improve logging ...................................................................... paging: Improve logging Change-Id: I8a83352d6f2370bafa5acb0caba6b2f352263b5c --- M include/osmocom/bsc/paging.h M src/osmo-bsc/paging.c 2 files changed, 28 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/27964/1 diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h index d9fd501..8d5c9ac 100644 --- a/include/osmocom/bsc/paging.h +++ b/include/osmocom/bsc/paging.h @@ -33,14 +33,14 @@ struct bsc_msc_data; #define LOG_PAGING(PARAMS, SUBSYS, LEVEL, fmt, args...) \ - LOGP(SUBSYS, LEVEL, "(msc%d) Paging%s: %s: " fmt, \ + LOGP(SUBSYS, LEVEL, "(msc=%d) Paging%s: %s: " fmt, \ (PARAMS)->msc ? (PARAMS)->msc->nr : -1, \ (PARAMS)->reason == BSC_PAGING_FOR_LCS ? " for LCS" : "", \ bsc_subscr_name((PARAMS)->bsub), \ ##args) #define LOG_PAGING_BTS(PARAMS, BTS, SUBSYS, LEVEL, fmt, args...) \ - LOG_PAGING(PARAMS, SUBSYS, LEVEL, "(bts%u) " fmt, (BTS) ? (BTS)->nr : 255, ##args) + LOG_PAGING(PARAMS, SUBSYS, LEVEL, "(bts=%u) " fmt, (BTS) ? (BTS)->nr : 255, ##args) #define BSUB_USE_PAGING_START "paging-start" #define BSUB_USE_PAGING_REQUEST "paging-req" diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 24a3582..993e5df 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -94,9 +94,9 @@ log_set_context(LOG_CTX_BSC_SUBSCR, request->bsub); - LOG_BTS(bts, DPAG, LOGL_INFO, "Going to send paging commands: %s" - " for ch. type %d (attempt %d)\n", bsc_subscr_name(request->bsub), - request->chan_type, request->attempts); + LOG_PAGING_BTS(request, bts, DPAG, LOGL_INFO, + "Going to send paging command for ch. type %d (attempt %d)\n", + request->chan_type, request->attempts); if (request->bsub->tmsi == GSM_RESERVED_TMSI) { mi = (struct osmo_mobile_identity){ @@ -130,7 +130,11 @@ { struct gsm_bts_paging_state *paging_bts_st = data; struct gsm_bts *bts = paging_bts_st->bts; - paging_bts_st->available_slots = paging_estimate_available_slots(bts, bts->ccch_load_ind_period * 2); + uint16_t estimated_slots = paging_estimate_available_slots(bts, bts->ccch_load_ind_period * 2); + LOG_BTS(bts, DPAG, LOGL_INFO, + "Timeout waiting for CCCH Load Indication, assuming BTS is below Load Threshold (available_slots %u -> %u)\n", + paging_bts_st->available_slots, estimated_slots); + paging_bts_st->available_slots = estimated_slots; paging_schedule_if_needed(paging_bts_st); osmo_timer_schedule(&bts->paging.credit_timer, bts->ccch_load_ind_period * 2, 0); } @@ -226,8 +230,11 @@ /* We run out of available slots. Wait until next CCCH Load Ind * arrives or credit_timer triggers to keep processing requests. */ - if (paging_bts->available_slots == 0) + if (paging_bts->available_slots == 0) { + LOG_PAGING_BTS(request, request->bts, DPAG, LOGL_INFO, + "Paging delayed: waiting for available slots at BTS\n"); return; + } /* we need to determine the number of free channels */ if (paging_bts->free_chans_need != -1 && @@ -246,6 +253,8 @@ if (timespeccmp(&now, &retrans_ts, <)) { struct timespec tdiff; timespecsub(&retrans_ts, &now, &tdiff); + LOG_PAGING_BTS(request, request->bts, DPAG, LOGL_DEBUG, + "Paging delayed: retransmission happens later\n"); osmo_timer_schedule(&paging_bts->work_timer, tdiff.tv_sec, tdiff.tv_nsec / 1000); return; } @@ -266,6 +275,8 @@ /* Once done iterating, prepare next scheduling: */ sched_next_iter: + LOG_BTS(bts, DPAG, LOGL_DEBUG, "Paged %u subscribers during last iteration. Scheduling next batch (available_slots=%u)\n", + num_paged, paging_bts->available_slots); osmo_timer_schedule(&paging_bts->work_timer, initial_period.tv_sec, initial_period.tv_nsec / 1000); } @@ -302,8 +313,7 @@ log_set_context(LOG_CTX_BSC_SUBSCR, req->bsub); - LOGP(DPAG, LOGL_INFO, "T3113 expired for request %p (%s)\n", - req, bsc_subscr_name(req->bsub)); + LOG_PAGING_BTS(req, req->bts, DPAG, LOGL_INFO, "T3113 expired\n"); /* must be destroyed before calling cbfn, to prevent double free */ rate_ctr_inc(rate_ctr_group_get_ctr(req->bts->bts_ctrs, BTS_CTR_PAGING_EXPIRED)); @@ -320,9 +330,10 @@ } #define GSM51_MFRAME_DURATION_us (51 * GSM_TDMA_FN_DURATION_uS) /* 235365 us */ -static unsigned int calculate_timer_3113(struct gsm_bts *bts) +static unsigned int calculate_timer_3113(struct gsm_paging_request *req) { unsigned int to_us, to; + struct gsm_bts *bts = req->bts; struct osmo_tdef *d = osmo_tdef_get_entry(bts->network->T_defs, 3113); unsigned int rach_max_trans, rach_tx_integer, bs_pa_mfrms; @@ -349,7 +360,7 @@ /* ceiling in seconds + extra time */ to = (to_us + 999999) / 1000000 + d->val; - LOG_BTS(bts, DPAG, LOGL_DEBUG, "Paging request: T3113 expires in %u seconds\n", to); + LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Paging request: T3113 expires in %u seconds\n", to); return to; } @@ -403,7 +414,7 @@ else/* Add in the middle of the list after last_initial_req */ __llist_add(&req->entry, &last_initial_req->entry, last_initial_req->entry.next); - t3113_timeout_s = calculate_timer_3113(bts); + t3113_timeout_s = calculate_timer_3113(req); osmo_timer_schedule(&req->T3113, t3113_timeout_s, 0); paging_schedule_if_needed(bts_entry); @@ -453,7 +464,7 @@ continue; *msc_p = req->msc; *reason_p = req->reason; - LOG_BTS(bts, DPAG, LOGL_DEBUG, "Stop paging %s\n", bsc_subscr_name(bsub)); + LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Stop paging\n"); paging_remove_request(&bts->paging, req); return 1; } @@ -519,7 +530,7 @@ continue; if (!(req->reason & reasons)) continue; - LOG_BTS(bts, DPAG, LOGL_DEBUG, "Cancel paging %s\n", bsc_subscr_name(bsub)); + LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Cancel paging\n"); paging_remove_request(&bts->paging, req); count++; } @@ -530,6 +541,8 @@ /*! Update the BTS paging buffer slots on given BTS */ void paging_update_buffer_space(struct gsm_bts *bts, uint16_t free_slots) { + LOG_BTS(bts, DPAG, LOGL_DEBUG, "Rx CCCH Load Indication from BTS (available_slots %u -> %u)\n", + bts->paging.available_slots, free_slots); bts->paging.available_slots = free_slots; paging_schedule_if_needed(&bts->paging); /* Re-arm credit_timer */ @@ -558,7 +571,7 @@ if (msc && req->msc != msc) continue; /* now give up the data structure */ - LOG_BTS(bts, DPAG, LOGL_DEBUG, "Stop paging %s (flush)\n", bsc_subscr_name(req->bsub)); + LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Stop paging (flush)\n"); paging_remove_request(&bts->paging, req); num_cancelled++; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8a83352d6f2370bafa5acb0caba6b2f352263b5c Gerrit-Change-Number: 27964 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: paging: Increase T3113 based on paging group load in BSC queue

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27965 ) Change subject: paging: Increase T3113 based on paging group load in BSC queue ...................................................................... paging: Increase T3113 based on paging group load in BSC queue Related: OS#5536 Change-Id: I904c008222ddc3d92843d87fb3182c30b484c8a2 --- M include/osmocom/bsc/paging.h M src/osmo-bsc/paging.c 2 files changed, 37 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/27965/1 diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h index 8d5c9ac..9b63225 100644 --- a/include/osmocom/bsc/paging.h +++ b/include/osmocom/bsc/paging.h @@ -76,6 +76,8 @@ struct gsm_bts *bts; /* what kind of channel type do we ask the MS to establish */ int chan_type; + /* paging group of the subscriber: */ + uint8_t pgroup; /* Timer 3113: how long do we try to page? */ struct osmo_timer_list T3113; diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 993e5df..f2bcf96 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -330,7 +330,9 @@ } #define GSM51_MFRAME_DURATION_us (51 * GSM_TDMA_FN_DURATION_uS) /* 235365 us */ -static unsigned int calculate_timer_3113(struct gsm_paging_request *req) +static unsigned int paging_estimate_delay_us(struct gsm_bts *bts, unsigned int num_reqs); + +static unsigned int calculate_timer_3113(struct gsm_paging_request *req, unsigned int reqs_before) { unsigned int to_us, to; struct gsm_bts *bts = req->bts; @@ -345,8 +347,6 @@ if (!bts->T3113_dynamic) return d->val; - /* TODO: take into account load of paging group for req->bsub */ - /* MFRMS defines repeat interval of paging messages for MSs that belong * to same paging group across multiple 51 frame multiframes. * MAXTRANS defines maximum number of RACH retransmissions, spread over @@ -358,6 +358,9 @@ to_us = GSM51_MFRAME_DURATION_us * bs_pa_mfrms + GSM_TDMA_FN_DURATION_uS * rach_tx_integer * rach_max_trans; + /* Now add some extra time based on how many requests need to be transmitted before this one: */ + to_us += paging_estimate_delay_us(bts, reqs_before); + /* ceiling in seconds + extra time */ to = (to_us + 999999) / 1000000 + d->val; LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Paging request: T3113 expires in %u seconds\n", to); @@ -375,6 +378,9 @@ struct gsm_bts_paging_state *bts_entry = &bts->paging; struct gsm_paging_request *req, *last_initial_req = NULL; unsigned int t3113_timeout_s; + unsigned int reqs_before_same_pgroup = 0; + uint8_t pgroup = gsm0502_calc_paging_group(&bts->si_common.chan_desc, + str_to_imsi(params->bsub->imsi)); rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_ATTEMPTED)); @@ -392,8 +398,15 @@ rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_ALREADY)); return -EEXIST; } - if (req->attempts == 0) + if (req->attempts == 0) { last_initial_req = req; + if (req->pgroup == pgroup) + reqs_before_same_pgroup++; + } else if (last_initial_req == NULL) { + /* If no req with attempts=0 was found, we'll append to end of list, so keep counting. */ + if (req->pgroup == pgroup) + reqs_before_same_pgroup++; + } } LOG_PAGING_BTS(params, bts, DPAG, LOGL_DEBUG, "Start paging\n"); @@ -405,6 +418,7 @@ bsc_subscr_get(req->bsub, BSUB_USE_PAGING_REQUEST); req->bts = bts; req->chan_type = params->chan_needed; + req->pgroup = pgroup; req->msc = params->msc; osmo_timer_setup(&req->T3113, paging_T3113_expired, req); @@ -414,7 +428,7 @@ else/* Add in the middle of the list after last_initial_req */ __llist_add(&req->entry, &last_initial_req->entry, last_initial_req->entry.next); - t3113_timeout_s = calculate_timer_3113(req); + t3113_timeout_s = calculate_timer_3113(req, reqs_before_same_pgroup); osmo_timer_schedule(&req->T3113, t3113_timeout_s, 0); paging_schedule_if_needed(bts_entry); @@ -598,3 +612,19 @@ available_slots, time_span_s); return available_slots; } + +/*! Conservative estimate of time needed by BTS to schedule a number of paging + * requests (num_reqs), based on current load at the BSC queue (doesn't take into + * account BTs own buffer) */ +static unsigned int paging_estimate_delay_us(struct gsm_bts *bts, unsigned int num_reqs) +{ + unsigned int n_pag_blocks = gsm0502_get_n_pag_blocks(&bts->si_common.chan_desc); + unsigned int n_mframes = (num_reqs + (n_pag_blocks - 1)) / n_pag_blocks; + unsigned int time_us = n_mframes * GSM51_MFRAME_DURATION_us; + /* the multiframes are not consecutive for a paging group, let's add the spacing between: */ + if (n_mframes > 1) { + unsigned int bs_pa_mfrms = (bts->si_common.chan_desc.bs_pa_mfrms + 2); + time_us += (n_mframes - 1) * bs_pa_mfrms * GSM51_MFRAME_DURATION_us; + } + return time_us; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I904c008222ddc3d92843d87fb3182c30b484c8a2 Gerrit-Change-Number: 27965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: paging: Rework timer lifecycle logic

by pespin

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27936 to look at the new patch set (#3). Change subject: paging: Rework timer lifecycle logic ...................................................................... paging: Rework timer lifecycle logic Decouple credit_timer from event "available_slots became 0". Let's actually relate credit_timer to the fact of not receiving CCCH Load Indication: If no CCCH Load Indication is received (cch_load_ind_period * 2), then assume we are below CCH Load Indication threshold (10% load) and start estimating the available_slots in a cch_load_ind_period*2 time frame. Moreover, in paging_schedule_if_needed(), there's no use in delaying start of processing work if the work_timer is not already doing work. Related: OS#5537 Change-Id: I6a0da03c408270044079e81d431f6641527c00cd --- M src/osmo-bsc/paging.c 1 file changed, 14 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/27936/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6a0da03c408270044079e81d431f6641527c00cd Gerrit-Change-Number: 27936 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: smscb: Always start ETWS timer even in cells without ETWS support

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27961 ) Change subject: smscb: Always start ETWS timer even in cells without ETWS support ...................................................................... smscb: Always start ETWS timer even in cells without ETWS support ETWS is sent over both dedicated channels and broadcast channels. Some BTS models may not support the latter, but it is still useful to start the related timer to ensure bts->etws.active gets set to false after the emergency period has concluded. Change-Id: I448be9fd75b87c1f7333a5bfa4f6ba238569fdc3 --- M src/osmo-bsc/smscb.c 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/61/27961/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index a11ca0f..8d92b5e 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -538,14 +538,16 @@ if (osmo_bts_has_feature(&bts->features, BTS_FEAT_ETWS_PN)) { rsl_etws_pn_command(bts, RSL_CHAN_PCH_AGCH, bes->primary, sizeof(bes->primary)); LOG_BTS(bts, DCBS, LOGL_NOTICE, "Sent ETWS Primary Notification via common channel\n"); - if (wrepl->u.emergency.warning_period != 0xffffffff) { - osmo_timer_setup(&bts->etws.timer, etws_pn_cb, bts); - osmo_timer_schedule(&bts->etws.timer, wrepl->u.emergency.warning_period, 0); - } else - LOG_BTS(bts, DCBS, LOGL_NOTICE, "Unlimited ETWS PN broadcast, this breaks " - "normal network operation due to PCH blockage\n"); } else LOG_BTS(bts, DCBS, LOGL_ERROR, "BTS doesn't support RSL command for ETWS PN\n"); + + /* start the expiration timer, if any */ + if (wrepl->u.emergency.warning_period != 0xffffffff) { + osmo_timer_setup(&bts->etws.timer, etws_pn_cb, bts); + osmo_timer_schedule(&bts->etws.timer, wrepl->u.emergency.warning_period, 0); + } else + LOG_BTS(bts, DCBS, LOGL_NOTICE, "Unlimited ETWS PN broadcast, this breaks " + "normal network operation due to PCH blockage\n"); } /*! Try to execute a write-replace operation; roll-back if it fails. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I448be9fd75b87c1f7333a5bfa4f6ba238569fdc3 Gerrit-Change-Number: 27961 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: cbsp: Implement KILL for Emergency Broadcast

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27962 ) Change subject: cbsp: Implement KILL for Emergency Broadcast ...................................................................... cbsp: Implement KILL for Emergency Broadcast So far, we only implemented KILL for CBS, but not for Emergency broadcasts. This patch adds KILL support for Emergency, by which a CBC can terminate broadcast of a previously-started Emergency message before its scheduled period ends. Change-Id: Ie91939b93de6847eeb5d00c97a137c43721c2711 Closes: OS#5540 Related: SYS#5906 --- M src/osmo-bsc/smscb.c 1 file changed, 49 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/62/27962/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 8d92b5e..873d665 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -243,6 +243,12 @@ llist_add_tail(&cent->list, &r_state->num_completed.list); } +static bool etws_msg_id_matches(uint16_t a, uint16_t b) +{ + /* ETWS messages are identified by the twelve most significant bits of the Message ID */ + return (a & 0xFFF0) == (b & 0xFFF0); +} + /*! Iterate over all BTSs, find matching ones, execute command on BTS, add result * to succeeded/failed lists. * \param[in] net GSM network in which we operate @@ -666,23 +672,53 @@ struct response_state *r_state, void *priv) { const struct osmo_cbsp_kill *kill = &dec->u.kill; - struct bts_smscb_chan_state *chan_state; - struct bts_smscb_message *smscb; - bool extended = false; - if (kill->channel_ind && *kill->channel_ind == 0x01) - extended = true; - chan_state = bts_get_smscb_chan(bts, extended); + if (kill->channel_ind) { + /* KILL for CBS message */ + struct bts_smscb_chan_state *chan_state; + struct bts_smscb_message *smscb; + bool extended = false; - /* Find message by msg_id + old_serial_nr */ - smscb = bts_find_smscb(chan_state, kill->msg_id, kill->old_serial_nr); - if (!smscb) - return -CBSP_CAUSE_MSG_REF_NOT_IDENTIFIED; + if (*kill->channel_ind == 0x01) + extended = true; - append_bcast_compl(r_state, chan_state->bts, smscb); + chan_state = bts_get_smscb_chan(bts, extended); - /* Remove it */ - bts_smscb_del(smscb, chan_state, "KILL"); + /* Find message by msg_id + old_serial_nr */ + smscb = bts_find_smscb(chan_state, kill->msg_id, kill->old_serial_nr); + if (!smscb) + return -CBSP_CAUSE_MSG_REF_NOT_IDENTIFIED; + + append_bcast_compl(r_state, chan_state->bts, smscb); + + /* Remove it */ + bts_smscb_del(smscb, chan_state, "KILL"); + } else { + /* KILL for Emergency */ + struct bts_etws_state *bes = &bts->etws; + + if (!bes->active) { + LOG_BTS(bts, DCBS, LOGL_NOTICE, "Rx CBSP KILL (Emerg) but no emergency " + "broadcast is currently active in this cell\n"); + return -CBSP_CAUSE_MSG_REF_NOT_IDENTIFIED; + } + + if (kill->msg_id != bes->input.msg_id) { + LOG_BTS(bts, DCBS, LOGL_NOTICE, "Rx CBSP KILL (Emerg) for msg_id 0x%04x, but " + "current emergency msg_id is 0x%04x\n", kill->msg_id, bes->input.msg_id); + return -CBSP_CAUSE_MSG_REF_NOT_IDENTIFIED; + } + + if (!etws_msg_id_matches(kill->old_serial_nr, bes->input.serial_nr)) { + LOG_BTS(bts, DCBS, LOGL_NOTICE, "Rx CBSP KILL (Emerg) for old_serial_nr 0x%04x, but " + "current emergency serial_nr is 0x%04x\n", + kill->old_serial_nr, bes->input.serial_nr); + return -CBSP_CAUSE_MSG_REF_NOT_IDENTIFIED; + } + + /* stop broadcasting the PN in this BTS */ + etws_pn_stop(bts, false); + } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie91939b93de6847eeb5d00c97a137c43721c2711 Gerrit-Change-Number: 27962 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: cbsp: Reject CBSP WRITE for emergency if emergency already active

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27963 ) Change subject: cbsp: Reject CBSP WRITE for emergency if emergency already active ...................................................................... cbsp: Reject CBSP WRITE for emergency if emergency already active From 3GPP TS 48.018: If only the New Serial Number IE, and not the Old Serial Number IE, is included in the WRITE-REPLACE message,then the BSC shall interpret the message as a write request, i.e. a broadcast request of a new emergency message without replacing an ongoing emergency message broadcast. Only one emergency message at the time can be broadcasted in a cell. If a write request is received for a cell where an emergency message broadcast is currently ongoing, the write request is considered as failed. Change-Id: I376c9e796f3a2d26b22d0451f15ef1debbd7f656 Closes: OS#5539 Related: SYS#5906 --- M src/osmo-bsc/smscb.c 1 file changed, 28 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/27963/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 873d665..2b37df9 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -494,13 +494,37 @@ etws_pn_stop(bts, true); } -static void etws_primary_to_bts(struct gsm_bts *bts, const struct osmo_cbsp_write_replace *wrepl) +static int etws_primary_to_bts(struct gsm_bts *bts, const struct osmo_cbsp_write_replace *wrepl) { struct bts_etws_state *bes = &bts->etws; struct gsm_bts_trx *trx; unsigned int count = 0; int i, j; + if (bes->active) { + /* we were already broadcasting emergency before receiving this WRITE-REPLACE */ + + /* If only the New Serial Number IE, and not the Old Serial Number IE, is included in the + * WRITE-REPLACE message, then the BSC shall interpret the message as a write request, i.e. a + * broadcast request of a new emergency message without replacing an ongoing emergency message + * broadcast. */ + if (!wrepl->old_serial_nr) { + /* If a write request is received for a cell where an emergency message broadcast is + * currently ongoing, the write request is considered as failed */ + LOG_BTS(bts, DCBS, LOGL_NOTICE, "Rx CBSP WRITE rejected due to ongoing emergency " + "while no Old Serial Nr IE present in CBSP WRITE\n"); + return -CBSP_CAUSE_BSC_CAPACITY_EXCEEDED; + } + + if (!etws_msg_id_matches(*wrepl->old_serial_nr, bes->input.serial_nr)) { + LOG_BTS(bts, DCBS, LOGL_NOTICE, "Rx CBSP WRITE-REPLACE old_serial 0x%04x doesn't match " + "current serial 0x%04x. Is the CBC confused?\n", + *wrepl->old_serial_nr, bes->input.serial_nr); + /* we allow the WRITE-REPLACE to continue, TS 48.049 doesn't specify how to + * handle situations like this */ + } + } + if (bes->input.sec_info) { talloc_free(bes->input.sec_info); bes->input.sec_info = NULL; @@ -554,6 +578,8 @@ } else LOG_BTS(bts, DCBS, LOGL_NOTICE, "Unlimited ETWS PN broadcast, this breaks " "normal network operation due to PCH blockage\n"); + + return 0; } /*! Try to execute a write-replace operation; roll-back if it fails. @@ -625,8 +651,7 @@ int rc; if (!wrepl->is_cbs) { - etws_primary_to_bts(bts, wrepl); - return 0; + return etws_primary_to_bts(bts, wrepl); } /* check if cell has a CBCH at all */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I376c9e796f3a2d26b22d0451f15ef1debbd7f656 Gerrit-Change-Number: 27963 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: smscb: Don't include extraneous IEs in CBSP KILL COMPLETE / FAILURE

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27959 ) Change subject: smscb: Don't include extraneous IEs in CBSP KILL COMPLETE / FAILURE ...................................................................... smscb: Don't include extraneous IEs in CBSP KILL COMPLETE / FAILURE TS 48.049 states the following rules for the KILL COMPLETE / FAILURE mesages: The Number of Broadcasts Completed List IE, if present, contains for each cell the total number of broadcasts of the killed CBS message. The Cell List IE, if present, contains the cells in which the emergency message is successfully terminated. As any message can only be either emergency or CBS, this means that we can (at maximum) have only one of those two IEs in the message. As there is no explicit indication in the KILL whether it relates to CBS or Emergency, we use the "Channel Indicator" IE, which is specified as "only included if the message refers to a CBS message". Related: SYS#5906 Closes: OS#5541 Change-Id: I9a43d386da01f085663d231a555b8b5acc99faca --- M src/osmo-bsc/smscb.c 1 file changed, 20 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/27959/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 5fe6345..c89bedb 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -791,11 +791,16 @@ fail->channel_ind = kill->channel_ind; llist_replace_head(&fail->fail_list, &r_state->fail); - fail->cell_list.id_discr = r_state->success.id_discr; - llist_replace_head(&fail->cell_list.list, &r_state->success.list); - - fail->num_compl_list.id_discr = r_state->num_completed.id_discr; - llist_replace_head(&fail->num_compl_list.list, &r_state->num_completed.list); + /* if the KILL relates to CBS, the "Channel Indicator" IE is present */ + if (kill->channel_ind) { + /* only if it was CBS */ + fail->num_compl_list.id_discr = r_state->num_completed.id_discr; + llist_replace_head(&fail->num_compl_list.list, &r_state->num_completed.list); + } else { + /* only if it was emergency */ + fail->cell_list.id_discr = r_state->success.id_discr; + llist_replace_head(&fail->cell_list.list, &r_state->success.list); + } } else { resp = osmo_cbsp_decoded_alloc(cbc, CBSP_MSGT_KILL_COMPL); struct osmo_cbsp_kill_complete *compl = &resp->u.kill_compl; @@ -803,11 +808,16 @@ compl->old_serial_nr = kill->old_serial_nr; compl->channel_ind = kill->channel_ind; - compl->cell_list.id_discr = r_state->success.id_discr; - llist_replace_head(&compl->cell_list.list, &r_state->success.list); - - compl->num_compl_list.id_discr = r_state->num_completed.id_discr; - llist_replace_head(&compl->num_compl_list.list, &r_state->num_completed.list); + /* if the KILL relates to CBS, the "Channel Indicator" IE is present */ + if (kill->channel_ind) { + /* only if it was CBS */ + compl->num_compl_list.id_discr = r_state->num_completed.id_discr; + llist_replace_head(&compl->num_compl_list.list, &r_state->num_completed.list); + } else { + /* only if it was emergency */ + compl->cell_list.id_discr = r_state->success.id_discr; + llist_replace_head(&compl->cell_list.list, &r_state->success.list); + } } cbsp_tx_decoded(cbc, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9a43d386da01f085663d231a555b8b5acc99faca Gerrit-Change-Number: 27959 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022