IFACE_ATTR_DNS,
IFACE_ATTR_DOMAIN,
IFACE_ATTR_FILTER_CLASS,
+ IFACE_ATTR_DHCPV4_FORCERECONF,
IFACE_ATTR_DHCPV6_RAW,
IFACE_ATTR_DHCPV6_ASSIGNALL,
IFACE_ATTR_RA_DEFAULT,
[IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
[IFACE_ATTR_DOMAIN] = { .name = "domain", .type = BLOBMSG_TYPE_ARRAY },
[IFACE_ATTR_FILTER_CLASS] = { .name = "filter_class", .type = BLOBMSG_TYPE_STRING },
+ [IFACE_ATTR_DHCPV4_FORCERECONF] = { .name = "dhcpv4_forcereconf", .type = BLOBMSG_TYPE_BOOL },
[IFACE_ATTR_DHCPV6_RAW] = { .name = "dhcpv6_raw", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_DHCPV6_ASSIGNALL] = { .name ="dhcpv6_assignall", .type = BLOBMSG_TYPE_BOOL },
[IFACE_ATTR_PD_MANAGER] = { .name = "pd_manager", .type = BLOBMSG_TYPE_STRING },
if (iface->head.next)
list_del(&iface->head);
- setup_router_interface(iface, false);
- setup_dhcpv6_interface(iface, false);
- setup_ndp_interface(iface, false);
- setup_dhcpv4_interface(iface, false);
+ router_setup_interface(iface, false);
+ dhcpv6_setup_interface(iface, false);
+ ndp_setup_interface(iface, false);
+#ifdef DHCPV4_SUPPORT
+ dhcpv4_setup_interface(iface, false);
+#endif
clean_interface(iface);
free(iface->addr4);
- free(iface->ia_addr);
+ free(iface->addr6);
free(iface->ifname);
free(iface);
}
static int parse_mode(const char *mode)
{
if (!strcmp(mode, "disabled"))
- return RELAYD_DISABLED;
+ return MODE_DISABLED;
else if (!strcmp(mode, "server"))
- return RELAYD_SERVER;
+ return MODE_SERVER;
else if (!strcmp(mode, "relay"))
- return RELAYD_RELAY;
+ return MODE_RELAY;
else if (!strcmp(mode, "hybrid"))
- return RELAYD_HYBRID;
+ return MODE_HYBRID;
else
return -1;
}
if (!iface->ifname)
goto err;
- }
- if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
- goto err;
+ if (!iface->ifindex &&
+ (iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
+ goto err;
+ }
if (get_addrs) {
- ssize_t len = odhcpd_get_interface_addresses(iface->ifindex,
- true, &iface->ia_addr);
+ ssize_t len = netlink_get_interface_addrs(iface->ifindex,
+ true, &iface->addr6);
if (len > 0)
- iface->ia_addr_len = len;
+ iface->addr6_len = len;
- len = odhcpd_get_interface_addresses(iface->ifindex,
+ len = netlink_get_interface_addrs(iface->ifindex,
false, &iface->addr4);
if (len > 0)
iface->addr4_len = len;
iface->dhcpv4_start.s_addr = htonl(blobmsg_get_u32(c));
if (config.main_dhcpv4 && config.legacy)
- iface->dhcpv4 = RELAYD_SERVER;
+ iface->dhcpv4 = MODE_SERVER;
}
if ((c = tb[IFACE_ATTR_LIMIT]))
memcpy(iface->filter_class, blobmsg_get_string(c), blobmsg_data_len(c) + 1);
}
+ if ((c = tb[IFACE_ATTR_DHCPV4_FORCERECONF]))
+ iface->dhcpv4_forcereconf = blobmsg_get_bool(c);
+
if ((c = tb[IFACE_ATTR_DHCPV6_RAW])) {
iface->dhcpv6_raw_len = blobmsg_data_len(c) / 2;
iface->dhcpv6_raw = realloc(iface->dhcpv6_raw, iface->dhcpv6_raw_len);
if (i->master)
continue;
- if (i->dhcpv6 == RELAYD_HYBRID || i->dhcpv6 == RELAYD_RELAY)
+ if (i->dhcpv6 == MODE_HYBRID || i->dhcpv6 == MODE_RELAY)
any_dhcpv6_slave = true;
- if (i->ra == RELAYD_HYBRID || i->ra == RELAYD_RELAY)
+ if (i->ra == MODE_HYBRID || i->ra == MODE_RELAY)
any_ra_slave = true;
- if (i->ndp == RELAYD_HYBRID || i->ndp == RELAYD_RELAY)
+ if (i->ndp == MODE_HYBRID || i->ndp == MODE_RELAY)
any_ndp_slave = true;
}
if (!i->master)
continue;
- enum odhcpd_mode hybrid_mode = RELAYD_DISABLED;
+ enum odhcpd_mode hybrid_mode = MODE_DISABLED;
#ifdef WITH_UBUS
if (!ubus_has_prefix(i->name, i->ifname))
- hybrid_mode = RELAYD_RELAY;
+ hybrid_mode = MODE_RELAY;
#endif
- if (i->dhcpv6 == RELAYD_HYBRID)
+ if (i->dhcpv6 == MODE_HYBRID)
i->dhcpv6 = hybrid_mode;
- if (i->dhcpv6 == RELAYD_RELAY && !any_dhcpv6_slave)
- i->dhcpv6 = RELAYD_DISABLED;
+ if (i->dhcpv6 == MODE_RELAY && !any_dhcpv6_slave)
+ i->dhcpv6 = MODE_DISABLED;
- if (i->ra == RELAYD_HYBRID)
+ if (i->ra == MODE_HYBRID)
i->ra = hybrid_mode;
- if (i->ra == RELAYD_RELAY && !any_ra_slave)
- i->ra = RELAYD_DISABLED;
+ if (i->ra == MODE_RELAY && !any_ra_slave)
+ i->ra = MODE_DISABLED;
- if (i->ndp == RELAYD_HYBRID)
+ if (i->ndp == MODE_HYBRID)
i->ndp = hybrid_mode;
- if (i->ndp == RELAYD_RELAY && !any_ndp_slave)
- i->ndp = RELAYD_DISABLED;
+ if (i->ndp == MODE_RELAY && !any_ndp_slave)
+ i->ndp = MODE_DISABLED;
- if (i->dhcpv6 == RELAYD_RELAY || i->ra == RELAYD_RELAY || i->ndp == RELAYD_RELAY)
+ if (i->dhcpv6 == MODE_RELAY || i->ra == MODE_RELAY || i->ndp == MODE_RELAY)
master = i;
}
list_for_each_entry_safe(i, n, &interfaces, head) {
if (i->inuse) {
/* Resolve hybrid mode */
- if (i->dhcpv6 == RELAYD_HYBRID)
- i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
- RELAYD_RELAY : RELAYD_SERVER;
-
- if (i->ra == RELAYD_HYBRID)
- i->ra = (master && master->ra == RELAYD_RELAY) ?
- RELAYD_RELAY : RELAYD_SERVER;
-
- if (i->ndp == RELAYD_HYBRID)
- i->ndp = (master && master->ndp == RELAYD_RELAY) ?
- RELAYD_RELAY : RELAYD_DISABLED;
-
- setup_router_interface(i, !i->ignore || i->ra != RELAYD_DISABLED);
- setup_dhcpv6_interface(i, !i->ignore || i->dhcpv6 != RELAYD_DISABLED);
- setup_ndp_interface(i, !i->ignore || i->ndp != RELAYD_DISABLED);
- setup_dhcpv4_interface(i, !i->ignore || i->dhcpv4 != RELAYD_DISABLED);
+ if (i->dhcpv6 == MODE_HYBRID)
+ i->dhcpv6 = (master && master->dhcpv6 == MODE_RELAY) ?
+ MODE_RELAY : MODE_SERVER;
+
+ if (i->ra == MODE_HYBRID)
+ i->ra = (master && master->ra == MODE_RELAY) ?
+ MODE_RELAY : MODE_SERVER;
+
+ if (i->ndp == MODE_HYBRID)
+ i->ndp = (master && master->ndp == MODE_RELAY) ?
+ MODE_RELAY : MODE_DISABLED;
+
+ router_setup_interface(i, !i->ignore || i->ra != MODE_DISABLED);
+ dhcpv6_setup_interface(i, !i->ignore || i->dhcpv6 != MODE_DISABLED);
+ ndp_setup_interface(i, !i->ignore || i->ndp != MODE_DISABLED);
+#ifdef DHCPV4_SUPPORT
+ dhcpv4_setup_interface(i, !i->ignore || i->dhcpv4 != MODE_DISABLED);
+#endif
} else
close_interface(i);
}
signal(SIGHUP, handle_signal);
#ifdef WITH_UBUS
- while (init_ubus())
+ while (ubus_init())
sleep(1);
#endif
projects / project / odhcpd.git / blobdiff