<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20270">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  daniel: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: refactor handle_nsip_read/handle_nsfrgre_read<br><br>Might be more readable.<br><br>Change-Id: Ib2dbcae55a8c7a973cfa1123784f509708de7f3b<br>---<br>M src/gb/gprs_ns2_frgre.c<br>M src/gb/gprs_ns2_udp.c<br>2 files changed, 6 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c</span><br><span>index 0903e46..e2e0b29 100644</span><br><span>--- a/src/gb/gprs_ns2_frgre.c</span><br><span>+++ b/src/gb/gprs_ns2_frgre.c</span><br><span>@@ -446,12 +446,11 @@</span><br><span>          rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);</span><br><span>            switch (rc) {</span><br><span>                case GPRS_NS2_CS_FOUND:</span><br><span style="color: hsl(0, 100%, 40%);">-                 rc = ns2_recv_vc(nsvc, msg);</span><br><span>                         break;</span><br><span>               case GPRS_NS2_CS_ERROR:</span><br><span>              case GPRS_NS2_CS_SKIPPED:</span><br><span>                    rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                 break;</span><br><span style="color: hsl(120, 100%, 40%);">+                        goto out;</span><br><span>            case GPRS_NS2_CS_REJECTED:</span><br><span>                   /* nsip_sendmsg will free reject */</span><br><span>                  frgre_sendmsg(bind, reject, &saddr);</span><br><span>@@ -459,13 +458,11 @@</span><br><span>             case GPRS_NS2_CS_CREATED:</span><br><span>                    frgre_alloc_vc(bind, nsvc, &saddr, dlci);</span><br><span>                        gprs_ns2_vc_fsm_start(nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">-                    rc = ns2_recv_vc(nsvc, msg);</span><br><span>                         break;</span><br><span>               }</span><br><span style="color: hsl(0, 100%, 40%);">-       } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                /* VC found */</span><br><span style="color: hsl(0, 100%, 40%);">-          rc = ns2_recv_vc(nsvc, msg);</span><br><span>         }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   rc = ns2_recv_vc(nsvc, msg);</span><br><span> out:</span><br><span>         msgb_free(msg);</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 2f55f2a..bda0acf 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -195,12 +195,11 @@</span><br><span>                 rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);</span><br><span>            switch (rc) {</span><br><span>                case GPRS_NS2_CS_FOUND:</span><br><span style="color: hsl(0, 100%, 40%);">-                 rc = ns2_recv_vc(nsvc, msg);</span><br><span>                         break;</span><br><span>               case GPRS_NS2_CS_ERROR:</span><br><span>              case GPRS_NS2_CS_SKIPPED:</span><br><span>                    rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                 break;</span><br><span style="color: hsl(120, 100%, 40%);">+                        goto out;</span><br><span>            case GPRS_NS2_CS_REJECTED:</span><br><span>                   /* nsip_sendmsg will free reject */</span><br><span>                  nsip_sendmsg(bind, reject, &saddr);</span><br><span>@@ -208,14 +207,12 @@</span><br><span>              case GPRS_NS2_CS_CREATED:</span><br><span>                    ns2_driver_alloc_vc(bind, nsvc, &saddr);</span><br><span>                         gprs_ns2_vc_fsm_start(nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">-                    rc = ns2_recv_vc(nsvc, msg);</span><br><span>                         break;</span><br><span>               }</span><br><span style="color: hsl(0, 100%, 40%);">-       } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                /* VC found */</span><br><span style="color: hsl(0, 100%, 40%);">-          rc = ns2_recv_vc(nsvc, msg);</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ns2_recv_vc(nsvc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+out:</span><br><span>   msgb_free(msg);</span><br><span> </span><br><span>  return rc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20270">change 20270</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/c/libosmocore/+/20270"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib2dbcae55a8c7a973cfa1123784f509708de7f3b </div>
<div style="display:none"> Gerrit-Change-Number: 20270 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>