treewide: add netlink file

[project/odhcpd.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index fd8f32e..2f51d33 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -42,6 +42,7 @@ enum {
        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,
@@ -83,6 +84,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [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 },
@@ -234,10 +236,10 @@ static void close_interface(struct interface *iface)
        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);
+       dhcpv4_setup_interface(iface, false);
 
        clean_interface(iface);
        free(iface->addr4);
@@ -440,19 +442,20 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
                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,
+               ssize_t len = netlink_get_interface_addrs(iface->ifindex,
                                                true, &iface->ia_addr);
 
                if (len > 0)
                        iface->ia_addr_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;
@@ -620,6 +623,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                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);
@@ -837,10 +843,10 @@ void odhcpd_reload(void)
                                i->ndp = (master && master->ndp == MODE_RELAY) ?
                                                MODE_RELAY : MODE_DISABLED;
 
-                       setup_router_interface(i, !i->ignore || i->ra != MODE_DISABLED);
-                       setup_dhcpv6_interface(i, !i->ignore || i->dhcpv6 != MODE_DISABLED);
-                       setup_ndp_interface(i, !i->ignore || i->ndp != MODE_DISABLED);
-                       setup_dhcpv4_interface(i, !i->ignore || i->dhcpv4 != 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);
+                       dhcpv4_setup_interface(i, !i->ignore || i->dhcpv4 != MODE_DISABLED);
                } else
                        close_interface(i);
        }
@@ -881,7 +887,7 @@ void odhcpd_run(void)
        signal(SIGHUP, handle_signal);
 
 #ifdef WITH_UBUS
-       while (init_ubus())
+       while (ubus_init())
                sleep(1);
 #endif