<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22637">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: Don't queie Q.933 LMI messages; only store most recent ones<br><br>There's not really any point in storing multiple LMI messages,<br>and then transmitting them in inverse order, as the existing code<br>does. Instead, we shall store only the last (failed) LMI message<br>and try to transmit that at highest priority, before any NS messages<br>in the actual queue.<br><br>Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593<br>---<br>M src/gb/gprs_ns2_fr.c<br>1 file changed, 18 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/22637/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 fc6a5c4..24cc312 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -105,7 +105,9 @@</span><br><span> struct {</span><br><span> /* file-descriptor for AF_PACKET socket */</span><br><span> struct osmo_fd ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- /* list of msgb (backlog) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* LMI bucket (we only store the last LMI message, no need to queue */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *lmi_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* list of NS msgb (backlog) */</span><br><span> struct llist_head list;</span><br><span> /* timer to trigger next attempt of AF_PACKET write */</span><br><span> struct osmo_timer_list timer;</span><br><span>@@ -173,6 +175,7 @@</span><br><span> llist_for_each_entry_safe(msg, msg2, &priv->backlog.list, list) {</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(priv->backlog.lmi_msg);</span><br><span> </span><br><span> osmo_fr_link_free(priv->link);</span><br><span> osmo_fd_close(&priv->backlog.ofd);</span><br><span>@@ -357,6 +360,7 @@</span><br><span> /* enqueue to backlog (LMI, signaling) or drop (userdata msg) */</span><br><span> static int backlog_enqueue_or_free(struct gprs_ns2_vc_bind *bind, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct priv_bind *priv = bind->priv;</span><br><span> uint8_t dlci = msg->data[0];</span><br><span> uint8_t ns_pdu_type;</span><br><span> uint16_t bvci;</span><br><span>@@ -367,8 +371,9 @@</span><br><span> /* we want to enqueue only Q.933 LMI traffic or NS signaling; NOT user traffic */</span><br><span> switch (dlci) {</span><br><span> case LMI_Q933A_DLCI:</span><br><span style="color: hsl(0, 100%, 40%);">- /* enqueue Q.933 LMI at head of queue */</span><br><span style="color: hsl(0, 100%, 40%);">- enqueue_at_head(bind, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* always store only the last LMI message in the lmi_msg bucket */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(priv->backlog.lmi_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->backlog.lmi_msg = msg;</span><br><span> return 0;</span><br><span> default:</span><br><span> if (msgb_length(msg) < 3)</span><br><span>@@ -405,6 +410,15 @@</span><br><span> struct priv_bind *priv = bind->priv;</span><br><span> int i, rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* first try to get rid of the LMI message, if any */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->backlog.lmi_msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = fr_netif_write_one(bind, priv->backlog.lmi_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto restart_timer;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* fr_netif_write_one() has just free'd it */</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->backlog.lmi_msg = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* attempt to send up to 10 messages in every timer */</span><br><span> for (i = 0; i < 10; i++) {</span><br><span> struct msgb *msg = msgb_dequeue(&priv->backlog.list);</span><br><span>@@ -420,6 +434,7 @@</span><br><span> osmo_stat_item_dec(bind->statg->items[NS2_BIND_STAT_BACKLOG_LEN], 1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+restart_timer:</span><br><span> /* re-start timer if we still have data in the queue */</span><br><span> if (!llist_empty(&priv->backlog.list))</span><br><span> osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22637">change 22637</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/+/22637"/><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: I5407a76a34d7e687966fe1a915febf3a87256593 </div>
<div style="display:none"> Gerrit-Change-Number: 22637 </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>