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

Fix activating a stopped interface.

Browse Source
This commit is contained in:
Roy Marples 2016-02-04 21:51:10 +00:00
parent 598e6cc727
commit 2fbd190065
2 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
dhcp6.c
View File

@ -3131,16 +3131,44 @@ errexit:
}
static void
dhcp6_start1(void *arg)
dhcp6_activateinterfaces(struct interface *ifp)
{
struct interface *ifp = arg, *ifd;
struct if_options *ifo = ifp->options;
struct dhcp6_state *state;
struct interface *ifd;
size_t i, j;
const struct dhcp_compat *dhc;
struct if_ia *ia;
struct if_sla *sla;
for (i = 0; i < ifp->options->ia_len; i++) {
ia = &ifp->options->ia[i];
for (j = 0; j < ia->sla_len; j++) {
sla = &ia->sla[j];
ifd = if_find(ifp->ctx->ifaces, sla->ifname);
if (ifd == NULL) {
logger(ifp->ctx, LOG_WARNING,
"%s: cannot delegate to %s: %m",
ifp->name, sla->ifname);
continue;
}
if (!ifd->active) {
logger(ifp->ctx, LOG_INFO,
"%s: activating for delegation",
sla->ifname);
dhcpcd_activateinterface(ifd,
DHCPCD_IPV6 | DHCPCD_DHCP6);
}
}
}
}
static void
dhcp6_start1(void *arg)
{
struct interface *ifp = arg;
struct if_options *ifo = ifp->options;
struct dhcp6_state *state;
size_t i;
const struct dhcp_compat *dhc;
state = D6_STATE(ifp);
/* If no DHCPv6 options are configured,
match configured DHCPv4 options to DHCPv6 equivalents. */
@ -3171,28 +3199,7 @@ dhcp6_start1(void *arg)
dhcp6_startinit(ifp);
}
/* Activate any interfaces we need to */
/* Ensure we have all interfaces */
for (i = 0; i < ifo->ia_len; i++) {
ia = &ifo->ia[i];
for (j = 0; j < ia->sla_len; j++) {
sla = &ia->sla[j];
ifd = if_find(ifp->ctx->ifaces, sla->ifname);
if (ifd == NULL) {
logger(ifp->ctx, LOG_WARNING,
"%s: cannot delegate to %s: %m",
ifp->name, sla->ifname);
continue;
}
if (!ifd->active) {
logger(ifp->ctx, LOG_INFO,
"%s: activating for delegation",
sla->ifname);
dhcpcd_activateinterface(ifd,
DHCPCD_IPV6 | DHCPCD_DHCP6);
}
}
}
dhcp6_activateinterfaces(ifp);
}
int
@ -3219,6 +3226,7 @@ dhcp6_start(struct interface *ifp, enum DH6S init_state)
}
/* We're already running DHCP6 */
/* XXX: What if the managed flag vanishes from all RA? */
dhcp6_activateinterfaces(ifp);
return 0;
}

1
dhcpcd.c
View File

@ -425,6 +425,7 @@ stop_interface(struct interface *ifp)
/* De-activate the interface */
ifp->active = IF_INACTIVE;
ifp->options->options &= ~DHCPCD_STOPPING;
stop:
if (!(ctx->options & (DHCPCD_MASTER | DHCPCD_TEST)))