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

Callout to handlecarrier when we don't have real carrier support

Browse Source 
and rely on looking at IFF_UP and IFF_RUNNING.
This allows our hooks to know that dhcpcd thinks we have a carrier or not.
This commit is contained in:
Roy Marples 2014-10-06 12:34:59 +00:00
parent 1a6f4eed08
commit f9f9bc4a4e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dhcpcd.c
View File

@ -646,7 +646,6 @@ dhcpcd_startinterface(void *arg)
syslog(LOG_ERR, "%s: if_up: %m", ifp->name);
if (ifo->options & DHCPCD_LINK) {
link_retry:
switch (ifp->carrier) {
case LINK_UP:
break;
@ -660,9 +659,13 @@ link_retry:
* as we've done the best we can to bring the interface
* up at this point. */
ifp->carrier = if_carrier(ifp);
if (ifp->carrier != LINK_UNKNOWN)
goto link_retry;
syslog(LOG_INFO, "%s: unknown carrier", ifp->name);
if (ifp->carrier == LINK_UNKNOWN) {
syslog(LOG_INFO, "%s: unknown carrier",
ifp->name);
return;
}
dhcpcd_handlecarrier(ifp->ctx, ifp->carrier,
ifp->flags, ifp->name);
return;
}
}
@ -1618,8 +1621,8 @@ main(int argc, char **argv)
ctx.options |= DHCPCD_WAITIP;
/* RTM_NEWADDR goes through the link socket as well which we
* need for IPv6 DAD, so we check for DHCPCD_LINK in handle_carrier
* instead.
* need for IPv6 DAD, so we check for DHCPCD_LINK in
* dhcpcd_handlecarrier instead.
* We also need to open this before checking for interfaces below
* so that we pickup any new addresses during the discover phase. */
ctx.link_fd = if_openlinksocket();