<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11893">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;">gbproxy: flush_stored_messages: Get rid of msg param<br><br>Log line actually makes more sense out of the function where IMSI acq is<br>resolved. We can then get rid of msg param which may cause confusion and<br>add complexitiy to code for no good reason.<br><br>Change-Id: I6716a260e12a3cf36af0501ce611c6c1e608f537<br>---<br>M src/gprs/gb_proxy.c<br>1 file changed, 5 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c</span><br><span>index 331ebc8..0b5758a 100644</span><br><span>--- a/src/gprs/gb_proxy.c</span><br><span>+++ b/src/gprs/gb_proxy.c</span><br><span>@@ -324,18 +324,12 @@</span><br><span> /* Got identity response with IMSI, assuming the request had</span><br><span>  * been generated by the gbproxy */</span><br><span> static int gbproxy_flush_stored_messages(struct gbproxy_peer *peer,</span><br><span style="color: hsl(0, 100%, 40%);">-                                      struct msgb *msg,</span><br><span>                                    time_t now,</span><br><span>                                          struct gbproxy_link_info* link_info)</span><br><span> {</span><br><span>  int rc;</span><br><span>      struct msgb *stored_msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    LOGP(DLLC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">-       "NSEI=%d(BSS) IMSI acquisition succeeded, "</span><br><span style="color: hsl(0, 100%, 40%);">-           "flushing stored messages\n",</span><br><span style="color: hsl(0, 100%, 40%);">-         msgb_nsei(msg));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>        /* Patch and flush stored messages towards the SGSN */</span><br><span>       while ((stored_msg = msgb_dequeue_count(&link_info->stored_msgs,</span><br><span>                                              &link_info->stored_msgs_len))) {</span><br><span>@@ -475,10 +469,14 @@</span><br><span>                      gsm48_hdr_pdisc(parse_ctx->g48_hdr) == GSM48_PDISC_MM_GPRS &&</span><br><span>                     gsm48_hdr_msg_type(parse_ctx->g48_hdr) == GSM48_MT_GMM_ID_RESP;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+                LOGP(DLLC, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+                     "NSEI=%d(BSS) IMSI acquisition succeeded, "</span><br><span style="color: hsl(120, 100%, 40%);">+                 "flushing stored messages\n",</span><br><span style="color: hsl(120, 100%, 40%);">+               msgb_nsei(msg));</span><br><span>                /* The IMSI is now available. If flushing the messages fails,</span><br><span>                 * then link_info has been deleted and we should return</span><br><span>               * immediately. */</span><br><span style="color: hsl(0, 100%, 40%);">-              if (gbproxy_flush_stored_messages(peer, msg, now, link_info) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+          if (gbproxy_flush_stored_messages(peer, now, link_info) < 0)</span><br><span>                      return 0;</span><br><span> </span><br><span>                gbproxy_reset_imsi_acquisition(link_info);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11893">change 11893</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/11893"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6716a260e12a3cf36af0501ce611c6c1e608f537 </div>
<div style="display:none"> Gerrit-Change-Number: 11893 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>