X-Git-Url: http://git.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=e46ecb0d1063962603a1d9f8d1fd1b83e8a63e2e;hp=dc1dcdcaa0d9e12d628540479929f272b8552c6e;hb=a12fcb3cee2d489b8648a2398812d7bed2f25faa;hpb=f13c624c16a8e3fd30bb47f9ed614c7e2bd6d75e diff --git a/src/config.c b/src/config.c index dc1dcdc..e46ecb0 100644 --- a/src/config.c +++ b/src/config.c @@ -3,24 +3,45 @@ #include #include #include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include #include "odhcpd.h" 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}; +static int reload_pipe[2] = { -1, -1 }; + +static int lease_cmp(const void *k1, const void *k2, void *ptr); +static void lease_update(struct vlist_tree *tree, struct vlist_node *node_new, + struct vlist_node *node_old); + +struct vlist_tree leases = VLIST_TREE_INIT(leases, lease_cmp, lease_update, true, false); +AVL_TREE(interfaces, avl_strcmp, false, NULL); +struct config config = {.legacy = false, .main_dhcpv4 = false, + .dhcp_cb = NULL, .dhcp_statefile = NULL, + .log_level = LOG_WARNING}; + +#define START_DEFAULT 100 +#define LIMIT_DEFAULT 150 + +#define OAF_DHCPV6 (OAF_DHCPV6_NA | OAF_DHCPV6_PD) enum { IFACE_ATTR_INTERFACE, IFACE_ATTR_IFNAME, IFACE_ATTR_NETWORKID, IFACE_ATTR_DYNAMICDHCP, - IFACE_ATTR_IGNORE, IFACE_ATTR_LEASETIME, IFACE_ATTR_LIMIT, IFACE_ATTR_START, @@ -32,19 +53,36 @@ enum { IFACE_ATTR_NDP, IFACE_ATTR_ROUTER, IFACE_ATTR_DNS, + IFACE_ATTR_DNS_SERVICE, IFACE_ATTR_DOMAIN, IFACE_ATTR_FILTER_CLASS, + IFACE_ATTR_DHCPV4_FORCERECONF, IFACE_ATTR_DHCPV6_RAW, + IFACE_ATTR_DHCPV6_ASSIGNALL, + IFACE_ATTR_DHCPV6_PD, + IFACE_ATTR_DHCPV6_NA, IFACE_ATTR_RA_DEFAULT, IFACE_ATTR_RA_MANAGEMENT, + IFACE_ATTR_RA_FLAGS, + IFACE_ATTR_RA_SLAAC, 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_RA_DNS, IFACE_ATTR_PD_MANAGER, IFACE_ATTR_PD_CER, IFACE_ATTR_NDPROXY_ROUTING, IFACE_ATTR_NDPROXY_SLAVE, - IFACE_ATTR_NDPROXY_STATIC, + IFACE_ATTR_PREFIX_FILTER, + IFACE_ATTR_PREFERRED_LIFETIME, IFACE_ATTR_MAX }; @@ -53,7 +91,6 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_NETWORKID] = { .name = "networkid", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_DYNAMICDHCP] = { .name = "dynamicdhcp", .type = BLOBMSG_TYPE_BOOL }, - [IFACE_ATTR_IGNORE] = { .name = "ignore", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_LEASETIME] = { .name = "leasetime", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_START] = { .name = "start", .type = BLOBMSG_TYPE_INT32 }, [IFACE_ATTR_LIMIT] = { .name = "limit", .type = BLOBMSG_TYPE_INT32 }, @@ -65,26 +102,42 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_NDP] = { .name = "ndp", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_ROUTER] = { .name = "router", .type = BLOBMSG_TYPE_ARRAY }, [IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY }, + [IFACE_ATTR_DNS_SERVICE] = { .name = "dns_service", .type = BLOBMSG_TYPE_BOOL }, [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_DHCPV6_PD] = { .name = "dhcpv6_pd", .type = BLOBMSG_TYPE_BOOL }, + [IFACE_ATTR_DHCPV6_NA] = { .name = "dhcpv6_na", .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 }, [IFACE_ATTR_RA_MANAGEMENT] = { .name = "ra_management", .type = BLOBMSG_TYPE_INT32 }, + [IFACE_ATTR_RA_FLAGS] = { .name = "ra_flags", . type = BLOBMSG_TYPE_ARRAY }, + [IFACE_ATTR_RA_SLAAC] = { .name = "ra_slaac", .type = BLOBMSG_TYPE_BOOL }, [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_RA_DNS] = { .name = "ra_dns", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_NDPROXY_ROUTING] = { .name = "ndproxy_routing", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_NDPROXY_SLAVE] = { .name = "ndproxy_slave", .type = BLOBMSG_TYPE_BOOL }, - [IFACE_ATTR_NDPROXY_STATIC] = { .name = "ndproxy_static", .type = BLOBMSG_TYPE_ARRAY }, + [IFACE_ATTR_PREFIX_FILTER] = { .name = "prefix_filter", .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_PREFERRED_LIFETIME] = { .name = "preferred_lifetime", .type = BLOBMSG_TYPE_STRING }, }; static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = { [IFACE_ATTR_UPSTREAM] = { .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_DOMAIN] = { .type = BLOBMSG_TYPE_STRING }, - [IFACE_ATTR_NDPROXY_STATIC] = { .type = BLOBMSG_TYPE_STRING }, }; const struct uci_blob_param_list interface_attr_list = { @@ -93,107 +146,146 @@ const struct uci_blob_param_list interface_attr_list = { .info = iface_attr_info, }; - -enum { - LEASE_ATTR_IP, - LEASE_ATTR_MAC, - LEASE_ATTR_DUID, - LEASE_ATTR_HOSTID, - LEASE_ATTR_NAME, - LEASE_ATTR_MAX -}; - - -static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = { +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 }, [LEASE_ATTR_DUID] = { .name = "duid", .type = BLOBMSG_TYPE_STRING }, [LEASE_ATTR_HOSTID] = { .name = "hostid", .type = BLOBMSG_TYPE_STRING }, + [LEASE_ATTR_LEASETIME] = { .name = "leasetime", .type = BLOBMSG_TYPE_STRING }, [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] = { +static const struct blobmsg_policy odhcpd_attrs[ODHCPD_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 const struct { const char *name; uint8_t flag; } ra_flags[] = { + { .name = "managed-config", .flag = ND_RA_FLAG_MANAGED }, + { .name = "other-config", .flag = ND_RA_FLAG_OTHER }, + { .name = "home-agent", .flag = ND_RA_FLAG_HOME_AGENT }, + { .name = "none", . flag = 0 }, + { .name = NULL, }, +}; -static struct interface* get_interface(const char *name) +static void set_interface_defaults(struct interface *iface) { - struct interface *c; - list_for_each_entry(c, &interfaces, head) - if (!strcmp(c->name, name)) - return c; - return NULL; + iface->ignore = true; + iface->dhcpv4 = MODE_DISABLED; + iface->dhcpv6 = MODE_DISABLED; + iface->ra = MODE_DISABLED; + iface->ndp = MODE_DISABLED; + iface->learn_routes = 1; + iface->dhcp_leasetime = 43200; + iface->preferred_lifetime = 43200; + iface->dhcpv4_start.s_addr = htonl(START_DEFAULT); + iface->dhcpv4_end.s_addr = htonl(START_DEFAULT + LIMIT_DEFAULT - 1); + iface->dhcpv6_assignall = true; + iface->dhcpv6_pd = true; + iface->dhcpv6_na = true; + iface->dns_service = true; + iface->ra_flags = ND_RA_FLAG_OTHER; + iface->ra_slaac = true; + iface->ra_maxinterval = 600; + iface->ra_mininterval = iface->ra_maxinterval/3; + iface->ra_lifetime = -1; + iface->ra_dns = true; } - static void clean_interface(struct interface *iface) { free(iface->dns); free(iface->search); free(iface->upstream); - free(iface->static_ndp); free(iface->dhcpv4_router); free(iface->dhcpv4_dns); 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); + avl_delete(&interfaces, &iface->avl); - 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 int parse_ra_flags(uint8_t *flags, struct blob_attr *attr) +{ + struct blob_attr *cur; + unsigned rem; + + blobmsg_for_each_attr(cur, attr, rem) { + int i; + + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) + continue; + + if (!blobmsg_check_attr(cur, false)) + continue; + + for (i = 0; ra_flags[i].name; i++) { + if (!strcmp(ra_flags[i].name, blobmsg_get_string(cur))) { + *flags |= ra_flags[i].flag; + break; + } + } + + if (!ra_flags[i].name) + return -1; + } + + return 0; +} static void set_config(struct uci_section *s) { @@ -203,9 +295,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,73 +310,139 @@ 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) { + char *val = blobmsg_get_string(c), *endptr = NULL; + double time = strcmp(val, "infinite") ? strtod(val, &endptr) : UINT32_MAX; + + if (time && endptr && endptr[0]) { + if (endptr[0] == 's') + time *= 1; + else if (endptr[0] == 'm') + time *= 60; + else if (endptr[0] == 'h') + time *= 3600; + else if (endptr[0] == 'd') + time *= 24 * 3600; + else if (endptr[0] == 'w') + time *= 7 * 24 * 3600; + else + goto err; + } + + if (time < 60) + time = 60; + + return time; -static int set_lease(struct uci_section *s) +err: + return -1; +} + +static void free_lease(struct lease *l) { - struct blob_attr *tb[LEASE_ATTR_MAX], *c; + free(l->hostname); + free(l); +} - blob_buf_init(&b, 0); - uci_to_blob(&b, s, &lease_attr_list); - blobmsg_parse(lease_attrs, LEASE_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head)); - size_t hostlen = 1; - if ((c = tb[LEASE_ATTR_NAME])) - hostlen = blobmsg_data_len(c); +int set_lease_from_blobmsg(struct blob_attr *ba) +{ + struct blob_attr *tb[LEASE_ATTR_MAX], *c; + struct lease *l; + size_t duidlen = 0; + uint8_t *duid; - struct lease *lease = calloc(1, sizeof(*lease) + hostlen); - if (!lease) - goto err; + blobmsg_parse(lease_attrs, LEASE_ATTR_MAX, tb, blob_data(ba), blob_len(ba)); - if (hostlen > 1) - memcpy(lease->hostname, blobmsg_get_string(c), hostlen); + if ((c = tb[LEASE_ATTR_DUID])) + duidlen = (blobmsg_data_len(c) - 1) / 2; - if ((c = tb[LEASE_ATTR_IP])) - if (inet_pton(AF_INET, blobmsg_get_string(c), &lease->ipaddr) < 0) - goto err; + l = calloc_a(sizeof(*l), &duid, duidlen); + if (!l) + goto err; if ((c = tb[LEASE_ATTR_MAC])) - if (!ether_aton_r(blobmsg_get_string(c), &lease->mac)) + if (!ether_aton_r(blobmsg_get_string(c), &l->mac)) goto err; if ((c = tb[LEASE_ATTR_DUID])) { - size_t duidlen = (blobmsg_data_len(c) - 1) / 2; - lease->duid = malloc(duidlen); - if (!lease->duid) - goto err; + ssize_t len; - ssize_t len = odhcpd_unhexlify(lease->duid, - duidlen, blobmsg_get_string(c)); + l->duid = duid; + len = odhcpd_unhexlify(l->duid, duidlen, blobmsg_get_string(c)); if (len < 0) goto err; - lease->duid_len = len; + l->duid_len = len; + } + + if ((c = tb[LEASE_ATTR_NAME])) { + l->hostname = strdup(blobmsg_get_string(c)); + if (!l->hostname || !odhcpd_valid_hostname(l->hostname)) + goto err; } + if ((c = tb[LEASE_ATTR_IP])) + if (inet_pton(AF_INET, blobmsg_get_string(c), &l->ipaddr) < 0) + goto err; + if ((c = tb[LEASE_ATTR_HOSTID])) { errno = 0; - lease->hostid = strtoul(blobmsg_get_string(c), NULL, 16); + l->hostid = strtoul(blobmsg_get_string(c), NULL, 16); if (errno) goto err; + } else { + uint32_t i4a = ntohl(l->ipaddr) & 0xff; + l->hostid = ((i4a / 100) << 8) | (((i4a % 100) / 10) << 4) | (i4a % 10); } - list_add(&lease->head, &leases); + if ((c = tb[LEASE_ATTR_LEASETIME])) { + double time = parse_leasetime(c); + if (time < 0) + goto err; + + l->leasetime = time; + } + + INIT_LIST_HEAD(&l->assignments); + vlist_add(&leases, &l->node, l); return 0; err: - if (lease) { - free(lease->duid); - free(lease); - } + if (l) + free_lease(l); + return -1; } +static int set_lease_from_uci(struct uci_section *s) +{ + blob_buf_init(&b, 0); + uci_to_blob(&b, s, &lease_attr_list); + + return set_lease_from_blobmsg(b.head); +} int config_parse_interface(void *data, size_t len, const char *name, bool overwrite) { + struct interface *iface; struct blob_attr *tb[IFACE_ATTR_MAX], *c; + bool get_addrs = false; + int mode; + const char *ifname = NULL; + blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, data, len); if (tb[IFACE_ATTR_INTERFACE]) @@ -290,23 +451,31 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if (!name) return -1; - struct interface *iface = get_interface(name); + iface = avl_find_element(&interfaces, name, iface, avl); if (!iface) { - iface = calloc(1, sizeof(*iface)); + char *new_name; + + iface = calloc_a(sizeof(*iface), &new_name, strlen(name) + 1); if (!iface) return -1; - strncpy(iface->name, name, sizeof(iface->name) - 1); - list_add(&iface->head, &interfaces); - overwrite = true; + iface->name = strcpy(new_name, name); + iface->avl.key = iface->name; + iface->router_event.uloop.fd = -1; + iface->dhcpv6_event.uloop.fd = -1; + iface->ndp_event.uloop.fd = -1; + iface->ndp_ping_fd = -1; + iface->dhcpv4_event.uloop.fd = -1; + INIT_LIST_HEAD(&iface->ia_assignments); + INIT_LIST_HEAD(&iface->dhcpv4_assignments); + INIT_LIST_HEAD(&iface->dhcpv4_fr_ips); + + set_interface_defaults(iface); + + avl_insert(&interfaces, &iface->avl); + get_addrs = overwrite = true; } - const char *ifname = NULL; -#ifdef WITH_UBUS - if (overwrite || !iface->ifname[0]) - ifname = ubus_get_ifname(name); -#endif - if (overwrite) { if ((c = tb[IFACE_ATTR_IFNAME])) ifname = blobmsg_get_string(c); @@ -314,55 +483,78 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr ifname = blobmsg_get_string(c); } - if (!iface->ifname[0] && !ifname) - return -1; +#ifdef WITH_UBUS + if (overwrite || !iface->ifname) + ifname = ubus_get_ifname(name); +#endif - if (ifname) - strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1); + if (!iface->ifname && !ifname) + goto err; - if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0) - return -1; + if (ifname) { + free(iface->ifname); + iface->ifname = strdup(ifname); + + 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; if ((c = tb[IFACE_ATTR_DYNAMICDHCP])) iface->no_dynamic_dhcp = !blobmsg_get_bool(c); - if (overwrite && (c = tb[IFACE_ATTR_IGNORE])) - iface->ignore = blobmsg_get_bool(c); - if ((c = tb[IFACE_ATTR_LEASETIME])) { - char *val = blobmsg_get_string(c), *endptr; - double time = strtod(val, &endptr); - if (time && endptr[0]) { - if (endptr[0] == 's') - time *= 1; - else if (endptr[0] == 'm') - time *= 60; - else if (endptr[0] == 'h') - time *= 3600; - else if (endptr[0] == 'd') - time *= 24 * 3600; - else if (endptr[0] == 'w') - time *= 7 * 24 * 3600; - else - goto err; - } + double time = parse_leasetime(c); + + if (time >= 0) + iface->dhcp_leasetime = time; + else + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_LEASETIME].name, iface->name); + + } + + if ((c = tb[IFACE_ATTR_PREFERRED_LIFETIME])) { + double time = parse_leasetime(c); + + if (time >= 0) + iface->preferred_lifetime = time; + else + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_PREFERRED_LIFETIME].name, iface->name); - if (time >= 60) - iface->dhcpv4_leasetime = time; } if ((c = tb[IFACE_ATTR_START])) { iface->dhcpv4_start.s_addr = htonl(blobmsg_get_u32(c)); + iface->dhcpv4_end.s_addr = htonl(ntohl(iface->dhcpv4_start.s_addr) + + LIMIT_DEFAULT - 1); - if (config.legacy) - iface->dhcpv4 = RELAYD_SERVER; + if (config.main_dhcpv4 && config.legacy) + iface->dhcpv4 = MODE_SERVER; } if ((c = tb[IFACE_ATTR_LIMIT])) - iface->dhcpv4_end.s_addr = htonl( - ntohl(iface->dhcpv4_start.s_addr) + blobmsg_get_u32(c)); + iface->dhcpv4_end.s_addr = htonl(ntohl(iface->dhcpv4_start.s_addr) + + blobmsg_get_u32(c) - 1); if ((c = tb[IFACE_ATTR_MASTER])) iface->master = blobmsg_get_bool(c); @@ -372,7 +564,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr unsigned rem; blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false)) continue; iface->upstream = realloc(iface->upstream, @@ -385,33 +577,50 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } } - int mode; if ((c = tb[IFACE_ATTR_RA])) { - if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) + if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) { iface->ra = mode; - else - goto err; + + if (iface->ra != MODE_DISABLED) + iface->ignore = false; + } else + syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'", + iface_attrs[IFACE_ATTR_RA].name, iface->name); } if ((c = tb[IFACE_ATTR_DHCPV4])) { - if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) - iface->dhcpv4 = mode; - else - goto err; + if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) { + if (config.main_dhcpv4) { + iface->dhcpv4 = mode; + + if (iface->dhcpv4 != MODE_DISABLED) + iface->ignore = false; + } + } else + syslog(LOG_ERR, "Invalid %s mode configured for interface %s", + iface_attrs[IFACE_ATTR_DHCPV4].name, iface->name); } if ((c = tb[IFACE_ATTR_DHCPV6])) { - if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) + if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) { iface->dhcpv6 = mode; - else - goto err; + + if (iface->dhcpv6 != MODE_DISABLED) + iface->ignore = false; + } else + syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'", + iface_attrs[IFACE_ATTR_DHCPV6].name, iface->name); } if ((c = tb[IFACE_ATTR_NDP])) { - if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) + if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) { iface->ndp = mode; - else - goto err; + + if (iface->ndp != MODE_DISABLED) + iface->ignore = false; + } else + syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'", + iface_attrs[IFACE_ATTR_NDP].name, iface->name); } if ((c = tb[IFACE_ATTR_ROUTER])) { @@ -419,10 +628,11 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr unsigned rem; blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) + struct in_addr addr4; + + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false)) continue; - struct in_addr addr4; if (inet_pton(AF_INET, blobmsg_get_string(cur), &addr4) == 1) { iface->dhcpv4_router = realloc(iface->dhcpv4_router, (++iface->dhcpv4_router_cnt) * sizeof(*iface->dhcpv4_router)); @@ -430,9 +640,9 @@ 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 { - goto err; - } + } else + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_ROUTER].name, iface->name); } } @@ -442,12 +652,20 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->always_rewrite_dns = true; blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) - continue; - struct in_addr addr4; struct in6_addr addr6; + + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false)) + continue; + if (inet_pton(AF_INET, blobmsg_get_string(cur), &addr4) == 1) { + if (addr4.s_addr == INADDR_ANY) { + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_DNS].name, iface->name); + + continue; + } + iface->dhcpv4_dns = realloc(iface->dhcpv4_dns, (++iface->dhcpv4_dns_cnt) * sizeof(*iface->dhcpv4_dns)); if (!iface->dhcpv4_dns) @@ -455,35 +673,54 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->dhcpv4_dns[iface->dhcpv4_dns_cnt - 1] = addr4; } else if (inet_pton(AF_INET6, blobmsg_get_string(cur), &addr6) == 1) { + if (IN6_IS_ADDR_UNSPECIFIED(&addr6)) { + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_DNS].name, iface->name); + + continue; + } + iface->dns = realloc(iface->dns, (++iface->dns_cnt) * sizeof(*iface->dns)); if (!iface->dns) goto err; iface->dns[iface->dns_cnt - 1] = addr6; - } else { - goto err; - } + } else + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_DNS].name, iface->name); } } + if ((c = tb[IFACE_ATTR_DNS_SERVICE])) + iface->dns_service = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_DOMAIN])) { struct blob_attr *cur; unsigned rem; blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) - continue; - uint8_t buf[256]; char *domain = blobmsg_get_string(cur); size_t domainlen = strlen(domain); + int len; + + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false)) + continue; + + domain = blobmsg_get_string(cur); + domainlen = strlen(domain); + if (domainlen > 0 && domain[domainlen - 1] == '.') domain[domainlen - 1] = 0; - int len = dn_comp(domain, buf, sizeof(buf), NULL, NULL); - if (len <= 0) - goto err; + len = dn_comp(domain, buf, sizeof(buf), NULL, NULL); + if (len <= 0) { + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_DOMAIN].name, iface->name); + + continue; + } iface->search = realloc(iface->search, iface->search_len + len); if (!iface->search) @@ -499,19 +736,95 @@ 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_DHCPV6_PD])) + iface->dhcpv6_pd = blobmsg_get_bool(c); + + if ((c = tb[IFACE_ATTR_DHCPV6_NA])) + iface->dhcpv6_na = 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); - else if (overwrite) - iface->managed = 1; + if (!tb[IFACE_ATTR_RA_FLAGS] && !tb[IFACE_ATTR_RA_SLAAC] && + (c = tb[IFACE_ATTR_RA_MANAGEMENT])) { + switch (blobmsg_get_u32(c)) { + case 0: + iface->ra_flags = ND_RA_FLAG_OTHER; + iface->ra_slaac = true; + break; + case 1: + iface->ra_flags = ND_RA_FLAG_OTHER|ND_RA_FLAG_MANAGED; + iface->ra_slaac = true; + break; + case 2: + iface->ra_flags = ND_RA_FLAG_OTHER|ND_RA_FLAG_MANAGED; + iface->ra_slaac = false; + break; + default: + break; + } + } + + if ((c = tb[IFACE_ATTR_RA_FLAGS])) { + if (parse_ra_flags(&iface->ra_flags, c) < 0) + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_RA_FLAGS].name, iface->name); + } + + if ((c = tb[IFACE_ATTR_RA_REACHABLETIME])) { + uint32_t ra_reachabletime = blobmsg_get_u32(c); + + if (ra_reachabletime <= 3600000) + iface->ra_reachabletime = ra_reachabletime; + else + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_RA_REACHABLETIME].name, iface->name); + } + + if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) { + uint32_t ra_retranstime = blobmsg_get_u32(c); + + if (ra_retranstime <= 60000) + iface->ra_retranstime = ra_retranstime; + else + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name); + } + + if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) { + uint32_t ra_hoplimit = blobmsg_get_u32(c); + + if (ra_hoplimit <= 255) + iface->ra_hoplimit = ra_hoplimit; + else + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_RA_HOPLIMIT].name, iface->name); + } + + if ((c = tb[IFACE_ATTR_RA_MTU])) { + uint32_t ra_mtu = blobmsg_get_u32(c); + + if (ra_mtu >= 1280 || ra_mtu <= 65535) + iface->ra_mtu = ra_mtu; + else + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_RA_MTU].name, iface->name); + } + + if ((c = tb[IFACE_ATTR_RA_SLAAC])) + iface->ra_slaac = blobmsg_get_bool(c); if ((c = tb[IFACE_ATTR_RA_OFFLINK])) iface->ra_not_onlink = blobmsg_get_bool(c); @@ -519,6 +832,21 @@ 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_DNS])) + iface->ra_dns = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_RA_PREFERENCE])) { const char *prio = blobmsg_get_string(c); @@ -529,7 +857,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr else if (!strcmp(prio, "medium") || !strcmp(prio, "default")) iface->route_preference = 0; else - goto err; + syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'", + iface_attrs[IFACE_ATTR_RA_PREFERENCE].name, iface->name); } if ((c = tb[IFACE_ATTR_PD_MANAGER])) @@ -538,35 +867,31 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_PD_CER]) && inet_pton(AF_INET6, blobmsg_get_string(c), &iface->dhcpv6_pd_cer) < 1) - goto err; + syslog(LOG_ERR, "Invalid %s value configured for interface '%s'", + iface_attrs[IFACE_ATTR_PD_CER].name, iface->name); if ((c = tb[IFACE_ATTR_NDPROXY_ROUTING])) iface->learn_routes = blobmsg_get_bool(c); - else if (overwrite) - iface->learn_routes = true; if ((c = tb[IFACE_ATTR_NDPROXY_SLAVE])) iface->external = blobmsg_get_bool(c); - if ((c = tb[IFACE_ATTR_NDPROXY_STATIC])) { - struct blob_attr *cur; - unsigned rem; - - blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) - continue; - - int len = blobmsg_data_len(cur); - iface->static_ndp = realloc(iface->static_ndp, iface->static_ndp_len + len); - if (!iface->static_ndp) - goto err; - - if (iface->static_ndp_len) - iface->static_ndp[iface->static_ndp_len - 1] = ' '; + 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; - memcpy(&iface->static_ndp[iface->static_ndp_len], blobmsg_get_string(cur), len); - iface->static_ndp_len += len; - } + if (astr) + free(astr); } return 0; @@ -580,46 +905,208 @@ 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); } +static void lease_delete_assignments(struct lease *l, bool v6) +{ + struct dhcp_assignment *a, *tmp; + unsigned int flag = v6 ? OAF_DHCPV6 : OAF_DHCPV4; + + list_for_each_entry_safe(a, tmp, &l->assignments, lease_list) { + if (a->flags & flag) + free_assignment(a); + } +} -void odhcpd_reload(void) +static void lease_update_assignments(struct lease *l) { - 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); + struct dhcp_assignment *a; + + list_for_each_entry(a, &l->assignments, lease_list) { + if (a->hostname) + free(a->hostname); + a->hostname = NULL; + + if (l->hostname) + a->hostname = strdup(l->hostname); + + a->leasetime = l->leasetime; } +} + +static int lease_cmp(const void *k1, const void *k2, _unused void *ptr) +{ + const struct lease *l1 = k1, *l2 = k2; + int cmp = 0; + + if (l1->duid_len != l2->duid_len) + return l1->duid_len - l2->duid_len; + + if (l1->duid_len && l2->duid_len) + cmp = memcmp(l1->duid, l2->duid, l1->duid_len); + + if (cmp) + return cmp; + + return memcmp(l1->mac.ether_addr_octet, l2->mac.ether_addr_octet, + sizeof(l1->mac.ether_addr_octet)); +} + +static void lease_change_config(struct lease *l_old, struct lease *l_new) +{ + bool update = false; - struct interface *master = NULL, *i, *n; + if ((!!l_new->hostname != !!l_old->hostname) || + (l_new->hostname && strcmp(l_new->hostname, l_old->hostname))) { + free(l_old->hostname); + l_old->hostname = NULL; + + if (l_new->hostname) + l_old->hostname = strdup(l_new->hostname); + + update = true; + } + + if (l_old->leasetime != l_new->leasetime) { + l_old->leasetime = l_new->leasetime; + update = true; + } + + if (l_old->ipaddr != l_new->ipaddr) { + l_old->ipaddr = l_new->ipaddr; + lease_delete_assignments(l_old, false); + } + + if (l_old->hostid != l_new->hostid) { + l_old->hostid = l_new->hostid; + lease_delete_assignments(l_old, true); + } + + if (update) + lease_update_assignments(l_old); + + free_lease(l_new); +} + +static void lease_delete(struct lease *l) +{ + struct dhcp_assignment *a, *tmp; + + list_for_each_entry_safe(a, tmp, &l->assignments, lease_list) + free_assignment(a); + + free_lease(l); +} + +static void lease_update(_unused struct vlist_tree *tree, struct vlist_node *node_new, + struct vlist_node *node_old) +{ + struct lease *lease_new = container_of(node_new, struct lease, node); + struct lease *lease_old = container_of(node_old, struct lease, node); + + if (node_old && node_new) + lease_change_config(lease_old, lease_new); + else if (node_old) + lease_delete(lease_old); +} + +struct lease *config_find_lease_by_duid(const uint8_t *duid, const uint16_t len) +{ + struct lease *l; + + vlist_for_each_element(&leases, l, node) { + if (l->duid_len == len && !memcmp(l->duid, duid, len)) + return l; + } + + return NULL; +} + +struct lease *config_find_lease_by_mac(const uint8_t *mac) +{ + struct lease *l; + + vlist_for_each_element(&leases, l, node) { + if (!memcmp(l->mac.ether_addr_octet, mac, + sizeof(l->mac.ether_addr_octet))) + return l; + } + + return NULL; +} + +struct lease *config_find_lease_by_hostid(const uint32_t hostid) +{ + struct lease *l; + + vlist_for_each_element(&leases, l, node) { + if (l->hostid == hostid) + return l; + } + + return NULL; +} + +struct lease *config_find_lease_by_ipaddr(const uint32_t ipaddr) +{ + struct lease *l; + + vlist_for_each_element(&leases, l, node) { + if (l->ipaddr == ipaddr) + return l; + } + + return NULL; +} + +void odhcpd_reload(void) +{ + struct uci_context *uci = uci_alloc_context(); + struct interface *master = NULL, *i, *tmp; if (!uci) return; - list_for_each_entry(i, &interfaces, head) + vlist_update(&leases); + avl_for_each_element(&interfaces, i, avl) clean_interface(i); struct uci_package *dhcp = NULL; if (!uci_load(uci, "dhcp", &dhcp)) { struct uci_element *e; + + /* 1. Global settings */ uci_foreach_element(&dhcp->sections, e) { struct uci_section *s = uci_to_section(e); - if (!strcmp(s->type, "host")) - set_lease(s); - else if (!strcmp(s->type, "odhcpd")) + if (!strcmp(s->type, "odhcpd")) set_config(s); } + /* 2. DHCP pools */ uci_foreach_element(&dhcp->sections, e) { struct uci_section *s = uci_to_section(e); if (!strcmp(s->type, "dhcp")) set_interface(s); } + + /* 3. Static leases */ + uci_foreach_element(&dhcp->sections, e) { + struct uci_section* s = uci_to_section(e); + if (!strcmp(s->type, "host")) + set_lease_from_uci(s); + } } + if (config.dhcp_statefile) { + char *path = strdup(config.dhcp_statefile); + + mkdir_p(dirname(path), 0755); + free(path); + } + + vlist_flush(&leases); #ifdef WITH_UBUS ubus_apply_network(); @@ -627,107 +1114,108 @@ void odhcpd_reload(void) bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false; - // Test for - list_for_each_entry(i, &interfaces, head) { + /* Test for */ + avl_for_each_element(&interfaces, i, avl) { 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 - list_for_each_entry(i, &interfaces, head) { + /* Evaluate hybrid mode for master */ + avl_for_each_element(&interfaces, i, avl) { 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) { + avl_for_each_element_safe(&interfaces, i, avl, tmp) { 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, true); - setup_dhcpv6_interface(i, true); - setup_ndp_interface(i, true); - setup_dhcpv4_interface(i, true); - } 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->ra != MODE_DISABLED); + dhcpv6_setup_interface(i, i->dhcpv6 != MODE_DISABLED); + ndp_setup_interface(i, i->ndp != MODE_DISABLED); +#ifdef DHCPV4_SUPPORT + dhcpv4_setup_interface(i, 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}; - if (signal == SIGHUP) - write(reload_pipe[1], b, sizeof(b)); - else + + if (signal == SIGHUP) { + if (write(reload_pipe[1], b, sizeof(b)) < 0) {} + } else uloop_end(); } - - static void reload_cb(struct uloop_fd *u, _unused unsigned int events) { char b[512]; - read(u->fd, b, sizeof(b)); + if (read(u->fd, b, sizeof(b)) < 0) {} + odhcpd_reload(); } -static struct uloop_fd reload_fd = { .cb = reload_cb }; +static struct uloop_fd reload_fd = { .fd = -1, .cb = reload_cb }; void odhcpd_run(void) { - pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC); + if (pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC) < 0) {} + reload_fd.fd = reload_pipe[0]; uloop_fd_add(&reload_fd, ULOOP_READ); @@ -736,11 +1224,10 @@ void odhcpd_run(void) signal(SIGHUP, handle_signal); #ifdef WITH_UBUS - while (init_ubus()) + while (ubus_init()) sleep(1); #endif odhcpd_reload(); uloop_run(); } -