diff options
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/include/openbsc/gsm_data_shared.h | 2 | ||||
| -rw-r--r-- | openbsc/include/openbsc/ipaccess.h | 1 | ||||
| -rw-r--r-- | openbsc/src/libbsc/bsc_init.c | 2 | ||||
| -rw-r--r-- | openbsc/src/libbsc/bts_ipaccess_nanobts.c | 28 |
4 files changed, 31 insertions, 2 deletions
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index ddd59918e..e616c1260 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -723,6 +723,8 @@ struct gsm_bts { struct gsm_e1_subslot oml_e1_link; uint8_t oml_tei; struct e1inp_sign_link *oml_link; + /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ + struct osmo_timer_list oml_drop_link_timer; /* when OML link was established */ time_t uptime; diff --git a/openbsc/include/openbsc/ipaccess.h b/openbsc/include/openbsc/ipaccess.h index 82e89c27d..1b5a48561 100644 --- a/openbsc/include/openbsc/ipaccess.h +++ b/openbsc/include/openbsc/ipaccess.h @@ -29,6 +29,7 @@ struct ipac_ext_lac_cmd { } __attribute__((packed)); void ipaccess_drop_oml(struct gsm_bts *bts); +void ipaccess_drop_oml_deferred(struct gsm_bts *bts); void ipaccess_drop_rsl(struct gsm_bts_trx *trx); struct sdp_header_item { diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 21ed2e1cf..218b02a9e 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -65,7 +65,7 @@ static int oml_msg_nack(struct nm_nack_signal_data *nack) } if (is_ipaccess_bts(nack->bts)) - ipaccess_drop_oml(nack->bts); + ipaccess_drop_oml_deferred(nack->bts); return 0; } diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c index 64eb4f24a..ea8376744 100644 --- a/openbsc/src/libbsc/bts_ipaccess_nanobts.c +++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c @@ -157,7 +157,7 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) enum abis_nm_chan_comb ccomb = abis_nm_chcomb4pchan(ts->pchan); if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { - ipaccess_drop_oml(trx->bts); + ipaccess_drop_oml_deferred(trx->bts); return -1; } abis_nm_chg_adm_state(trx->bts, obj_class, @@ -360,6 +360,9 @@ void ipaccess_drop_oml(struct gsm_bts *bts) struct gsm_bts *rdep_bts; struct gsm_bts_trx *trx; + /* First of all, remove deferred drop if enabled */ + osmo_timer_del(&bts->oml_drop_link_timer); + if (!bts->oml_link) return; @@ -389,6 +392,29 @@ void ipaccess_drop_oml(struct gsm_bts *bts) } } +/*! Callback for \ref ipaccess_drop_oml_deferred_cb. + */ +static void ipaccess_drop_oml_deferred_cb(void *data) +{ + struct gsm_bts *bts = (struct gsm_bts *) data; + ipaccess_drop_oml(bts); +} +/*! Deferr \ref ipacces_drop_oml through a timer to avoid dropping structures in + * current code context. This may be needed if we want to destroy the OML link + * while being called from a lower layer "struct osmo_fd" cb, were it is + * mandatory to return -EBADF if the osmo_fd has been destroyed. In case code + * destroying an OML link is called through an osmo_signal, it becomes + * impossible to return any value, thus deferring the destruction is required. + */ +void ipaccess_drop_oml_deferred(struct gsm_bts *bts) +{ + if (!osmo_timer_pending(&bts->oml_drop_link_timer) && bts->oml_link) { + LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Deferring Drop of OML link.\n", bts->nr); + osmo_timer_setup(&bts->oml_drop_link_timer, ipaccess_drop_oml_deferred_cb, bts); + osmo_timer_schedule(&bts->oml_drop_link_timer, 0, 0); + } +} + /* This function is called once the OML/RSL link becomes up. */ static struct e1inp_sign_link * ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, |