From f4d38e0a853e933a4da54fde8ec2711b5dc5b741 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Tue, 1 Aug 2017 23:14:33 +0200 Subject: treewide: reflect managed mode is related to RA Improve code readability by renaming managed into ra_managed and define the according ra_managed flags. This will help to better understand the ra_managed logic as defined in the README file. Signed-off-by: Hans Dedecker --- src/dhcpv6-ia.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/dhcpv6-ia.c') diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index 502373f..8bf42c8 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -36,7 +36,7 @@ #include #define ADDR_ENTRY_VALID_IA_ADDR(iface, i, m, addrs) \ - ((iface)->managed == RELAYD_MANAGED_NO_AFLAG || (i) == (m) || \ + ((iface)->ra_managed == RA_MANAGED_NO_AFLAG || (i) == (m) || \ (addrs)[(i)].prefix > 64) static void free_dhcpv6_assignment(struct dhcpv6_assignment *c); @@ -657,7 +657,8 @@ void dhcpv6_ia_preupdate(struct interface *iface) &iface->ia_assignments, struct dhcpv6_assignment, head); list_for_each_entry(c, &iface->ia_assignments, head) - if (c != border && !iface->managed && (c->flags & OAF_BOUND)) + if (c != border && iface->ra_managed == RA_MANAGED_NO_MFLAG + && (c->flags & OAF_BOUND)) apply_lease(iface, c, false); } -- cgit v1.2.3