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

Change in libosmocore[master]: iuup: Drop unused events

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28269 ) Change subject: iuup: Drop unused events ...................................................................... iuup: Drop unused events Those events are not realy used there and they are not even present in the FSM definition. Let's drop them. Change-Id: I4beec96ac4bdf047ebf144a8b009b297b47cacdc --- M src/gsm/iuup.c 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index bd9e82c..4c0a948 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -757,12 +757,6 @@ irp = tnl_to_rnl_data(itp); iui->user_prim_cb(&irp->oph, iui->user_prim_priv); break; - case IUUP_FSM_EVT_IUUP_UNITDATA_REQ: - case IUUP_FSM_EVT_IUUP_UNITDATA_IND: - case IUUP_FSM_EVT_SSASAR_UNITDATA_REQ: - case IUUP_FSM_EVT_SSASAR_UNITDATA_IND: - /* no state change */ - break; } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4beec96ac4bdf047ebf144a8b009b297b47cacdc Gerrit-Change-Number: 28269 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in libosmocore[master]: iuup: Add missing state to bitmask for st SMpSDU_Data_Transfer_Ready

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28268 ) Change subject: iuup: Add missing state to bitmask for st SMpSDU_Data_Transfer_Ready ...................................................................... iuup: Add missing state to bitmask for st SMpSDU_Data_Transfer_Ready The event is expected since the user of the IuUP stack can send a CONFIGURE.req to transition to state null. The handling was already there in the function, but the bit was missing in the FSM definition. Change-Id: I830835a5b8b98f8b91b866f5280f508098c9ae7e --- M src/gsm/iuup.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index 2c70307..bd9e82c 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -826,7 +826,8 @@ .action = iuup_fsm_init, }, [IUUP_FSM_ST_SMpSDU_DATA_XFER_READY] = { - .in_event_mask = S(IUUP_FSM_EVT_IUUP_DATA_REQ) | + .in_event_mask = S(IUUP_FSM_EVT_IUUP_CONFIG_REQ) | + S(IUUP_FSM_EVT_IUUP_DATA_REQ) | S(IUUP_FSM_EVT_IUUP_DATA_IND), .out_state_mask = S(IUUP_FSM_ST_NULL) | S(IUUP_FSM_ST_INIT), -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I830835a5b8b98f8b91b866f5280f508098c9ae7e Gerrit-Change-Number: 28268 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in libosmocore[master]: iuup: Fix Handling of subsequent Initialization msgs

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28271 ) Change subject: iuup: Fix Handling of subsequent Initialization msgs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5cb740702805693cc7f0a550e2e093f9bfdd507c Gerrit-Change-Number: 28271 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 19:02:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in libosmocore[master]: tests/iuup: Showcase IuUP stack not answering subsequent Init msgs

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28270 ) Change subject: tests/iuup: Showcase IuUP stack not answering subsequent Init msgs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I72c2c2d88f158f3ef35724fcb73854a1827aaab4 Gerrit-Change-Number: 28270 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 18:45:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in libosmocore[master]: iuup: Drop unused events

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28269 ) Change subject: iuup: Drop unused events ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4beec96ac4bdf047ebf144a8b009b297b47cacdc Gerrit-Change-Number: 28269 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 18:44:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in libosmocore[master]: iuup: Add missing state to bitmask for st SMpSDU_Data_Transfer_Ready

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28268 ) Change subject: iuup: Add missing state to bitmask for st SMpSDU_Data_Transfer_Ready ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I830835a5b8b98f8b91b866f5280f508098c9ae7e Gerrit-Change-Number: 28268 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 18:44:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in libosmocore[master]: iuup: Add missing state to bitmask for st SMpSDU_Data_Transfer_Ready

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28268 ) Change subject: iuup: Add missing state to bitmask for st SMpSDU_Data_Transfer_Ready ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I830835a5b8b98f8b91b866f5280f508098c9ae7e Gerrit-Change-Number: 28268 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 17:52:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: smscb: Tx CBSP FAILURE/RESTART for specific cell when it becomes (un)...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28275 ) Change subject: smscb: Tx CBSP FAILURE/RESTART for specific cell when it becomes (un)operational ...................................................................... smscb: Tx CBSP FAILURE/RESTART for specific cell when it becomes (un)operational This way the CBSP peers knows the state of specific cells and can avoid sending messages to unoperative ones, etc. Related: SYS#5910 Change-Id: I94f0a1ac3c59cffe5af57f972d5d96fc92281d34 --- M src/osmo-bsc/smscb.c 1 file changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/28275/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 1a69fba..7cb3b36 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -476,6 +476,54 @@ return cbsp_tx_decoded(cbc, cbsp); } +/* transmit a CBSP RESTART-INDICATION message stating all message data was lost for one cell */ +int cbsp_tx_restart_bts(struct bsc_cbc_link *cbc, bool is_emerg, struct gsm_bts *bts) +{ + struct osmo_cbsp_decoded *cbsp = osmo_cbsp_decoded_alloc(cbc, CBSP_MSGT_RESTART); + struct osmo_cbsp_cell_ent cell_ent; + + if (is_emerg) + cbsp->u.restart.bcast_msg_type = 0x01; + cbsp->u.restart.recovery_ind = 0x01; /* message data lost */ + cbsp->u.restart.cell_list.id_discr = CELL_IDENT_LAC_AND_CI; + + cell_ent = (struct osmo_cbsp_cell_ent){ + .cell_id = { + .lac_and_ci = { + .lac = bts->location_area_code, + .ci = bts->cell_identity, + } + } + }; + llist_add(&cell_ent.list, &cbsp->u.restart.cell_list.list); + + return cbsp_tx_decoded(cbc, cbsp); +} + +/* transmit a CBSP FAILURE-INDICATION message stating all message data was lost for one cell */ +int cbsp_tx_failure_bts(struct bsc_cbc_link *cbc, bool is_emerg, struct gsm_bts *bts) +{ + struct osmo_cbsp_decoded *cbsp = osmo_cbsp_decoded_alloc(cbc, CBSP_MSGT_FAILURE); + struct osmo_cbsp_fail_ent fail_ent; + + if (is_emerg) + cbsp->u.failure.bcast_msg_type = 0x01; + + fail_ent = (struct osmo_cbsp_fail_ent){ + .id_discr = CELL_IDENT_LAC_AND_CI, + .cell_id = { + .lac_and_ci = { + .lac = bts->location_area_code, + .ci = bts->cell_identity, + } + }, + .cause = OSMO_CBSP_CAUSE_CELL_BROADCAST_NOT_OPERATIONAL + }; + llist_add(&fail_ent.list, &cbsp->u.failure.fail_list); + + return cbsp_tx_decoded(cbc, cbsp); +} + /* transmit a CBSP KEEPALIVE COMPLETE to the CBC */ static int tx_cbsp_keepalive_compl(struct bsc_cbc_link *cbc) { @@ -1093,12 +1141,14 @@ bts_cbch_timer_schedule(trx->bts); /* Start ETWS/PWS Primary Notification, if active */ bts_etws_bootstrap(trx->bts); + cbsp_tx_restart_bts(bts->network->cbc, false, bts); } } else { if (osmo_timer_pending(&bts->cbch_timer)) { /* If timer is ongoing it means CBCH was available */ LOG_BTS(bts, DCBS, LOGL_INFO, "BTS becomes unavailable for CBCH\n"); osmo_timer_del(&bts->cbch_timer); + cbsp_tx_failure_bts(bts->network->cbc, false, bts); } /* else: CBCH was already unavailable before */ } return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I94f0a1ac3c59cffe5af57f972d5d96fc92281d34 Gerrit-Change-Number: 28275 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: smscb: Base cell operational life cycle on CBCH being operative

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28274 ) Change subject: smscb: Base cell operational life cycle on CBCH being operative ...................................................................... smscb: Base cell operational life cycle on CBCH being operative This allows running CBCH/ETWS related procedures only when the CBCH towards MS under that cell is operative. This also allows providing awarness of per-cell status to the CBSP peer as required per specs. Related: SYS#5910 Change-Id: Ia93919be94132fc010acb5bbfef0a6fd51c42981 --- M include/osmocom/bsc/smscb.h M src/osmo-bsc/bts.c M src/osmo-bsc/cbch_scheduler.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/smscb.c 5 files changed, 80 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/74/28274/1 diff --git a/include/osmocom/bsc/smscb.h b/include/osmocom/bsc/smscb.h index 03c3bb0..b4f2e19 100644 --- a/include/osmocom/bsc/smscb.h +++ b/include/osmocom/bsc/smscb.h @@ -9,6 +9,7 @@ struct bsc_cbc_link; /* smscb.c */ +void smscb_global_init(void); void bts_smscb_del(struct bts_smscb_message *smscb, struct bts_smscb_chan_state *cstate, const char *reason); const char *bts_smscb_msg2str(const struct bts_smscb_message *smscb); @@ -25,7 +26,9 @@ void bts_smscb_page_done(struct bts_smscb_chan_state *cstate, struct bts_smscb_page *page); int bts_smscb_rx_cbch_load_ind(struct gsm_bts *bts, bool cbch_extended, bool is_overflow, uint8_t slot_count); +void bts_cbch_init(struct gsm_bts *bts); void bts_cbch_timer_schedule(struct gsm_bts *bts); +void bts_cbch_timer_cb(void *data); enum bsc_cbc_link_mode { BSC_CBC_LINK_MODE_DISABLED = 0, @@ -64,7 +67,6 @@ int cbsp_tx_decoded(struct bsc_cbc_link *cbc, struct osmo_cbsp_decoded *decoded); void bts_etws_init(struct gsm_bts *bts); -void bts_etws_bootstrap(struct gsm_bts *bts); /* smscb_vty.c: */ void smscb_vty_init(void); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index d0adb2a..37ae147 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -93,12 +93,6 @@ return get_value_string(bts_type_names, type); } -static void bts_init_cbch_state(struct bts_smscb_chan_state *cstate, struct gsm_bts *bts) -{ - cstate->bts = bts; - INIT_LLIST_HEAD(&cstate->messages); -} - static LLIST_HEAD(bts_models); struct gsm_bts_model *bts_model_find(enum gsm_bts_type type) @@ -152,6 +146,8 @@ { paging_destructor(bts); + osmo_timer_del(&bts->cbch_timer); + bts->site_mgr->bts[0] = NULL; if (bts->gprs.cell.mo.fi) { @@ -429,8 +425,7 @@ memcpy(&bts->mr_half.bts_mode[0], &amr_hr_ms_bts_mode[0], sizeof(amr_hr_ms_bts_mode)); bts->mr_half.num_modes = ARRAY_SIZE(amr_hr_ms_bts_mode); - bts_init_cbch_state(&bts->cbch_basic, bts); - bts_init_cbch_state(&bts->cbch_extended, bts); + bts_cbch_init(bts); bts_etws_init(bts); acc_mgr_init(&bts->acc_mgr, bts); diff --git a/src/osmo-bsc/cbch_scheduler.c b/src/osmo-bsc/cbch_scheduler.c index c66f743..d699e7e 100644 --- a/src/osmo-bsc/cbch_scheduler.c +++ b/src/osmo-bsc/cbch_scheduler.c @@ -246,7 +246,7 @@ bts_smscb_page_done(cstate, page); } -static void bts_cbch_timer_cb(void *data) +void bts_cbch_timer_cb(void *data) { struct gsm_bts *bts = (struct gsm_bts *)data; @@ -259,7 +259,6 @@ /* There is one SMSCB message (page) per eight 51-multiframes, i.e. 1.882 seconds */ void bts_cbch_timer_schedule(struct gsm_bts *bts) { - osmo_timer_setup(&bts->cbch_timer, &bts_cbch_timer_cb, bts); osmo_timer_schedule(&bts->cbch_timer, 1, 882920); } diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index f6da74a..920693f 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -359,14 +359,6 @@ osmo_fsm_inst_dispatch(ts->fi, TS_EV_RSL_READY, NULL); } - /* Start CBCH transmit timer if CBCH is present */ - if (trx->nr == 0 && gsm_bts_get_cbch(trx->bts)) - bts_cbch_timer_schedule(trx->bts); - - /* Start ETWS/PWS Primary Notification, if active */ - if (trx->nr == 0) - bts_etws_bootstrap(trx->bts); - /* Drop all expired channel requests in the list */ abis_rsl_chan_rqd_queue_flush(trx->bts); } @@ -469,8 +461,6 @@ rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_RSL_FAIL)); acc_ramp_abort(&trx->bts->acc_ramp); gsm_trx_all_ts_dispatch(trx, TS_EV_RSL_DOWN, NULL); - if (trx->nr == 0) - osmo_timer_del(&trx->bts->cbch_timer); } gsm_bts_sm_mo_reset(trx->bts->site_mgr); @@ -935,6 +925,7 @@ lb_init(); acc_ramp_global_init(); paging_global_init(); + smscb_global_init(); /* Read the config */ rc = bsc_network_configure(config_file); diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 193dc4e..1a69fba 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -27,6 +27,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> #include <osmocom/core/byteswap.h> +#include <osmocom/core/signal.h> #include <osmocom/gsm/cbsp.h> #include <osmocom/gsm/protocol/gsm_23_041.h> @@ -42,6 +43,7 @@ #include <osmocom/bsc/lchan_fsm.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/bts.h> +#include <osmocom/bsc/signal.h> /********************************************************************************* * Helper Functions @@ -74,6 +76,19 @@ return ETWS_PRIM_NOTIF_SIZE; } +static void bts_cbch_init_state(struct bts_smscb_chan_state *cstate, struct gsm_bts *bts) +{ + cstate->bts = bts; + INIT_LLIST_HEAD(&cstate->messages); +} + +void bts_cbch_init(struct gsm_bts *bts) +{ + bts_cbch_init_state(&bts->cbch_basic, bts); + bts_cbch_init_state(&bts->cbch_extended, bts); + osmo_timer_setup(&bts->cbch_timer, &bts_cbch_timer_cb, bts); +} + /*! Obtain SMSCB Channel State for given BTS (basic or extended CBCH) */ struct bts_smscb_chan_state *bts_get_smscb_chan(struct gsm_bts *bts, bool extended) { @@ -1033,8 +1048,64 @@ } /* BSC is bootstrapping a BTS; install any currently active ETWS PN */ -void bts_etws_bootstrap(struct gsm_bts *bts) +static void bts_etws_bootstrap(struct gsm_bts *bts) { if (bts->etws.active) bts_send_etws(bts); } + +/* Callback function to be called every time we receive a signal from NM */ +static int nm_sig_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) +{ + struct nm_running_chg_signal_data *nsd; + struct gsm_bts *bts; + struct gsm_bts_trx *trx; + + if (signal != S_NM_RUNNING_CHG) + return 0; + + nsd = signal_data; + bts = nsd->bts; + + switch (nsd->obj_class) { + case NM_OC_RADIO_CARRIER: + trx = (struct gsm_bts_trx *)nsd->obj; + break; + case NM_OC_BASEB_TRANSC: + trx = gsm_bts_bb_trx_get_trx((struct gsm_bts_bb_trx *)nsd->obj); + break; + default: + return 0; + } + + struct gsm_lchan *cbch = gsm_bts_get_cbch(bts); + if (!cbch) + return 0; + /* We only care about state changes of TX holding the CBCH. */ + if (trx != cbch->ts->trx) + return 0; + + if (nsd->running) { + if (trx_is_usable(trx)) { + LOG_BTS(bts, DCBS, LOGL_INFO, "BTS becomes available for CBCH\n"); + /* Start CBCH transmit timer if CBCH is present */ + bts_cbch_timer_schedule(trx->bts); + /* Start ETWS/PWS Primary Notification, if active */ + bts_etws_bootstrap(trx->bts); + } + } else { + if (osmo_timer_pending(&bts->cbch_timer)) { + /* If timer is ongoing it means CBCH was available */ + LOG_BTS(bts, DCBS, LOGL_INFO, "BTS becomes unavailable for CBCH\n"); + osmo_timer_del(&bts->cbch_timer); + } /* else: CBCH was already unavailable before */ + } + return 0; +} + +/* To be called once at startup of the process: */ +void smscb_global_init(void) +{ + osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia93919be94132fc010acb5bbfef0a6fd51c42981 Gerrit-Change-Number: 28274 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc-cbsp: Test BTS Failure+Restart when BTS becomes (un)available

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28273 ) Change subject: bsc-cbsp: Test BTS Failure+Restart when BTS becomes (un)available ...................................................................... bsc-cbsp: Test BTS Failure+Restart when BTS becomes (un)available Related: SYS#5910 Change-Id: I35ddde7bc2e39d35c301f1153416b549ba1630cd --- M bsc/BSC_Tests_CBSP.ttcn M library/CBSP_Templates.ttcn 2 files changed, 89 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/28273/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index a933b24..6a785e8 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -40,6 +40,10 @@ import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; +import from Osmocom_CTRL_Functions all; +import from Osmocom_CTRL_Types all; +import from Osmocom_CTRL_Adapter all; + modulepar { charstring mp_cbc_ip := "127.0.0.1"; charstring mp_cbc_ip6 := "::1"; @@ -47,6 +51,8 @@ charstring mp_bsc_cbsp_ip := "127.0.0.1"; charstring mp_bsc_cbsp_ip6 := "::1"; integer mp_bsc_cbsp_port := 48050; + /* port number to which to establish the IPA CTRL connection */ + integer mp_bsc_ctrl_port := 4249; /* BTS 0: 001-01-1-0 with CBCH * BTS 1: 001-01-1-1 with CBCH @@ -536,6 +542,75 @@ setverdict(pass); } +/* Test if a LAC_CI FAILURE Ind is sent when TRX holding the CBCH is locked + * (becomes unavailable). LAC_CI RESTART Ind should be set when the TRX becomes + * unlocked again. */ +testcase TC_cbsp_cell_rflock_failure_restart() runs on cbsp_test_CT { + var template CBSP_PDU rx; + + g_pars := valueof(ts_CBSP_Pars_default(false, 0, 0)); + f_init(); + + /* Lock the TRX, CBCH should become unavailable and BSC send FAILURE */ + f_ctrl_set(IPA_CTRL, "bts.0.trx.0.rf_locked", "1"); + + rx := tr_CBSP_FAILURE({CBSP_FailureListItem_LAC_CI(bssmap_lac_ci(mp_cgi_bts0), + CBSP_CAUSE_CB_NOT_OPERATIONAL)}, + CBSP_BC_MSGT_CBS); + 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; + } + } + + /* Unlock the TRX, CBCH should become available and BSC send RESTART */ + f_ctrl_set(IPA_CTRL, "bts.0.trx.0.rf_locked", "0"); + rx := tr_CBSP_RESTART(ts_BSSMAP_CIL_LAC_CI({bssmap_lac_ci(mp_cgi_bts0)}), + CBSP_BC_MSGT_CBS, ?); + 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; + } + } + + setverdict(pass); +} + +/* Test if a LAC_CI FAILURE Ind is sent when conn of TRX holding the CBCH goes down. */ +testcase TC_cbsp_cell_rsl_down_failure() runs on cbsp_test_CT { + var template CBSP_PDU rx; + + g_pars := valueof(ts_CBSP_Pars_default(false, 0, 0)); + f_init(); + + /* Drop RSL link of the TRX holding the CBCH: */ + f_ipa_rsl_stop(bts[0][0].rsl); + + rx := tr_CBSP_FAILURE({CBSP_FailureListItem_LAC_CI(bssmap_lac_ci(mp_cgi_bts0), + CBSP_CAUSE_CB_NOT_OPERATIONAL)}, + CBSP_BC_MSGT_CBS); + 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; + } + } + + /* TODO: call f_init() again to reconnect? */ + setverdict(pass); +} + testcase TC_cbsp_write() runs on cbsp_test_CT { var template (value) CBSP_PDU tx; var CBSP_IEs pages := {f_gen_page()}; @@ -1081,6 +1156,8 @@ execute( TC_cbsp_bsc_client() ); execute( TC_cbsp_bsc_client_ipv6() ); execute( TC_cbsp_reset_bss() ); + execute( TC_cbsp_cell_rflock_failure_restart() ); + execute( TC_cbsp_cell_rsl_down_failure() ); /* test various different types of Cell Identities */ execute( TC_cbsp_write_bss() ); diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn index d166bcf..2d70256 100644 --- a/library/CBSP_Templates.ttcn +++ b/library/CBSP_Templates.ttcn @@ -134,6 +134,18 @@ list := items }}); +template (present) CBSP_FailureListItem CBSP_FailureListItem_LAC_CI( + template (present) BSSMAP_FIELD_CellIdentification_LAC_CI lac_ci := ?, + template (present) CBSP_Cause cause := ?) := +{ + spare1_4 := '0000'B, + cell_id_discr := '0001'B, + cell_id := { + cI_LAC_CI := lac_ci + }, + cause := cause +}; + template (value) CBSP_IE ts_CbspNumComplList(template (value) CBSP_IE_NumBcastComplList list) := ts_CBSP_IE(CBSP_IEI_NUM_BCAST_COMPL_LIST, {num_bcast_compl_list := list}); template CBSP_IE tr_CbspNumComplList(template CBSP_IE_NumBcastComplList list := ?) := -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28273 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: I35ddde7bc2e39d35c301f1153416b549ba1630cd Gerrit-Change-Number: 28273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2022