summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Kelley <simon@thekelleys.org.uk>2012-12-02 12:17:35 +0000
committerSimon Kelley <simon@thekelleys.org.uk>2012-12-02 12:17:35 +0000
commit421594f83ddcfcb2ac4fc91eb8b06f7596bb4e44 (patch)
treec678bb20f4a7bf7cf8b33eab9213c0f0c7e5eb74
parentd89fb4ed4fedb1d79900eb62ac66f4efbcad6a0f (diff)
downloaddnsmasq-421594f83ddcfcb2ac4fc91eb8b06f7596bb4e44.tar.gz
Forgot --dhcp-except check in previous commit.
-rw-r--r--src/radv.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/radv.c b/src/radv.c
index 8ab0c42..90678a4 100644
--- a/src/radv.c
+++ b/src/radv.c
@@ -484,12 +484,18 @@ time_t periodic_ra(time_t now)
context->ra_time = 0;
else if (indextoname(daemon->icmp6fd, param.iface, interface) &&
iface_check(AF_LOCAL, NULL, interface))
- send_ra(param.iface, interface, NULL);
- }
-
+ {
+ struct iname *tmp;
+ for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
+ if (tmp->name && (strcmp(tmp->name, interface) == 0))
+ break;
+ if (!tmp)
+ send_ra(param.iface, interface, NULL);
+ }
+ }
return next_event;
}
-
+
static int iface_search(struct in6_addr *local, int prefix,
int scope, int if_index, int dad, void *vparam)
{