laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28017 )

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 (cherry picked from commit bcd0f63dce341878bc3e4e67dd2cb29507ba1f39) --- M src/osmo-bsc/smscb.c 1 file changed, 7 insertions(+), 5 deletions(-)

Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified

diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index fc347eb..208c203 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -538,13 +538,15 @@ 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_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_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.