- gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: hodec2: add penalty-time low-rxqual-ho
by neels 29 Mar '22

29 Mar '22

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27596 ) Change subject: hodec2: add penalty-time low-rxqual-ho ...................................................................... hodec2: add penalty-time low-rxqual-ho When bad RxQual causes handover to a cell with weaker RxLev, then handover oscillation *will* happen, as shown in test_rxqual.ho_vty. Introduce a penalty timer for a cell where we had bad RxQual. This delays handover back to the cell with stronger RxLev by the penalty timeout; hopefully the interference is gone after the timeout. Related: SYS#5911 Change-Id: I057b156604a104a26a7ce45d1c7adadbf452c932 --- M include/osmocom/bsc/handover_cfg.h M src/osmo-bsc/handover_decision_2.c M tests/handover/test_rxqual.ho_vty 3 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/27596/1 diff --git a/include/osmocom/bsc/handover_cfg.h b/include/osmocom/bsc/handover_cfg.h index 2bd2681..7d68e63 100644 --- a/include/osmocom/bsc/handover_cfg.h +++ b/include/osmocom/bsc/handover_cfg.h @@ -268,6 +268,13 @@ "Time to suspend re-assignment after an lchan was re-assigned because of low RxQual\n" \ "Seconds\n") \ \ + HO_CFG_ONE_MEMBER(int, hodec2_penalty_low_rxqual_ho, 60, \ + "handover2 ", "penalty-time low-rxqual-ho", "<0-99999>", atoi, "%d", as_is, \ + HO_CFG_STR_HANDOVER2 \ + HO_CFG_STR_PENALTY_TIME \ + "Time to suspend handover back to a cell after bad RxQual caused handover away from it\n" \ + "Seconds\n") \ + \ HO_CFG_ONE_MEMBER(int, hodec2_retries, 0, \ "handover2 ", "retries", "<0-9>", atoi, "%d", as_is, \ HO_CFG_STR_HANDOVER2 \ diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 14bc2d4..8627910 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -914,6 +914,19 @@ full_rate ? "TCH/F" : "TCH/H", ho_reason_name(global_ho_reason)); handover_request(&req); + + /* Apply penalty timer hodec2_penalty_low_rxqual_ho */ + if (global_ho_reason == HO_REASON_INTERFERENCE + || global_ho_reason == HO_REASON_BAD_QUALITY) { + struct gsm0808_cell_id bts_id; + struct gsm_subscriber_connection *conn = c->current.lchan->conn; + int timeout = ho_get_hodec2_penalty_low_rxqual_ho(c->current.bts->ho); + gsm_bts_cell_id(&bts_id, c->current.bts); + LOGPHOCAND(c, LOGL_DEBUG, "Applying penalty-time low-rxqual-ho %d s on bts %u (%s), reason: %s\n", + timeout, c->current.bts->nr, gsm0808_cell_id_name_c(OTC_SELECT, &bts_id), + ho_reason_name(global_ho_reason)); + penalty_timers_add(conn, &conn->hodec2.penalty_timers, &bts_id, timeout); + } } return 0; } diff --git a/tests/handover/test_rxqual.ho_vty b/tests/handover/test_rxqual.ho_vty index f64de52..6f86cf4 100644 --- a/tests/handover/test_rxqual.ho_vty +++ b/tests/handover/test_rxqual.ho_vty @@ -10,6 +10,10 @@ # See Performance Enhancements in a Frequency Hopping GSM Network (Nielsen Wigard 2002), Chapter # 2.1.1, "Interference" in the list of triggers on p.157. +# first show undesired oscillation when penalty-time low-rxqual-ho is disabled +network + handover2 penalty-time low-rxqual-ho 0 + create-n-bts 2 set-ts-use trx 0 0 states * TCH/F - - - - - - meas-rep repeat 9 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 @@ -20,10 +24,26 @@ expect-ts-use trx 1 0 states * TCH/F - - - - - - # Now the channel is on bts 1, which has lower rxlev than bts 0. -# The result is an undesired ho oscillation +# The result is an undesired ho oscillation, because the penalty timer is zero meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 + +# Set a proper penalty timeout and report bad-rxqual again +network + handover2 penalty-time low-rxqual-ho 10 meas-rep repeat 10 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 + +# This time the penalty timer prevents oscillation +meas-rep repeat 10 lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-no-chan + +# After the penalty timeout passes, we do go back to the cell with stronger rxlev +wait 10 meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 +# If the rxqual is still bad here after the penalty timeout, well, then we quickly snap back to the weaker cell, once +meas-rep repeat 10 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 +expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 +meas-rep repeat 10 lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-no-chan -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I057b156604a104a26a7ce45d1c7adadbf452c932 Gerrit-Change-Number: 27596 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: hodec2: show reported ho oscillation from bad rxqual
by neels 29 Mar '22

