<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11652">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LCLS: expand logging to print the name of the mode in use<br><br>Change-Id: I56b57936ae82984e84896228da5a83115a78bbd7<br>Related: OS#3659<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>M src/osmo-bsc/osmo_bsc_vty.c<br>4 files changed, 18 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/11652/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index 6ca0330..32b161e 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -59,6 +59,13 @@</span><br><span> /* we may later introduce BTS_LOOP here: direct RTP between BTSs */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string bsc_lcls_mode_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return get_value_string(bsc_lcls_mode_names, m);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! /brief Information on a remote MSC for libbsc.</span><br><span> */</span><br><span> struct bsc_msc_data {</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 08d5bcb..56eb24e 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -47,6 +47,12 @@</span><br><span> </span><br><span> void *tall_bsc_ctx = NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string bsc_lcls_mode_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { BSC_LCLS_MODE_DISABLED, "disabled" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static LLIST_HEAD(bts_models);</span><br><span> </span><br><span> void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr,</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>index e642976..a406643 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>@@ -240,7 +240,9 @@</span><br><span> {</span><br><span> struct mgcp_conn_peer mdcx_info;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS(%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_lcls_mode_name(conn->sccp.msc->lcls_mode));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!conn->user_plane.mgw_endpoint_ci_msc) {</span><br><span> /* the MGCP FSM has died, e.g. due to some MGCP/SDP parsing error */</span><br><span> LOGPFSML(conn->lcls.fi, LOGL_NOTICE, "Cannot disable LCLS without MSC-side MGCP FSM\n");</span><br><span>@@ -581,7 +583,8 @@</span><br><span> </span><br><span> OSMO_ASSERT(conn_other);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS(%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_lcls_mode_name(conn->sccp.msc->lcls_mode));</span><br><span> if (!conn->user_plane.mgw_endpoint_ci_msc) {</span><br><span> LOGPFSML(fi, LOGL_ERROR, "Cannot enable LCLS without MSC-side MGCP FSM. FIXME\n");</span><br><span> return;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>index f90ad6f..14fd274 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>@@ -38,12 +38,6 @@</span><br><span> </span><br><span> #define IPA_STR "IP.ACCESS specific\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string bsc_lcls_mode_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { BSC_LCLS_MODE_DISABLED, "disabled" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" },</span><br><span style="color: hsl(0, 100%, 40%);">- { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty)</span><br><span> {</span><br><span> return bsc_gsmnet->bsc_data;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11652">change 11652</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/11652"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I56b57936ae82984e84896228da5a83115a78bbd7 </div>
<div style="display:none"> Gerrit-Change-Number: 11652 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>