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