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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: Properly report packet drops in FR code<br><br>When the FR code decides to drop a packet (ENOBUFS from the AF_PACKET<br>socket for non-signaling packet), let's report that back via the<br>frame_relay code into the generic NS2 code.<br><br>This way the generic NS2 code always knows if a packet was actually<br>successfully  transmitted, or if it was dropped for some reason.<br><br>Change-Id: I4bb517fd04af69dbe6da628b132d57994ab3e5a4<br>---<br>M src/gb/gprs_ns2_fr.c<br>1 file changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index 4bd9ff1..9de2b06 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -340,7 +340,7 @@</span><br><span> #define LMI_Q933A_DLCI 0</span><br><span> </span><br><span> /* enqueue to backlog (LMI, signaling) or drop (userdata msg) */</span><br><span style="color: hsl(0, 100%, 40%);">-static void backlog_enqueue_or_free(struct gprs_ns2_vc_bind *bind, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static int backlog_enqueue_or_free(struct gprs_ns2_vc_bind *bind, struct msgb *msg)</span><br><span> {</span><br><span>        uint8_t dlci = msg->data[0];</span><br><span>      uint8_t ns_pdu_type;</span><br><span>@@ -354,7 +354,7 @@</span><br><span>   case LMI_Q933A_DLCI:</span><br><span>                 /* enqueue Q.933 LMI at head of queue */</span><br><span>             enqueue_at_head(bind, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-             return;</span><br><span style="color: hsl(120, 100%, 40%);">+               return 0;</span><br><span>    default:</span><br><span>             if (msgb_length(msg) < 3)</span><br><span>                         break;</span><br><span>@@ -367,13 +367,13 @@</span><br><span>                       /* enqueue BVCI=0 traffic at tail of queue */</span><br><span>                        if (bvci == BVCI_SIGNALLING) {</span><br><span>                               enqueue_at_tail(bind, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-                             return;</span><br><span style="color: hsl(120, 100%, 40%);">+                               return 0;</span><br><span>                    }</span><br><span>                    break;</span><br><span>               default:</span><br><span>                     /* enqueue NS signaling traffic at head of queue */</span><br><span>                  enqueue_at_head(bind, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-                     return;</span><br><span style="color: hsl(120, 100%, 40%);">+                       return 0;</span><br><span>            }</span><br><span>            break;</span><br><span>       }</span><br><span>@@ -381,6 +381,7 @@</span><br><span> out_free:</span><br><span>         /* drop everything that is not LMI, NS-signaling or BVCI-0 */</span><br><span>        msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+       return -1;</span><br><span> }</span><br><span> </span><br><span> static void fr_backlog_timer_cb(void *data)</span><br><span>@@ -420,11 +421,11 @@</span><br><span>           rc = fr_netif_write_one(bind, msg);</span><br><span>          if (rc < 0) {</span><br><span>                     /* enqueue to backlog in case it fails */</span><br><span style="color: hsl(0, 100%, 40%);">-                       backlog_enqueue_or_free(bind, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                   return backlog_enqueue_or_free(bind, msg);</span><br><span>           }</span><br><span>    } else {</span><br><span>             /* enqueue to backlog */</span><br><span style="color: hsl(0, 100%, 40%);">-                backlog_enqueue_or_free(bind, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+           return backlog_enqueue_or_free(bind, msg);</span><br><span>   }</span><br><span> </span><br><span>        return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22559">change 22559</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/+/22559"/><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: I4bb517fd04af69dbe6da628b132d57994ab3e5a4 </div>
<div style="display:none"> Gerrit-Change-Number: 22559 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>