<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9508">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc-nat: forward_sccp_to_msc: Remove unneeded exit3 section<br><br>exit3 is the same as exit2 with the addition of calling<br>bsc_send_con_refuse(). Since exit3 path is only followed once, it's<br>easier to call bsc_send_con_refuse() on that code path and remove exit3<br>entirely in order to simplify the function.<br><br>Change-Id: I2ba0aeca1ee0fffd75019bfba37907f0b8015066<br>---<br>M openbsc/src/osmo-bsc_nat/bsc_nat.c<br>1 file changed, 3 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/08/9508/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>index b8cbb11..928dd4c 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>@@ -1142,7 +1142,9 @@</span><br><span>                          if (imsi)</span><br><span>                                    bsc_nat_inform_reject(bsc, imsi);</span><br><span>                            bsc_stat_reject(filter, bsc, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-                                goto exit3;</span><br><span style="color: hsl(120, 100%, 40%);">+                           /* send a SCCP Connection Refused */</span><br><span style="color: hsl(120, 100%, 40%);">+                          bsc_send_con_refuse(bsc, parsed, con_type, &cause);</span><br><span style="color: hsl(120, 100%, 40%);">+                               goto exit2;</span><br><span>                  }</span><br><span> </span><br><span>                        if (!create_sccp_src_ref(bsc, parsed))</span><br><span>@@ -1285,15 +1287,6 @@</span><br><span>      talloc_free(parsed);</span><br><span>         msgb_free(msg);</span><br><span>      return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exit3:</span><br><span style="color: hsl(0, 100%, 40%);">-        /* send a SCCP Connection Refused */</span><br><span style="color: hsl(0, 100%, 40%);">-    if (imsi)</span><br><span style="color: hsl(0, 100%, 40%);">-               talloc_free(imsi);</span><br><span style="color: hsl(0, 100%, 40%);">-      bsc_send_con_refuse(bsc, parsed, con_type, &cause);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(parsed);</span><br><span style="color: hsl(0, 100%, 40%);">-    msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span> }</span><br><span> </span><br><span> static int ipaccess_bsc_read_cb(struct osmo_fd *bfd)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9508">change 9508</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/9508"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2ba0aeca1ee0fffd75019bfba37907f0b8015066 </div>
<div style="display:none"> Gerrit-Change-Number: 9508 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>