29 Mar '22

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-bsc/+/27595 to look at the new patch set (#2). Change subject: hodec2: show reported ho oscillation from bad rxqual ...................................................................... hodec2: show reported ho oscillation from bad rxqual First show the problem. Related: SYS#5911 Change-Id: I51f3101901492ae742d8e56d6eed2725408216cb --- M tests/handover/test_rxqual.ho_vty 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/27595/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I51f3101901492ae742d8e56d6eed2725408216cb Gerrit-Change-Number: 27595 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

1 0

Change in osmo-bsc[master]: hodec2: reproduce reported ho oscillation from bad rxqual
by fixeria 29 Mar '22

29 Mar '22

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27595 ) Change subject: hodec2: reproduce reported ho oscillation from bad rxqual ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I51f3101901492ae742d8e56d6eed2725408216cb Gerrit-Change-Number: 27595 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: Mon, 28 Mar 2022 20:45:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: hodec2: reproduce reported ho oscillation from bad rxqual
by neels 29 Mar '22

29 Mar '22

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27595 ) Change subject: hodec2: reproduce reported ho oscillation from bad rxqual ...................................................................... hodec2: reproduce reported ho oscillation from bad rxqual First show the problem. Related: SYS#5911 Change-Id: I51f3101901492ae742d8e56d6eed2725408216cb --- M tests/handover/test_rxqual.ho_vty 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/27595/1 diff --git a/tests/handover/test_rxqual.ho_vty b/tests/handover/test_rxqual.ho_vty index 4dc5c24..ee6108d 100644 --- a/tests/handover/test_rxqual.ho_vty +++ b/tests/handover/test_rxqual.ho_vty @@ -19,3 +19,11 @@ expect-ts-use trx 0 0 states * - - - - - - - expect-ts-use trx 1 0 states * TCH/F - - - - - - +# Now the channel is on bts 1, which has lower rxlev than bts 0. +# The result is an undesired ho oscillation +meas-rep repeat 10 lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 +meas-rep repeat 10 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 +expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 +meas-rep repeat 10 lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I51f3101901492ae742d8e56d6eed2725408216cb Gerrit-Change-Number: 27595 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: CBSP_Types: Fix typo num_bcats_compl -> num_bcast_compl
by laforge 29 Mar '22

