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

BSD: Use SIOCGIFDATA if no media support and no ifa_data

Browse Source 
Hopefully this nails link state once and for all on BSD.
This commit is contained in:
Roy Marples 2020-09-22 21:53:13 +01:00
parent 0ede9e5419
commit 12b2bece4e
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/if-bsd.c
View File

@ -359,8 +359,8 @@ if_ignore(struct dhcpcd_ctx *ctx, const char *ifname)
#endif
}
int
if_carrier(struct interface *ifp)
static int
if_carrier0(struct interface *ifp)
{
struct ifmediareq ifmr = { .ifm_status = 0 };
@ -378,10 +378,34 @@ if_carrier(struct interface *ifp)
return (ifmr.ifm_status & IFM_ACTIVE) ? LINK_UP : LINK_DOWN;
}
int
if_carrier(struct interface *ifp)
{
int carrier = if_carrier0(ifp);
struct ifdatareq ifdr = { .ifdr_data.ifi_link_state = 0 };
struct if_data *ifdata;
if (carrier != LINK_UNKNOWN)
return carrier;
strlcpy(ifdr.ifdr_name, ifp->name, sizeof(ifdr.ifdr_name));
if (ioctl(ifp->ctx->pf_inet_fd, SIOCGIFDATA, &ifdr) == -1)
return LINK_UNKNOWN;
ifdata = &ifdr.ifdr_data;
switch (ifdata->ifi_link_state) {
case LINK_STATE_DOWN:
return LINK_DOWN;
case LINK_STATE_UP:
return LINK_UP;
}
return LINK_UNKNOWN;
}
int
if_carrier_ifadata(struct interface *ifp, void *ifadata)
{
int carrier = if_carrier(ifp);
int carrier = if_carrier0(ifp);
struct if_data *ifdata;
if (carrier != LINK_UNKNOWN || ifadata == NULL)