<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9287">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;">gscon: put subscriber a little later<br><br>Keep the bsc_subscr associated with the conn as long as possible, to benefit<br>logging, which then contains the subscriber identity (if any).<br><br>Change-Id: Ifa528b58842a02509bfe0af6915c64bd67058bcd<br>---<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>1 file changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index b46eb94..2ae4b33 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -995,12 +995,6 @@</span><br><span>                conn->lchan = NULL;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (conn->bsub) {</span><br><span style="color: hsl(0, 100%, 40%);">-            LOGPFSML(fi, LOGL_DEBUG, "Putting bsc_subscr\n");</span><br><span style="color: hsl(0, 100%, 40%);">-             bsc_subscr_put(conn->bsub);</span><br><span style="color: hsl(0, 100%, 40%);">-          conn->bsub = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-   }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    if (conn->sccp.state != SUBSCR_SCCP_ST_NONE) {</span><br><span>            LOGPFSML(fi, LOGL_DEBUG, "Disconnecting SCCP\n");</span><br><span>          struct bsc_msc_data *msc = conn->sccp.msc;</span><br><span>@@ -1014,6 +1008,12 @@</span><br><span> </span><br><span>   penalty_timers_free(&conn->hodec2.penalty_timers);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->bsub) {</span><br><span style="color: hsl(120, 100%, 40%);">+          LOGPFSML(fi, LOGL_DEBUG, "Putting bsc_subscr\n");</span><br><span style="color: hsl(120, 100%, 40%);">+           bsc_subscr_put(conn->bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+                conn->bsub = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  llist_del(&conn->entry);</span><br><span>      talloc_free(conn);</span><br><span>   fi->priv = NULL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9287">change 9287</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/9287"/><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: Ifa528b58842a02509bfe0af6915c64bd67058bcd </div>
<div style="display:none"> Gerrit-Change-Number: 9287 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>