29 Mar '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27593 ) Change subject: CBSP_Types: Fix typo num_bcats_compl -> num_bcast_compl ...................................................................... CBSP_Types: Fix typo num_bcats_compl -> num_bcast_compl Change-Id: Ic51b3071ea9233a053cb1ee837b910d9250010d2 --- M library/CBSP_Types.ttcn 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/27593/1 diff --git a/library/CBSP_Types.ttcn b/library/CBSP_Types.ttcn index 5ab3c98..b282454 100644 --- a/library/CBSP_Types.ttcn +++ b/library/CBSP_Types.ttcn @@ -161,31 +161,31 @@ }; type record CBSP_FIELD_NumBcastCompl_CGI { BSSMAP_FIELD_CellIdentification_CGI ci, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; type record CBSP_FIELD_NumBcastCompl_LAC_CI { BSSMAP_FIELD_CellIdentification_LAC_CI ci, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; type record CBSP_FIELD_NumBcastCompl_LAI { BSSMAP_FIELD_CellIdentification_LAI ci, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; type record CBSP_FIELD_NumBcastCompl_CI { OCT2 ci, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; type record CBSP_FIELD_NumBcastCompl_LAC { OCT2 lac, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27593 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: Ic51b3071ea9233a053cb1ee837b910d9250010d2 Gerrit-Change-Number: 27593 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure
by laforge 29 Mar '22

