X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=c3e2437901f7db340a8ca93d5eeec3382b2a7a68;hp=372ea6782701630f0b9b02da12e1f22b06996273;hb=HEAD;hpb=3af23ad72888393a863d7be545d1bd5af99ca442 diff --git a/src/config.c b/src/config.c index 372ea67..c3e2437 100644 --- a/src/config.c +++ b/src/config.c @@ -3,9 +3,15 @@ #include #include #include +#include +#include +#include +#include +#include #include #include +#include #include "odhcpd.h" @@ -13,7 +19,9 @@ static struct blob_buf b; static int reload_pipe[2]; struct list_head leases = LIST_HEAD_INIT(leases); struct list_head interfaces = LIST_HEAD_INIT(interfaces); -struct config config = {false, NULL, NULL}; +struct config config = {.legacy = false, .main_dhcpv4 = false, + .dhcp_cb = NULL, .dhcp_statefile = NULL, + .log_level = LOG_INFO}; enum { IFACE_ATTR_INTERFACE, @@ -34,17 +42,27 @@ 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, IFACE_ATTR_RA_MANAGEMENT, IFACE_ATTR_RA_OFFLINK, IFACE_ATTR_RA_PREFERENCE, IFACE_ATTR_RA_ADVROUTER, + IFACE_ATTR_RA_MININTERVAL, IFACE_ATTR_RA_MAXINTERVAL, + IFACE_ATTR_RA_LIFETIME, + IFACE_ATTR_RA_USELEASETIME, + IFACE_ATTR_RA_REACHABLETIME, + IFACE_ATTR_RA_RETRANSTIME, + IFACE_ATTR_RA_HOPLIMIT, + IFACE_ATTR_RA_MTU, IFACE_ATTR_PD_MANAGER, IFACE_ATTR_PD_CER, IFACE_ATTR_NDPROXY_ROUTING, IFACE_ATTR_NDPROXY_SLAVE, + IFACE_ATTR_PREFIX_FILTER, IFACE_ATTR_MAX }; @@ -67,7 +85,9 @@ 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 }, [IFACE_ATTR_PD_CER] = { .name = "pd_cer", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_RA_DEFAULT] = { .name = "ra_default", .type = BLOBMSG_TYPE_INT32 }, @@ -75,9 +95,17 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_RA_OFFLINK] = { .name = "ra_offlink", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_RA_PREFERENCE] = { .name = "ra_preference", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_RA_ADVROUTER] = { .name = "ra_advrouter", .type = BLOBMSG_TYPE_BOOL }, + [IFACE_ATTR_RA_MININTERVAL] = { .name = "ra_mininterval", .type = BLOBMSG_TYPE_INT32 }, [IFACE_ATTR_RA_MAXINTERVAL] = { .name = "ra_maxinterval", .type = BLOBMSG_TYPE_INT32 }, + [IFACE_ATTR_RA_LIFETIME] = { .name = "ra_lifetime", .type = BLOBMSG_TYPE_INT32 }, + [IFACE_ATTR_RA_USELEASETIME] = { .name = "ra_useleasetime", .type = BLOBMSG_TYPE_BOOL }, + [IFACE_ATTR_RA_REACHABLETIME] = { .name = "ra_reachabletime", .type = BLOBMSG_TYPE_INT32 }, + [IFACE_ATTR_RA_RETRANSTIME] = { .name = "ra_retranstime", .type = BLOBMSG_TYPE_INT32 }, + [IFACE_ATTR_RA_HOPLIMIT] = { .name = "ra_hoplimit", .type = BLOBMSG_TYPE_INT32 }, + [IFACE_ATTR_RA_MTU] = { .name = "ra_mtu", .type = BLOBMSG_TYPE_INT32 }, [IFACE_ATTR_NDPROXY_ROUTING] = { .name = "ndproxy_routing", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_NDPROXY_SLAVE] = { .name = "ndproxy_slave", .type = BLOBMSG_TYPE_BOOL }, + [IFACE_ATTR_PREFIX_FILTER] = { .name = "prefix_filter", .type = BLOBMSG_TYPE_STRING }, }; static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = { @@ -92,7 +120,6 @@ const struct uci_blob_param_list interface_attr_list = { .info = iface_attr_info, }; - enum { LEASE_ATTR_IP, LEASE_ATTR_MAC, @@ -103,7 +130,6 @@ enum { LEASE_ATTR_MAX }; - static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = { [LEASE_ATTR_IP] = { .name = "ip", .type = BLOBMSG_TYPE_STRING }, [LEASE_ATTR_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_STRING }, @@ -113,33 +139,66 @@ static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = { [LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING }, }; - const struct uci_blob_param_list lease_attr_list = { .n_params = LEASE_ATTR_MAX, .params = lease_attrs, }; - enum { + ODHCPD_ATTR_LEGACY, ODHCPD_ATTR_MAINDHCP, ODHCPD_ATTR_LEASEFILE, ODHCPD_ATTR_LEASETRIGGER, + ODHCPD_ATTR_LOGLEVEL, ODHCPD_ATTR_MAX }; - static const struct blobmsg_policy odhcpd_attrs[LEASE_ATTR_MAX] = { + [ODHCPD_ATTR_LEGACY] = { .name = "legacy", .type = BLOBMSG_TYPE_BOOL }, [ODHCPD_ATTR_MAINDHCP] = { .name = "maindhcp", .type = BLOBMSG_TYPE_BOOL }, [ODHCPD_ATTR_LEASEFILE] = { .name = "leasefile", .type = BLOBMSG_TYPE_STRING }, [ODHCPD_ATTR_LEASETRIGGER] = { .name = "leasetrigger", .type = BLOBMSG_TYPE_STRING }, + [ODHCPD_ATTR_LOGLEVEL] = { .name = "loglevel", .type = BLOBMSG_TYPE_INT32 }, }; - const struct uci_blob_param_list odhcpd_attr_list = { .n_params = ODHCPD_ATTR_MAX, .params = odhcpd_attrs, }; +static int mkdir_p(char *dir, mode_t mask) +{ + char *l = strrchr(dir, '/'); + int ret; + + if (!l) + return 0; + + *l = '\0'; + + if (mkdir_p(dir, mask)) + return -1; + + *l = '/'; + + ret = mkdir(dir, mask); + if (ret && errno == EEXIST) + return 0; + + if (ret) + syslog(LOG_ERR, "mkdir(%s, %d) failed: %m\n", dir, mask); + + return ret; +} + +static void free_lease(struct lease *l) +{ + if (l->head.next) + list_del(&l->head); + + free(l->duid); + free(l); +} static struct interface* get_interface(const char *name) { @@ -150,6 +209,16 @@ static struct interface* get_interface(const char *name) return NULL; } +static void set_interface_defaults(struct interface *iface) +{ + iface->learn_routes = 1; + iface->dhcpv4_leasetime = 43200; + iface->dhcpv6_assignall = true; + iface->ra_managed = RA_MANAGED_MFLAG; + iface->ra_maxinterval = 600; + iface->ra_mininterval = iface->ra_maxinterval/3; + iface->ra_lifetime = -1; +} static void clean_interface(struct interface *iface) { @@ -161,40 +230,42 @@ static void clean_interface(struct interface *iface) free(iface->dhcpv6_raw); free(iface->filter_class); memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra)); + set_interface_defaults(iface); } - 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); +#ifdef DHCPV4_SUPPORT + dhcpv4_setup_interface(iface, false); +#endif clean_interface(iface); + free(iface->addr4); + free(iface->addr6); + free(iface->ifname); free(iface); } - static int parse_mode(const char *mode) { - if (!strcmp(mode, "disabled")) { - return RELAYD_DISABLED; - } else if (!strcmp(mode, "server")) { - return RELAYD_SERVER; - } else if (!strcmp(mode, "relay")) { - return RELAYD_RELAY; - } else if (!strcmp(mode, "hybrid")) { - return RELAYD_HYBRID; - } else { + if (!strcmp(mode, "disabled")) + return MODE_DISABLED; + else if (!strcmp(mode, "server")) + return MODE_SERVER; + else if (!strcmp(mode, "relay")) + return MODE_RELAY; + else if (!strcmp(mode, "hybrid")) + return MODE_HYBRID; + else return -1; - } } - static void set_config(struct uci_section *s) { struct blob_attr *tb[ODHCPD_ATTR_MAX], *c; @@ -203,9 +274,12 @@ static void set_config(struct uci_section *s) uci_to_blob(&b, s, &odhcpd_attr_list); blobmsg_parse(odhcpd_attrs, ODHCPD_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head)); - if ((c = tb[ODHCPD_ATTR_MAINDHCP])) + if ((c = tb[ODHCPD_ATTR_LEGACY])) config.legacy = blobmsg_get_bool(c); + if ((c = tb[ODHCPD_ATTR_MAINDHCP])) + config.main_dhcpv4 = blobmsg_get_bool(c); + if ((c = tb[ODHCPD_ATTR_LEASEFILE])) { free(config.dhcp_statefile); config.dhcp_statefile = strdup(blobmsg_get_string(c)); @@ -215,6 +289,15 @@ static void set_config(struct uci_section *s) free(config.dhcp_cb); config.dhcp_cb = strdup(blobmsg_get_string(c)); } + + if ((c = tb[ODHCPD_ATTR_LOGLEVEL])) { + int log_level = (blobmsg_get_u32(c) & LOG_PRIMASK); + + if (config.log_level != log_level) { + config.log_level = log_level; + setlogmask(LOG_UPTO(config.log_level)); + } + } } static double parse_leasetime(struct blob_attr *c) { @@ -236,10 +319,10 @@ static double parse_leasetime(struct blob_attr *c) { goto err; } - if (time >= 60) - return time; + if (time < 60) + time = 60; - return 0; + return time; err: return -1; @@ -299,25 +382,24 @@ static int set_lease(struct uci_section *s) if (time < 0) goto err; - if (time >= 60) - lease->dhcpv4_leasetime = time; + lease->dhcpv4_leasetime = time; } list_add(&lease->head, &leases); return 0; err: - if (lease) { - free(lease->duid); - free(lease); - } + if (lease) + free_lease(lease); + return -1; } - int config_parse_interface(void *data, size_t len, const char *name, bool overwrite) { struct blob_attr *tb[IFACE_ATTR_MAX], *c; + bool get_addrs = false; + blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, data, len); if (tb[IFACE_ATTR_INTERFACE]) @@ -328,18 +410,18 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr struct interface *iface = get_interface(name); if (!iface) { - iface = calloc(1, sizeof(*iface)); + char *iface_name; + + iface = calloc_a(sizeof(*iface), &iface_name, strlen(name) + 1); if (!iface) return -1; - strncpy(iface->name, name, sizeof(iface->name) - 1); + iface->name = strcpy(iface_name, name); - /* Default settings */ - iface->managed = 1; - iface->learn_routes = true; + set_interface_defaults(iface); list_add(&iface->head, &interfaces); - overwrite = true; + get_addrs = overwrite = true; } const char *ifname = NULL; @@ -351,18 +433,37 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } #ifdef WITH_UBUS - if (overwrite || !iface->ifname[0]) + if (overwrite || !iface->ifname) ifname = ubus_get_ifname(name); #endif - if (!iface->ifname[0] && !ifname) + if (!iface->ifname && !ifname) goto err; - if (ifname) - strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1); + if (ifname) { + free(iface->ifname); + iface->ifname = strdup(ifname); - if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0) - goto err; + if (!iface->ifname) + goto err; + + if (!iface->ifindex && + (iface->ifindex = if_nametoindex(iface->ifname)) <= 0) + goto err; + } + + if (get_addrs) { + ssize_t len = netlink_get_interface_addrs(iface->ifindex, + true, &iface->addr6); + + if (len > 0) + iface->addr6_len = len; + + len = netlink_get_interface_addrs(iface->ifindex, + false, &iface->addr4); + if (len > 0) + iface->addr4_len = len; + } iface->inuse = true; @@ -377,15 +478,14 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if (time < 0) goto err; - if (time >= 60) - iface->dhcpv4_leasetime = time; + iface->dhcpv4_leasetime = time; } if ((c = tb[IFACE_ATTR_START])) { iface->dhcpv4_start.s_addr = htonl(blobmsg_get_u32(c)); - if (config.legacy) - iface->dhcpv4 = RELAYD_SERVER; + if (config.main_dhcpv4 && config.legacy) + iface->dhcpv4 = MODE_SERVER; } if ((c = tb[IFACE_ATTR_LIMIT])) @@ -422,8 +522,10 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } if ((c = tb[IFACE_ATTR_DHCPV4])) { - if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) - iface->dhcpv4 = mode; + if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) { + if (config.main_dhcpv4) + iface->dhcpv4 = mode; + } else goto err; } @@ -458,9 +560,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr goto err; iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4; - } else { + } else goto err; - } } } @@ -489,9 +590,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr goto err; iface->dns[iface->dns_cnt - 1] = addr6; - } else { + } else goto err; - } } } @@ -527,17 +627,55 @@ 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); odhcpd_unhexlify(iface->dhcpv6_raw, iface->dhcpv6_raw_len, blobmsg_get_string(c)); } + if ((c = tb[IFACE_ATTR_DHCPV6_ASSIGNALL])) + iface->dhcpv6_assignall = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_RA_DEFAULT])) iface->default_router = blobmsg_get_u32(c); if ((c = tb[IFACE_ATTR_RA_MANAGEMENT])) - iface->managed = blobmsg_get_u32(c); + iface->ra_managed = blobmsg_get_u32(c); + + if ((c = tb[IFACE_ATTR_RA_REACHABLETIME])) { + uint32_t ra_reachabletime = blobmsg_get_u32(c); + if (ra_reachabletime > 3600000) + goto err; + + iface->ra_reachabletime = ra_reachabletime; + } + + if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) { + uint32_t ra_retranstime = blobmsg_get_u32(c); + if (ra_retranstime > 60000) + goto err; + + iface->ra_retranstime = ra_retranstime; + } + + if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) { + uint32_t ra_hoplimit = blobmsg_get_u32(c); + if (ra_hoplimit > 255) + goto err; + + iface->ra_hoplimit = ra_hoplimit; + } + + if ((c = tb[IFACE_ATTR_RA_MTU])) { + uint32_t ra_mtu = blobmsg_get_u32(c); + if (ra_mtu < 1280 || ra_mtu > 65535) + goto err; + + iface->ra_mtu = ra_mtu; + } if ((c = tb[IFACE_ATTR_RA_OFFLINK])) iface->ra_not_onlink = blobmsg_get_bool(c); @@ -545,9 +683,18 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_RA_ADVROUTER])) iface->ra_advrouter = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_RA_MININTERVAL])) + iface->ra_mininterval = blobmsg_get_u32(c); + if ((c = tb[IFACE_ATTR_RA_MAXINTERVAL])) iface->ra_maxinterval = blobmsg_get_u32(c); + if ((c = tb[IFACE_ATTR_RA_LIFETIME])) + iface->ra_lifetime = blobmsg_get_u32(c); + + if ((c = tb[IFACE_ATTR_RA_USELEASETIME])) + iface->ra_useleasetime = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_RA_PREFERENCE])) { const char *prio = blobmsg_get_string(c); @@ -575,6 +722,23 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_NDPROXY_SLAVE])) iface->external = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_PREFIX_FILTER])) { + const char *str = blobmsg_get_string(c); + char *astr = malloc(strlen(str) + 1); + char *delim; + int l; + if (!astr || !strcpy(astr, str) || + (delim = strchr(astr, '/')) == NULL || (*(delim++) = 0) || + sscanf(delim, "%i", &l) == 0 || l > 128 || + inet_pton(AF_INET6, astr, &iface->pio_filter_addr) == 0) { + iface->pio_filter_length = 0; + } else { + iface->pio_filter_length = l; + } + if (astr) + free(astr); + } + return 0; err: @@ -586,19 +750,16 @@ static int set_interface(struct uci_section *s) { blob_buf_init(&b, 0); uci_to_blob(&b, s, &interface_attr_list); + return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true); } - void odhcpd_reload(void) { struct uci_context *uci = uci_alloc_context(); - while (!list_empty(&leases)) { - struct lease *l = list_first_entry(&leases, struct lease, head); - list_del(&l->head); - free(l->duid); - free(l); - } + + while (!list_empty(&leases)) + free_lease(list_first_entry(&leases, struct lease, head)); struct interface *master = NULL, *i, *n; @@ -626,6 +787,12 @@ void odhcpd_reload(void) } } + if (config.dhcp_statefile) { + char *path = strdup(config.dhcp_statefile); + + mkdir_p(dirname(path), 0755); + free(path); + } #ifdef WITH_UBUS ubus_apply_network(); @@ -633,84 +800,84 @@ void odhcpd_reload(void) bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false; - // Test for + /* Test for */ list_for_each_entry(i, &interfaces, head) { 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; } - // Evaluate hybrid mode for master + /* Evaluate hybrid mode for master */ list_for_each_entry(i, &interfaces, head) { 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); - setup_dhcpv6_interface(i, !i->ignore); - setup_ndp_interface(i, !i->ignore); - setup_dhcpv4_interface(i, !i->ignore); - } else { + /* Resolve hybrid mode */ + 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); - } } uci_unload(uci, dhcp); uci_free_context(uci); } - static void handle_signal(int signal) { char b[1] = {0}; @@ -721,12 +888,11 @@ static void handle_signal(int signal) uloop_end(); } - - static void reload_cb(struct uloop_fd *u, _unused unsigned int events) { char b[512]; if (read(u->fd, b, sizeof(b)) < 0) {} + odhcpd_reload(); } @@ -735,6 +901,7 @@ static struct uloop_fd reload_fd = { .cb = reload_cb }; void odhcpd_run(void) { if (pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC) < 0) {} + reload_fd.fd = reload_pipe[0]; uloop_fd_add(&reload_fd, ULOOP_READ); @@ -743,7 +910,7 @@ void odhcpd_run(void) signal(SIGHUP, handle_signal); #ifdef WITH_UBUS - while (init_ubus()) + while (ubus_init()) sleep(1); #endif