mirrors/dhcpcd
0
0
Fork 0
mirror of https://github.com/rsmarples/dhcpcd.git synced 2024-11-24 02:24:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

linux: consider IFF_LOWER_UP and !IFF_DORMANT for LINK_UP

Browse Source
This commit is contained in:
Roy Marples 2023-07-17 23:48:18 +01:00
parent 13cce2c82e
commit 4f5c4999b6
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/if-linux.c
View File

@ -60,6 +60,9 @@
#include <linux/if_arp.h>
#endif
/* Inlcude this *after* net/if.h so we get IFF_DORMANT */
#include <linux/if.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
@ -525,11 +528,25 @@ if_setmac(struct interface *ifp, void *mac, uint8_t maclen)
return if_ioctl(ifp->ctx, SIOCSIFHWADDR, &ifr, sizeof(ifr));
}
static int if_carrier_from_flags(unsigned int flags)
{
#ifdef IFF_LOWER_UP
return ((flags & (IFF_LOWER_UP | IFF_RUNNING)) ==
(IFF_LOWER_UP | IFF_RUNNING))
#ifdef IFF_DORMANT
&& !(flags & IFF_DORMANT)
#endif
? LINK_UP : LINK_DOWN;
#else
return flags & IFF_RUNNING ? LINK_UP : LINK_DOWN;
#endif
}
int
if_carrier(struct interface *ifp, __unused const void *ifadata)
{
return ifp->flags & IFF_RUNNING ? LINK_UP : LINK_DOWN;
return if_carrier_from_flags(ifp->flags);
}
bool
@ -1047,7 +1064,7 @@ link_netlink(struct dhcpcd_ctx *ctx, void *arg, struct nlmsghdr *nlm)
}
dhcpcd_handlecarrier(ifp,
ifi->ifi_flags & IFF_RUNNING ? LINK_UP : LINK_DOWN,
if_carrier_from_flags(ifi->ifi_flags),
ifi->ifi_flags);
return 0;
}