29 Mar '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 ) Change subject: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure ...................................................................... bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure Change-Id: I124a69c515d634bc054ed35e430af6b3c11ad46e Related: SYS#5909 --- M bsc/BSC_Tests_CBSP.ttcn M library/CBSP_Templates.ttcn 2 files changed, 149 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/27594/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 8119289..25f00d8 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -380,6 +380,34 @@ } } +/* send a KILL CBS to the BSC; expect either COMPLETE or FAILURE in response*/ +function f_cbsp_msg_status_query(uint16_t msg_id, uint16_t ser_no, template (value) uint8_t channel_ind := 0, + template (value) BSSMAP_FIELD_CellIdentificationList cell_list := ts_BSSMAP_CIL_BSS, + template CBSP_IE_NumBcastComplList compl_list := ?, + template CBSP_FailureListItems fail_list := omit) runs on cbsp_test_CT +{ + var template (value) CBSP_PDU tx; + var template CBSP_PDU rx; + + tx := ts_CBSP_MSG_STATUS_QUERY(msg_id, ser_no, cell_list, channel_ind); + CBSP[0].send(ts_CBSP_Send(g_cbsp_conn_id[0], tx)); + if (istemplatekind(fail_list, "omit")) { + rx := tr_CBSP_MSG_STATUS_QUERY_COMPL(msg_id, ser_no, compl_list:=compl_list, channel_ind:=channel_ind); + } else { + rx := tr_CBSP_MSG_STATUS_QUERY_FAIL(msg_id, ser_no, fail_list, channel_ind:=channel_ind, + compl_list:=compl_list); + } + 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; + } + } +} + template (present) RSL_IE_CbCommandType tr_RslCbCmdType(template (present) uint2_t lblock := ?, template (present) RSL_CbCommand cmd := ?) := { command := cmd, @@ -858,6 +886,45 @@ } } +/* 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)); + f_init(); + + f_cbsp_msg_status_query(g_cbsp_msg_id, g_cbsp_ser_no, compl_list := omit, fail_list := ?); +} + +/* 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)); + f_init(); + + var CBSP_IEs pages := {f_gen_page()}; + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list; + cell_list := ts_BSSMAP_CIL_CGI({bssmap_cgi(mp_cgi_bts0)}); + /* request 5 transmissions */ + f_cbsp_write(g_cbsp_msg_id, g_cbsp_ser_no, cell_list, num_bcast_req := 5, content:=pages, + success_list:=cell_list, fail_list:=omit); + var template (present) RSL_Message tr := f_page2rsl(pages[0], g_cbsp_msg_id, g_cbsp_ser_no); + /* wait for first transmission */ + IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)); + var template (present) CBSP_IE_NumBcastComplList compl_list := { + len := ?, + spare1_4 := ?, + cell_id_discr := ?, + list := { + cI_CGI := { + ci := bssmap_cgi(mp_cgi_bts0), + num_bcast_compl := (1 .. 5), + num_bcast_info := CBSP_NUM_BCAST_INFO_VALID, + spare1_4 := '0000'B + } + } + }; + f_cbsp_msg_status_query(g_cbsp_msg_id, g_cbsp_ser_no, cell_list:=cell_list, compl_list := compl_list, fail_list := omit); +} + + control { @@ -884,6 +951,9 @@ execute( TC_cbsp_write_then_kill() ); execute( TC_cbsp_write_then_reset() ); + execute( TC_cbsp_status_q_empty() ); + execute( TC_cbsp_status_q_bts_cgi() ); + 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() ); diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn index 5da2958..f86241e 100644 --- a/library/CBSP_Templates.ttcn +++ b/library/CBSP_Templates.ttcn @@ -667,6 +667,85 @@ return tr_CBSP(CBSP_MSGT_KILL_FAIL, ies); } +/* 8.1.3.10 MESSAGE STATUS QUERY */ +template (value) CBSP_PDU +ts_CBSP_MSG_STATUS_QUERY(template (value) uint16_t msg_id, + template (value) uint16_t old_ser_nr, + template (value) BSSMAP_FIELD_CellIdentificationList cell_list, + template (value) uint8_t channel_ind) := + ts_CBSP(CBSP_MSGT_MSG_STATUS_QUERY, { + ts_CbspMsgId(msg_id), + ts_OldSerNo(old_ser_nr), + ts_CbspCellList(cell_list), + ts_CbspChannelInd(channel_ind)}); +template (present) CBSP_PDU +tr_CBSP_MSG_STATUS_QUERY(template (present) uint16_t msg_id := ?, + template (present) uint16_t old_ser_nr := ?, + template (present) BSSMAP_FIELD_CellIdentificationList cell_list := ?, + template (present) uint8_t channel_ind := ?) := + ts_CBSP(CBSP_MSGT_MSG_STATUS_QUERY, { + ts_CbspMsgId(msg_id), + ts_OldSerNo(old_ser_nr), + ts_CbspCellList(cell_list), + ts_CbspChannelInd(channel_ind)}); + +/* 8.1.3.11 MESSAGE STATUS QUERY COMPLETE */ +template (value) CBSP_PDU +ts_CBSP_MSG_STATUS_QUERY_COMPL(template (value) uint16_t msg_id, template (value) uint16_t old_ser_nr, + template (value) CBSP_IE_NumBcastComplList compl_list, + template (value) uint8_t channel_ind) := + ts_CBSP(CBSP_MSGT_MSG_STATUS_QUERY_COMPL, { + ts_CbspMsgId(msg_id), + ts_OldSerNo(old_ser_nr), + ts_CbspNumComplList(valueof(compl_list)), + ts_CbspChannelInd(channel_ind)}); +template (present) CBSP_PDU +tr_CBSP_MSG_STATUS_QUERY_COMPL(template (present) uint16_t msg_id, template (present) uint16_t old_ser_nr, + template (present) CBSP_IE_NumBcastComplList compl_list, + template (present) uint8_t channel_ind) := + tr_CBSP(CBSP_MSGT_MSG_STATUS_QUERY_COMPL, { + tr_CbspMsgId(msg_id), + tr_OldSerNo(old_ser_nr), + tr_CbspNumComplList(compl_list), + tr_CbspChannelInd(channel_ind)}); + +/* 8.1.3.12 MESSAGE STATUS QUERY FAILURE */ +function ts_CBSP_MSG_STATUS_QUERY_FAIL(template (value) uint16_t msg_id, template (value) uint16_t old_ser_nr, + template (value) CBSP_FailureListItems fail_list, + template (value) uint8_t channel_ind, + template (omit) CBSP_IE_NumBcastComplList compl_list) +return template (value) CBSP_PDU { + var template (value) CBSP_IEs ies := { + ts_CbspMsgId(msg_id), + ts_OldSerNo(old_ser_nr), + ts_CbspFailList(fail_list), + ts_CbspChannelInd(channel_ind) + }; + if (not istemplatekind(compl_list, "omit")) { + ies[lengthof(ies)] := ts_CbspNumComplList(valueof(compl_list)); + } + return ts_CBSP(CBSP_MSGT_MSG_STATUS_QUERY_FAIL, ies); +} +function tr_CBSP_MSG_STATUS_QUERY_FAIL(template (present) uint16_t msg_id := ?, template (present) uint16_t old_ser_nr := ?, + template (present) CBSP_FailureListItems fail_list := ?, + template (present) uint8_t channel_ind := ?, + template CBSP_IE_NumBcastComplList compl_list := *) +return template (present) CBSP_PDU { + var template (present) CBSP_IEs ies := { + tr_CbspMsgId(msg_id), + tr_OldSerNo(old_ser_nr), + tr_CbspFailList(fail_list), + tr_CbspChannelInd(channel_ind) + }; + if (istemplatekind(compl_list, "*")) { + testcase.stop("TITAN > 6.5.0 doesn't support this"); + //ies[lengthof(ies)] := ts_CbspNumComplList(valueof(compl_list)); + } else if (not istemplatekind(compl_list, "omit")) { + ies[lengthof(ies)] := tr_CbspNumComplList(compl_list); + } + return tr_CBSP(CBSP_MSGT_MSG_STATUS_QUERY_FAIL, ies); +} + /* 8.1.3.16 RESET */ template (value) CBSP_PDU ts_CBSP_RESET(template (value) BSSMAP_FIELD_CellIdentificationList cell_list) := -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 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: I124a69c515d634bc054ed35e430af6b3c11ad46e Gerrit-Change-Number: 27594 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: CBSP: implement MESSAGE STATUS QUERY
by laforge 29 Mar '22

