return 0;
}
-int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
+int dhcpv6_setup_ia_interface(struct interface *iface, bool enable)
{
if (!enable && iface->ia_assignments.next) {
struct dhcpv6_assignment *c;
}
}
- if (enable && iface->dhcpv6 == RELAYD_SERVER) {
+ if (enable && iface->dhcpv6 == MODE_SERVER) {
if (!iface->ia_assignments.next)
INIT_LIST_HEAD(&iface->ia_assignments);
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)
}
}
- 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) {
(c->valid_until > now ?
(c->valid_until - now + wall_time) :
(INFINITE_VALID(c->valid_until) ? -1 : 0)),
- c->addr);
+ ntohl(c->addr));
- struct in_addr addr = {htonl(c->addr)};
+ struct in_addr addr = {.s_addr = c->addr};
inet_ntop(AF_INET, &addr, ipbuf, sizeof(ipbuf) - 1);
if (c->hostname) {
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(
void dhcpv6_ia_postupdate(struct interface *iface)
{
- if (iface->dhcpv6 != RELAYD_SERVER)
+ if (iface->dhcpv6 != MODE_SERVER)
return;
time_t now = odhcpd_time();
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;