<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22638">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: improve backlog handling on interface up/down<br><br>This patch improves the behavior of the newly-added backlog in<br>situations where the interface goes up/down.<br><br>* don't add new packets to the backlog while if_running == false<br>* flush the backlog on both ifup and ifdown events<br><br>Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9<br>---<br>M src/gb/gprs_ns2_fr.c<br>1 file changed, 35 insertions(+), 9 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 cae03ee..2662df6 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -376,6 +376,10 @@</span><br><span> priv->backlog.lmi_msg = msg;</span><br><span> return 0;</span><br><span> default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* there's no point in trying to enqueue messages if the interface is down */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!priv->if_running)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (msgb_length(msg) < 3)</span><br><span> break;</span><br><span> ns_pdu_type = msg->data[2];</span><br><span>@@ -559,6 +563,35 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void link_state_change(struct gprs_ns2_vc_bind *bind, bool if_running)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct priv_bind *bpriv = bind->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg, *msg2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bpriv->if_running == if_running)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGBIND(bind, LOGL_NOTICE, "FR net-device '%s': Physical link state changed: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bpriv->netif, if_running ? "UP" : "DOWN");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* free any backlog, both on IFUP and IFDOWN. Keep the LMI, as it makes</span><br><span style="color: hsl(120, 100%, 40%);">+ * sense to get one out of the door ASAP. */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(msg, msg2, &bpriv->backlog.list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (if_running) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* interface just came up */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bpriv->backlog.lmi_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&bpriv->backlog.timer, 0, bpriv->backlog.retry_us);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* interface just went down; no need to retransmit */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&bpriv->backlog.timer);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bpriv->if_running = if_running;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* handle a single netlink message received via libmnl */</span><br><span> static int linkmon_mnl_cb(const struct nlmsghdr *nlh, void *data)</span><br><span> {</span><br><span>@@ -586,15 +619,8 @@</span><br><span> if_running = !!(ifm->ifi_flags & IFF_RUNNING);</span><br><span> </span><br><span> bind = bind4netdev(nsi, ifname);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bind) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct priv_bind *bpriv = bind->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- if (bpriv->if_running != if_running) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* update running state */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGBIND(bind, LOGL_NOTICE, "FR net-device '%s': Physical link state changed: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ifname, if_running ? "UP" : "DOWN");</span><br><span style="color: hsl(0, 100%, 40%);">- bpriv->if_running = if_running;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind)</span><br><span style="color: hsl(120, 100%, 40%);">+ link_state_change(bind, if_running);</span><br><span> </span><br><span> return MNL_CB_OK;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22638">change 22638</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/+/22638"/><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: Ib35d099526544fe2cff64566fd56147a906adab9 </div>
<div style="display:none"> Gerrit-Change-Number: 22638 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>