29 Mar '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27592 ) Change subject: CBSP: implement MESSAGE STATUS QUERY ...................................................................... CBSP: implement MESSAGE STATUS QUERY This add support for handling inbound MESSAGE STATUS QUERY from the CBC, and responding with MESSAGE STATUS QUERY COMPLETE or MESSAGE STATUS QUERY FAILURE, as applicable. Change-Id: I3b738dc29d0ead4f735abeeb6960d3675cb05ae2 Related: SYS#5909 --- M src/osmo-bsc/smscb.c 1 file changed, 68 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/27592/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 1640880..232c0d7 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -681,6 +681,29 @@ return 0; } +static int bts_rx_status_query(struct gsm_bts *bts, const struct osmo_cbsp_decoded *dec, + struct response_state *r_state, void *priv) +{ + const struct osmo_cbsp_msg_status_query *query = &dec->u.msg_status_query; + struct bts_smscb_chan_state *chan_state; + struct bts_smscb_message *smscb; + bool extended = false; + + if (query->channel_ind == 0x01) + extended = true; + chan_state = bts_get_smscb_chan(bts, extended); + + /* Find message by msg_id + old_serial_nr */ + smscb = bts_find_smscb(chan_state, query->msg_id, query->old_serial_nr); + if (!smscb) + return -CBSP_CAUSE_MSG_REF_NOT_IDENTIFIED; + + append_bcast_compl(r_state, chan_state->bts, smscb); + + return 0; +} + + /********************************************************************************* * Receive of CBSP from CBC *********************************************************************************/ @@ -824,6 +847,48 @@ return rc; } +static int cbsp_rx_status_query(struct bsc_cbc_link *cbc, const struct osmo_cbsp_decoded *dec) +{ + const struct osmo_cbsp_msg_status_query *query = &dec->u.msg_status_query; + struct gsm_network *net = cbc->net; + struct response_state *r_state = talloc_zero(cbc, struct response_state); + struct osmo_cbsp_decoded *resp; + int rc; + + LOGP(DCBS, LOGL_DEBUG, "CBSP Rx MESSAGE STATUS QUERY\n"); + + rc = cbsp_per_bts(net, r_state, &dec->u.msg_status_query.cell_list, bts_rx_status_query, dec, NULL); + if (rc < 0) { + resp = osmo_cbsp_decoded_alloc(cbc, CBSP_MSGT_MSG_STATUS_QUERY_FAIL); + struct osmo_cbsp_msg_status_query_failure *fail = &resp->u.msg_status_query_fail; + fail->msg_id = query->msg_id; + fail->old_serial_nr = query->old_serial_nr; + fail->channel_ind = query->channel_ind; + llist_replace_head(&fail->fail_list, &r_state->fail); + + 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 { + resp = osmo_cbsp_decoded_alloc(cbc, CBSP_MSGT_MSG_STATUS_QUERY_COMPL); + struct osmo_cbsp_msg_status_query_complete *compl = &resp->u.msg_status_query_compl; + compl->msg_id = query->msg_id; + compl->old_serial_nr = query->old_serial_nr; + compl->channel_ind = query->channel_ind; + + if (dec->u.msg_status_query.cell_list.id_discr == CELL_IDENT_BSS) { + /* replace the list of individual cell identities with CELL_IDENT_BSS */ + compl->num_compl_list.id_discr = CELL_IDENT_BSS; + /* no need to free num_completed_list entries, hierarchical talloc works */ + } else { + 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); + } + } + cbsp_tx_decoded(cbc, resp); + talloc_free(r_state); + return rc; +} + /*! process an incoming, already decoded CBSP message from the CBC. * \param[in] cbc link to the CBC @@ -846,8 +911,10 @@ case CBSP_MSGT_RESET: /* stop broadcasting of all messages */ rc = cbsp_rx_reset(cbc, dec); break; - case CBSP_MSGT_LOAD_QUERY: case CBSP_MSGT_MSG_STATUS_QUERY: + rc = cbsp_rx_status_query(cbc, dec); + break; + case CBSP_MSGT_LOAD_QUERY: case CBSP_MSGT_SET_DRX: LOGP(DCBS, LOGL_ERROR, "Received Unimplemented CBSP Message Type %s", get_value_string(cbsp_msg_type_names, dec->msg_type)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b738dc29d0ead4f735abeeb6960d3675cb05ae2 Gerrit-Change-Number: 27592 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Build failed in Jenkins: master-osmo-opencm3-projects » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #19
by jenkins＠lists.osmocom.org 29 Mar '22

