laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27971 ) Change subject: smscb: Send ETWS PN to BTS if ETWS active before BTS connects ...................................................................... smscb: Send ETWS PN to BTS if ETWS active before BTS connects Especially during emergencies / natural disasters, it is particularly likely that networks become unreliable and BTSs disconnect and reconnect. If upon reconnect there still is an active ETWS/PWS emergency message active for this BTS, send it to the BTS to ensure it re-starts broadcasting that message until disabled. Change-Id: I175c33297c08e65bdbf38447e697e37f8a64d527 --- M include/osmocom/bsc/smscb.h M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/smscb.c 3 files changed, 46 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/27971/1 diff --git a/include/osmocom/bsc/smscb.h b/include/osmocom/bsc/smscb.h index 5b0905b..0e157c6 100644 --- a/include/osmocom/bsc/smscb.h +++ b/include/osmocom/bsc/smscb.h @@ -66,3 +66,4 @@ 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); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 3c8f381..24498b7 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -363,6 +363,10 @@ 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); } diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 8a6a705..4c7110f 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -494,13 +494,45 @@ etws_pn_stop(bts, true); } -static int etws_primary_to_bts(struct gsm_bts *bts, const struct osmo_cbsp_write_replace *wrepl) + +/* the actual "execution" part: Send ETWS to all active lchan in the BTS and via PCH */ +static void bts_send_etws(struct gsm_bts *bts) { struct bts_etws_state *bes = &bts->etws; struct gsm_bts_trx *trx; unsigned int count = 0; int i, j; + /* iterate over all lchan in each TS in each TRX of this BTS */ + llist_for_each_entry(trx, &bts->trx_list, list) { + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + for (j = 0; j < ARRAY_SIZE(ts->lchan); j++) { + struct gsm_lchan *lchan = &ts->lchan[j]; + if (!lchan_may_receive_data(lchan)) + continue; + gsm48_send_rr_app_info(lchan, 0x1, 0x0, bes->primary, + sizeof(bes->primary)); + count++; + } + } + } + + LOG_BTS(bts, DCBS, LOGL_NOTICE, "Sent ETWS Primary Notification via %u dedicated channels\n", + count); + + /* Notify BTS of primary ETWS notification via vendor-specific Abis message */ + 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"); + } else + LOG_BTS(bts, DCBS, LOGL_ERROR, "BTS doesn't support RSL command for ETWS PN\n"); +} + +static int etws_primary_to_bts(struct gsm_bts *bts, const struct osmo_cbsp_write_replace *wrepl) +{ + struct bts_etws_state *bes = &bts->etws; + if (bes->active) { /* we were already broadcasting emergency before receiving this WRITE-REPLACE */ @@ -546,30 +578,7 @@ bes->active = true; - /* iterate over all lchan in each TS in each TRX of this BTS */ - llist_for_each_entry(trx, &bts->trx_list, list) { - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - for (j = 0; j < ARRAY_SIZE(ts->lchan); j++) { - struct gsm_lchan *lchan = &ts->lchan[j]; - if (!lchan_may_receive_data(lchan)) - continue; - gsm48_send_rr_app_info(lchan, 0x1, 0x0, bes->primary, - sizeof(bes->primary)); - count++; - } - } - } - - LOG_BTS(bts, DCBS, LOGL_NOTICE, "Sent ETWS Primary Notification via %u dedicated channels\n", - count); - - /* Notify BTS of primary ETWS notification via vendor-specific Abis message */ - 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"); - } else - LOG_BTS(bts, DCBS, LOGL_ERROR, "BTS doesn't support RSL command for ETWS PN\n"); + bts_send_etws(bts); /* start the expiration timer, if any */ if (wrepl->u.emergency.warning_period != 0xffffffff) { @@ -1087,3 +1096,10 @@ bts->etws.active = false; osmo_timer_setup(&bts->etws.timer, etws_pn_cb, bts); } + +/* BSC is bootstrapping a BTS; install any currently active ETWS PN */ +void bts_etws_bootstrap(struct gsm_bts *bts) +{ + if (bts->etws.active) + bts_send_etws(bts); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I175c33297c08e65bdbf38447e697e37f8a64d527 Gerrit-Change-Number: 27971 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge@osmocom.org> Gerrit-MessageType: newchange