diff options
| author | Denys Fedoryshchenko <denys.f@collabora.com> | 2026-08-08 23:17:46 +0300 |
|---|---|---|
| committer | Denys Fedoryshchenko <denys.f@collabora.com> | 2026-08-08 23:17:46 +0300 |
| commit | fc465210fb77af7d6a12780f3f256d17be2ce480 (patch) | |
| tree | 8dc9753dce6f872c79092f0fd93022a5f7d385e2 | |
| parent | 60702f40ac55d474ce26bd8e1d904feb9e5f160f (diff) | |
| download | accel-ppp-fc465210fb77af7d6a12780f3f256d17be2ce480.tar.gz accel-ppp-fc465210fb77af7d6a12780f3f256d17be2ce480.zip | |
fixup! ipoe: flush sessions left by a previous instance with a single command
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe_netlink.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe_netlink.c b/accel-pppd/ctrl/ipoe/ipoe_netlink.c index 6eee2dca..d611c5f9 100644 --- a/accel-pppd/ctrl/ipoe/ipoe_netlink.c +++ b/accel-pppd/ctrl/ipoe/ipoe_netlink.c @@ -465,8 +465,7 @@ int ipoe_nl_flush_sessions(void) if (rtnl_open_byproto(&rth, 0, NETLINK_GENERIC)) { log_error("ipoe: cannot open generic netlink socket\n"); - errno = EIO; - return -1; + return -EIO; } memset(&req, 0, sizeof(req)); @@ -480,7 +479,7 @@ int ipoe_nl_flush_sessions(void) ghdr->cmd = IPOE_CMD_FLUSH; if (rtnl_talk(&rth, nlh, 0, 0, nlh, NULL, NULL, 0) < 0) - ret = -1; + ret = errno ? -errno : -EIO; rtnl_close(&rth); @@ -540,10 +539,12 @@ static void delete_sessions() static void flush_sessions() { - if (!ipoe_nl_flush_sessions()) + int r = ipoe_nl_flush_sessions(); + + if (!r) return; - if (errno == EOPNOTSUPP) { + if (r == -EOPNOTSUPP) { log_warn("ipoe: loaded ipoe module does not support IPOE_CMD_FLUSH," " removing sessions one by one, reload the module to fix\n"); delete_sessions(); @@ -551,7 +552,7 @@ static void flush_sessions() } log_error("ipoe: failed to remove sessions left by a previous instance:" - " %s\n", strerror(errno)); + " %s\n", strerror(-r)); } static void ipoe_up_handler(const struct sockaddr_nl *addr, struct nlmsghdr *h) |