29 Mar '22

See <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…> Changes: ------------------------------------------ Started by upstream project "master-osmo-opencm3-projects" build number 19 originally caused by: Started by an SCM change Running as SYSTEM Building remotely on build2-deb9build-ansible (ttcn3 osmocom-gerrit-debian9 osmocom-master-debian9 repo-install-test coverity) in workspace <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…> The recommended git tool is: NONE No credentials specified Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmo-opencm3-projects > git init <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…> # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-opencm3-projects > git --version # timeout=10 > git --version # 'git version 2.11.0' > git fetch --tags --progress -- git://git.osmocom.org/osmo-opencm3-projects +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmo-opencm3-projects # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 Avoid second fetch Checking out Revision 7527cab6d8364b2022bd4fa2fd03039eac2a99bb (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 7527cab6d8364b2022bd4fa2fd03039eac2a99bb # timeout=10 Commit message: "add missing libcommon.mk" First time build. Skipping changelog. > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.libopencm3.url # timeout=10 > git config -f .gitmodules --get submodule.libopencm3.path # timeout=10 > git config --get submodule.librfn.url # timeout=10 > git config -f .gitmodules --get submodule.librfn.path # timeout=10 > git submodule update --init --recursive libopencm3 # timeout=10 > git submodule update --init --recursive librfn # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins5762361540671398993.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true --cap-add SYS_PTRACE -e ARTIFACT_STORE=/artifact_store -e ASCIIDOC_WARNINGS_CHECK=1 -e HOME=/build -e JOB_NAME=master-osmo-opencm3-projects/a1=default,a2=default,a3=default,a4=default,label=osmocom-master-debian9 -e MAKE=make -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e OSMO_GSM_MANUALS_DIR=/opt/osmo-gsm-manuals -e PARALLEL_MAKE=-j 8 -e PUBLISH=1 -e WITH_MANUALS=1 -w /build -i -u build -v <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…>:/build -v /home/osmocom-build/jenkins_build_artifact_store:/artifact_store -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom-build/debian-stretch-jenkins /build/contrib/jenkins.sh --publish =============== relay-driver START ============== CLEAN CC console.c arm-none-eabi-gcc: error: /usr/lib/picolibc/arm-none-eabi/picolibc.specs: No such file or directory ../../mk/libopencm3.mk:227: recipe for target 'console.o' failed make: *** [console.o] Error 1 Build step 'Execute shell' marked build as failure

