<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12448">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">IPA: log OML/RSL link drop reason<br><br>There could multiple reason for OML or RSL link towards BTS to be<br>dropped: ctrl command, vty, new link etc. Introduce "reason" parameter<br>to corresponding functions and log it on link drop to simplify<br>troubleshooting issues with more complex setups.<br><br>Change-Id: I8c8d8132ba67c31e40dbecdfe2e09be08c744899<br>---<br>M include/osmocom/bsc/ipaccess.h<br>M src/osmo-bsc/bsc_ctrl_commands.c<br>M src/osmo-bsc/bsc_rf_ctrl.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>5 files changed, 17 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/ipaccess.h b/include/osmocom/bsc/ipaccess.h</span><br><span>index 692e795..3853270 100644</span><br><span>--- a/include/osmocom/bsc/ipaccess.h</span><br><span>+++ b/include/osmocom/bsc/ipaccess.h</span><br><span>@@ -30,9 +30,9 @@</span><br><span> uint8_t data[0];</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void ipaccess_drop_oml(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+void ipaccess_drop_oml(struct gsm_bts *bts, const char *reason);</span><br><span> void ipaccess_drop_oml_deferred(struct gsm_bts *bts);</span><br><span style="color: hsl(0, 100%, 40%);">-void ipaccess_drop_rsl(struct gsm_bts_trx *trx);</span><br><span style="color: hsl(120, 100%, 40%);">+void ipaccess_drop_rsl(struct gsm_bts_trx *trx, const char *reason);</span><br><span> </span><br><span> struct sdp_header_item {</span><br><span> struct sdp_header_entry header_entry;</span><br><span>diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c</span><br><span>index 171feaf..ca182d7 100644</span><br><span>--- a/src/osmo-bsc/bsc_ctrl_commands.c</span><br><span>+++ b/src/osmo-bsc/bsc_ctrl_commands.c</span><br><span>@@ -106,7 +106,7 @@</span><br><span> llist_for_each_entry_reverse(trx, &bts->trx_list, list)</span><br><span> abis_nm_ipaccess_restart(trx);</span><br><span> } else</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_oml(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_oml(bts, "ctrl net.apply-configuration");</span><br><span> }</span><br><span> </span><br><span> cmd->reply = "Tried to drop the BTS";</span><br><span>@@ -189,7 +189,7 @@</span><br><span> return CTRL_CMD_ERROR;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_oml(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_oml(bts, "ctrl bts.apply-configuration");</span><br><span> cmd->reply = "Tried to drop the BTS";</span><br><span> return CTRL_CMD_REPLY;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>index 791abf6..0aa8e49 100644</span><br><span>--- a/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>+++ b/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>@@ -227,7 +227,7 @@</span><br><span> trx->mo.nm_state.operational != NM_OPSTATE_ENABLED ||</span><br><span> trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) {</span><br><span> LOGP(DNM, LOGL_ERROR, "RF activation failed. Starting again.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_oml(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_oml(bts, "rf check");</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 032305e..876273e 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -4433,11 +4433,11 @@</span><br><span> </span><br><span> /* close all connections */</span><br><span> if (strcmp(argv[1], "oml") == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_oml(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_oml(bts, "vty");</span><br><span> } else if (strcmp(argv[1], "rsl") == 0) {</span><br><span> /* close all rsl connections */</span><br><span> llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_rsl(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_rsl(trx, "vty");</span><br><span> }</span><br><span> } else {</span><br><span> vty_out(vty, "Argument must be 'oml# or 'rsl'.%s", VTY_NEWLINE);</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index cf81a22..56103b6 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -389,12 +389,12 @@</span><br><span> }</span><br><span> </span><br><span> /* These are exported because they are used by the VTY interface. */</span><br><span style="color: hsl(0, 100%, 40%);">-void ipaccess_drop_rsl(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+void ipaccess_drop_rsl(struct gsm_bts_trx *trx, const char *reason)</span><br><span> {</span><br><span> if (!trx->rsl_link)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_NOTICE, "(bts=%d,trx=%d) Dropping RSL link.\n", trx->bts->nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_NOTICE, "(bts=%d,trx=%d) Dropping RSL link: %s\n", trx->bts->nr, trx->nr, reason);</span><br><span> e1inp_sign_link_destroy(trx->rsl_link);</span><br><span> trx->rsl_link = NULL;</span><br><span> </span><br><span>@@ -402,7 +402,7 @@</span><br><span> paging_flush_bts(trx->bts, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void ipaccess_drop_oml(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+void ipaccess_drop_oml(struct gsm_bts *bts, const char *reason)</span><br><span> {</span><br><span> struct gsm_bts *rdep_bts;</span><br><span> struct gsm_bts_trx *trx;</span><br><span>@@ -413,14 +413,14 @@</span><br><span> if (!bts->oml_link)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Dropping OML link.\n", bts->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Dropping OML link: %s\n", bts->nr, reason);</span><br><span> e1inp_sign_link_destroy(bts->oml_link);</span><br><span> bts->oml_link = NULL;</span><br><span> bts->uptime = 0;</span><br><span> </span><br><span> /* we have issues reconnecting RSL, drop everything. */</span><br><span> llist_for_each_entry(trx, &bts->trx_list, list)</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_rsl(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_rsl(trx, "OML link drop");</span><br><span> </span><br><span> gsm_bts_all_ts_dispatch(bts, TS_EV_OML_DOWN, NULL);</span><br><span> </span><br><span>@@ -438,7 +438,7 @@</span><br><span> continue;</span><br><span> LOGP(DLINP, LOGL_NOTICE, "Dropping BTS(%u) due BTS(%u).\n",</span><br><span> rdep_bts->nr, bts->nr);</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_oml(rdep_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_oml(rdep_bts, "Dependency link drop");</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -447,7 +447,7 @@</span><br><span> static void ipaccess_drop_oml_deferred_cb(void *data)</span><br><span> {</span><br><span> struct gsm_bts *bts = (struct gsm_bts *) data;</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_oml(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_oml(bts, "Deferred link drop");</span><br><span> }</span><br><span> /*! Deferr \ref ipacces_drop_oml through a timer to avoid dropping structures in</span><br><span> * current code context. This may be needed if we want to destroy the OML link</span><br><span>@@ -537,7 +537,7 @@</span><br><span> switch(type) {</span><br><span> case E1INP_SIGN_OML:</span><br><span> /* remove old OML signal link for this BTS. */</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_oml(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_oml(bts, "new OML link");</span><br><span> </span><br><span> if (!bts_depend_check(bts)) {</span><br><span> LOGP(DLINP, LOGL_NOTICE,</span><br><span>@@ -568,7 +568,7 @@</span><br><span> return NULL;</span><br><span> </span><br><span> /* remove old RSL link for this TRX. */</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_rsl(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_rsl(trx, "new RSL link");</span><br><span> </span><br><span> /* set new RSL link for this TRX. */</span><br><span> line = bts->oml_link->ts->line;</span><br><span>@@ -609,7 +609,7 @@</span><br><span> osmo_timer_del(&link->trx->rsl_connect_timeout);</span><br><span> }</span><br><span> if (bts != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_drop_oml(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_oml(bts, "link down");</span><br><span> }</span><br><span> </span><br><span> /* This function is called if we receive one OML/RSL message. */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12448">change 12448</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12448"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8c8d8132ba67c31e40dbecdfe2e09be08c744899 </div>
<div style="display:none"> Gerrit-Change-Number: 12448 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>