diff options
author | Hans Dedecker <dedeckeh@gmail.com> | 2017-09-06 14:51:09 +0200 |
---|---|---|
committer | Hans Dedecker <dedeckeh@gmail.com> | 2017-09-06 14:51:59 +0200 |
commit | f0e354befd6f787c1ed8ebc1ea514e9195f54433 (patch) | |
tree | 818dd223f8ba619995efb254eb04dbd59606c039 /src/dhcpv6-ia.c | |
parent | 1a313f9052e315571f42e9888d7bc8e443c5bb56 (diff) |
treewide: replace RELAYD prefix naming in macros
Remove the unfortunate RELAYD naming in the different macros
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'src/dhcpv6-ia.c')
-rw-r--r-- | src/dhcpv6-ia.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index 04d92fe..bd4342b 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -64,7 +64,7 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable) } } - if (enable && iface->dhcpv6 == RELAYD_SERVER) { + if (enable && iface->dhcpv6 == MODE_SERVER) { if (!iface->ia_assignments.next) INIT_LIST_HEAD(&iface->ia_assignments); @@ -347,11 +347,11 @@ void dhcpv6_write_statefile(void) ctxt.buf_len = sizeof(leasebuf); list_for_each_entry(ctxt.iface, &interfaces, head) { - if (ctxt.iface->dhcpv6 != RELAYD_SERVER && - ctxt.iface->dhcpv4 != RELAYD_SERVER) + if (ctxt.iface->dhcpv6 != MODE_SERVER && + ctxt.iface->dhcpv4 != MODE_SERVER) continue; - if (ctxt.iface->dhcpv6 == RELAYD_SERVER && + if (ctxt.iface->dhcpv6 == MODE_SERVER && ctxt.iface->ia_assignments.next) { list_for_each_entry(ctxt.c, &ctxt.iface->ia_assignments, head) { if (!(ctxt.c->flags & OAF_BOUND) || ctxt.c->managed_size < 0) @@ -379,7 +379,7 @@ void dhcpv6_write_statefile(void) } } - if (ctxt.iface->dhcpv4 == RELAYD_SERVER && + if (ctxt.iface->dhcpv4 == MODE_SERVER && ctxt.iface->dhcpv4_assignments.next) { struct dhcpv4_assignment *c; list_for_each_entry(c, &ctxt.iface->dhcpv4_assignments, head) { @@ -657,7 +657,7 @@ static bool assign_na(struct interface *iface, struct dhcpv6_assignment *assign) void dhcpv6_ia_preupdate(struct interface *iface) { - if (iface->dhcpv6 != RELAYD_SERVER) + if (iface->dhcpv6 != MODE_SERVER) return; struct dhcpv6_assignment *c, *border = list_last_entry( @@ -701,7 +701,7 @@ static void stop_reconf(struct dhcpv6_assignment *a) void dhcpv6_ia_postupdate(struct interface *iface) { - if (iface->dhcpv6 != RELAYD_SERVER) + if (iface->dhcpv6 != MODE_SERVER) return; time_t now = odhcpd_time(); @@ -762,7 +762,7 @@ static void valid_until_cb(struct uloop_timeout *event) time_t now = odhcpd_time(); struct interface *iface; list_for_each_entry(iface, &interfaces, head) { - if (iface->dhcpv6 != RELAYD_SERVER || iface->ia_assignments.next == NULL) + if (iface->dhcpv6 != MODE_SERVER || iface->ia_assignments.next == NULL) continue; struct dhcpv6_assignment *a, *n; |