1 29

Change in osmo-bsc[master]: SMSCB: Preserve padding at end of page in CBSP -> RSL conversion
by laforge 29 Mar '22

29 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27590 ) Change subject: SMSCB: Preserve padding at end of page in CBSP -> RSL conversion ...................................................................... SMSCB: Preserve padding at end of page in CBSP -> RSL conversion When copying the CBS page content from CBSP to RSL data structures, we use the User Information Length as length argument in the memcpy. The logic for that is that only this part of the message contains valid data. However, as the user information length is not passed on via RSL or transmitted over the air, the receiving MS will get a page with zero-initialized padding, rather than whatever the originator of the message has specified. As zero bytes in the 8bit domain might get translated into @-characters in the 7bit domain, this creates problems. So instead, let's always copy the entire page (82 bytes) to ensure transparency when passing on information from CBSP to RSL. Change-Id: Iffcf1f6a7d41a08a2feffc6f2ac5634d940b63aa Closes: SYS#5904 --- M src/osmo-bsc/smscb.c 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 542453c..1640880 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -22,6 +22,7 @@ #include <limits.h> #include <osmocom/core/stats.h> +#include <osmocom/core/utils.h> #include <osmocom/core/select.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> @@ -384,6 +385,9 @@ page = &smscb->page[i++]; msg_param = (struct gsm23041_msg_param_gsm *) &page->data[0]; + /* ensure we don't overflow in the memcpy below */ + osmo_static_assert(sizeof(*page) > sizeof(*msg_param) + sizeof(cont->data), smscb_space); + /* build 6 byte header according to TS 23.041 9.4.1.2 */ osmo_store16be(wrepl->new_serial_nr, &msg_param->serial_nr); osmo_store16be(wrepl->msg_id, &msg_param->message_id); @@ -393,7 +397,9 @@ OSMO_ASSERT(cont->user_len <= ARRAY_SIZE(cont->data)); OSMO_ASSERT(cont->user_len <= ARRAY_SIZE(page->data) - sizeof(*msg_param)); - memcpy(&msg_param->content, cont->data, cont->user_len); + /* we must not use cont->user_len as length here, as it would truncate any + * possible 7-bit padding at the end. Always copy the whole page */ + memcpy(&msg_param->content, cont->data, sizeof(cont->data)); bytes_used = sizeof(*msg_param) + cont->user_len; /* compute number of valid blocks in page */ page->num_blocks = bytes_used / 22; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iffcf1f6a7d41a08a2feffc6f2ac5634d940b63aa Gerrit-Change-Number: 27590 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc[master]: SMSCB: Preserve padding at end of page in CBSP -> RSL conversion
by pespin 29 Mar '22

29 Mar '22

Attention is currently required from: neels, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27590 ) Change subject: SMSCB: Preserve padding at end of page in CBSP -> RSL conversion ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iffcf1f6a7d41a08a2feffc6f2ac5634d940b63aa Gerrit-Change-Number: 27590 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Mar 2022 16:57:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log