diff options
| author | Stefan Sperling <ssperling@sysmocom.de> | 2018-02-12 16:26:34 +0100 |
|---|---|---|
| committer | Stefan Sperling <ssperling@sysmocom.de> | 2018-02-28 18:21:14 +0100 |
| commit | faf0982ae20001519cf20c5d6345dad490a135f2 (patch) | |
| tree | af333ae940733ef1179d87fe2df40e613b153ea1 | |
| parent | b22dcb87cfa99bd4a8f8483b611442363be1b24c (diff) | |
Generate the S_L_INP_TEI_UP signal earlier.
The S_L_INP_TEI_UP signal was generated when the first message from a BTS
arrives on the OML/RSL link, rather than when the OML/RSL link comes up.
Instead, generate this signal when the link is brought up, so we
intitialize state regardless of how a particular BTS behaves.
Tested with osmo-bts-virtual and virtphy/mobile programs,
and with a sysmobts.
Change-Id: I3b76ae6b00043e706dddc78209311e00ace85bb7
Related: OS#2719
| -rw-r--r-- | src/libbsc/bts_ipaccess_nanobts.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index cf859618c..99e178d54 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -438,6 +438,11 @@ ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, bts->oml_tei, 0); rc = clock_gettime(CLOCK_MONOTONIC, &tp); bts->uptime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need sub-second precision for uptime */ + if (!(sign_link->trx->bts->ip_access.flags & OML_UP)) { + e1inp_event(sign_link->ts, S_L_INP_TEI_UP, + sign_link->tei, sign_link->sapi); + sign_link->trx->bts->ip_access.flags |= OML_UP; + } break; case E1INP_SIGN_RSL: { struct e1inp_ts *ts; @@ -458,6 +463,13 @@ ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, e1inp_sign_link_create(ts, E1INP_SIGN_RSL, trx, trx->rsl_tei, 0); trx->rsl_link->ts->sign.delay = 0; + if (!(sign_link->trx->bts->ip_access.flags & + (RSL_UP << sign_link->trx->nr))) { + e1inp_event(sign_link->ts, S_L_INP_TEI_UP, + sign_link->tei, sign_link->sapi); + sign_link->trx->bts->ip_access.flags |= + (RSL_UP << sign_link->trx->nr); + } break; } default: @@ -490,25 +502,12 @@ static int ipaccess_sign_link(struct msgb *msg) { int ret = 0; struct e1inp_sign_link *link = msg->dst; - struct e1inp_ts *e1i_ts = link->ts; switch (link->type) { case E1INP_SIGN_RSL: - if (!(link->trx->bts->ip_access.flags & - (RSL_UP << link->trx->nr))) { - e1inp_event(e1i_ts, S_L_INP_TEI_UP, - link->tei, link->sapi); - link->trx->bts->ip_access.flags |= - (RSL_UP << link->trx->nr); - } ret = abis_rsl_rcvmsg(msg); break; case E1INP_SIGN_OML: - if (!(link->trx->bts->ip_access.flags & OML_UP)) { - e1inp_event(e1i_ts, S_L_INP_TEI_UP, - link->tei, link->sapi); - link->trx->bts->ip_access.flags |= OML_UP; - } ret = abis_nm_rcvmsg(msg); break; default: |