<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12255">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: dtap: Set subscr log context<br><br>Change-Id: I362a7d10f5ca9a95b594f7caafd7ed5b10fd059a<br>---<br>M src/osmo-bsc/gsm_08_08.c<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>2 files changed, 11 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index c3c5000..2c6a689 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -602,8 +602,10 @@</span><br><span> {</span><br><span>     int lu_cause;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>        if (!msc_connected(conn))</span><br><span style="color: hsl(0, 100%, 40%);">-               return;</span><br><span style="color: hsl(120, 100%, 40%);">+               goto done;</span><br><span> </span><br><span>       LOGP(DMSC, LOGL_INFO, "Tx MSC DTAP LINK_ID=0x%02x\n", link_id);</span><br><span> </span><br><span>@@ -612,7 +614,7 @@</span><br><span>   * to handle it. If it was handled we will return.</span><br><span>    */</span><br><span>  if (handle_cc_setup(conn, msg) >= 1)</span><br><span style="color: hsl(0, 100%, 40%);">-         return;</span><br><span style="color: hsl(120, 100%, 40%);">+               goto done;</span><br><span> </span><br><span>       /* Check the filter */</span><br><span>       if (bsc_filter_data(conn, msg, &lu_cause) < 0) {</span><br><span>@@ -620,7 +622,7 @@</span><br><span>                                        conn->filter_state.con_type,</span><br><span>                                      lu_cause);</span><br><span>           bsc_clear_request(conn, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-             return;</span><br><span style="color: hsl(120, 100%, 40%);">+               goto done;</span><br><span>   }</span><br><span> </span><br><span>        bsc_scan_bts_msg(conn, msg);</span><br><span>@@ -628,6 +630,9 @@</span><br><span>   /* Store link_id in msg->cb */</span><br><span>    OBSC_LINKID_CB(msg) = link_id;</span><br><span>       osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_MO_DTAP, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+done:</span><br><span style="color: hsl(120, 100%, 40%);">+    log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+    return;</span><br><span> }</span><br><span> </span><br><span> /*! BSC->MSC: RR conn has been cleared. */</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 39425f6..b5ff152 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -980,6 +980,8 @@</span><br><span> int bsc_handle_dt(struct gsm_subscriber_connection *conn,</span><br><span>                  struct msgb *msg, unsigned int len)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+    log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>        if (len < sizeof(struct bssmap_header)) {</span><br><span>                 LOGP(DMSC, LOGL_ERROR, "The header is too short.\n");</span><br><span>      }</span><br><span>@@ -997,6 +999,7 @@</span><br><span>                      gsm0808_bssap_name(msg->l3h[0]));</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span>   return -1;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12255">change 12255</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/12255"/><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: I362a7d10f5ca9a95b594f7caafd7ed5b10fd059a </div>
<div style="display:none"> Gerrit-Change-Number: 12255 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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: Pau Espin Pedrol <pespin@sysmocom.de> </div>