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

Disable IP address waiting for pseudo interfaces, fixes [1972d664c2].

Browse Source
This commit is contained in:
Roy Marples 2015-05-31 08:19:34 +00:00
parent 6ccf11d2b8
commit c025e90b1f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dhcpcd.c
View File

@ -407,20 +407,22 @@ configure_interface1(struct interface *ifp)
if (ifo->metric != -1) if (ifo->metric != -1)
ifp->metric = (unsigned int)ifo->metric; ifp->metric = (unsigned int)ifo->metric;
/* If we're a psuedo interface, ensure we disable as much as we can */
if (ifp->options->options & DHCPCD_PFXDLGONLY)
ifp->options->options &=
~(DHCPCD_IPV4 | DHCPCD_IPV6RS | DHCPCD_WAITIP | DHCPCD_WAITIP6);
if (!(ifo->options & DHCPCD_IPV4)) if (!(ifo->options & DHCPCD_IPV4))
ifo->options &= ~(DHCPCD_DHCP | DHCPCD_IPV4LL); ifo->options &= ~(DHCPCD_DHCP | DHCPCD_IPV4LL | DHCPCD_WAITIP4);
if (!(ifo->options & DHCPCD_IPV6)) if (!(ifo->options & DHCPCD_IPV6))
ifo->options &= ~(DHCPCD_IPV6RS | DHCPCD_DHCP6); ifo->options &=
~(DHCPCD_IPV6RS | DHCPCD_DHCP6 | DHCPCD_WAITIP6);
if (ifo->options & DHCPCD_SLAACPRIVATE && if (ifo->options & DHCPCD_SLAACPRIVATE &&
!(ifp->ctx->options & (DHCPCD_DUMPLEASE | DHCPCD_TEST))) !(ifp->ctx->options & (DHCPCD_DUMPLEASE | DHCPCD_TEST)))
ifo->options |= DHCPCD_IPV6RA_OWN; ifo->options |= DHCPCD_IPV6RA_OWN;
/* If we're a psuedo interface, ensure we disable as much as we can */
if (ifp->options->options & DHCPCD_PFXDLGONLY)
ifp->options->options &= ~(DHCPCD_IPV4 | DHCPCD_IPV6RS);
/* We want to disable kernel interface RA as early as possible. */ /* We want to disable kernel interface RA as early as possible. */
if (ifo->options & DHCPCD_IPV6RS && if (ifo->options & DHCPCD_IPV6RS &&
!(ifp->ctx->options & DHCPCD_DUMPLEASE)) !(ifp->ctx->options & DHCPCD_DUMPLEASE))