<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22559">View Change</a></p><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, 6 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/22559/1</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 854eccf..ba76c71 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -320,7 +320,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 priv_bind *priv, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static int backlog_enqueue_or_free(struct priv_bind *priv, 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>@@ -333,7 +333,7 @@</span><br><span>           /* enqueue Q.933 LMI at head of queue */</span><br><span>             llist_add(&msg->list, &priv->backlog.list);</span><br><span>            osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us);</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>    if (msgb_length(msg) < 3)</span><br><span>                 goto out_free;</span><br><span>@@ -343,11 +343,12 @@</span><br><span>               /* enqueue NS signaling traffic at tail of queue */</span><br><span>          llist_add_tail(&msg->list, &priv->backlog.list);</span><br><span>               osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us);</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> </span><br><span> out_free:</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>@@ -387,11 +388,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(priv, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                   return backlog_enqueue_or_free(priv, 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(priv, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+           return backlog_enqueue_or_free(priv, 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: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>