X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=068d1a7483a14cba591ec0dd3c1fdbd852e484c1;hp=98a826fc3b70a6a1895c20cafa2382dcb48cf0ba;hb=d8d6d784258b64d23e7f1cc0a2ee02e88377707d;hpb=dd3a301be17b33079306ae54b4a3fc30fcafba57;ds=sidebyside diff --git a/src/config.c b/src/config.c index 98a826f..068d1a7 100644 --- a/src/config.c +++ b/src/config.c @@ -32,11 +32,14 @@ enum { IFACE_ATTR_NDP, IFACE_ATTR_DNS, IFACE_ATTR_DOMAIN, - IFACE_ATTR_ULA_COMPAT, + IFACE_ATTR_FILTER_CLASS, + IFACE_ATTR_DHCPV6_RAW, IFACE_ATTR_RA_DEFAULT, IFACE_ATTR_RA_MANAGEMENT, IFACE_ATTR_RA_OFFLINK, IFACE_ATTR_RA_PREFERENCE, + IFACE_ATTR_PD_MANAGER, + IFACE_ATTR_PD_CER, IFACE_ATTR_NDPROXY_ROUTING, IFACE_ATTR_NDPROXY_SLAVE, IFACE_ATTR_NDPROXY_STATIC, @@ -60,7 +63,10 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_NDP] = { .name = "ndp", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY }, [IFACE_ATTR_DOMAIN] = { .name = "domain", .type = BLOBMSG_TYPE_ARRAY }, - [IFACE_ATTR_ULA_COMPAT] = { .name = "ula_compat", .type = BLOBMSG_TYPE_BOOL }, + [IFACE_ATTR_FILTER_CLASS] = { .name = "filter_class", .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_DHCPV6_RAW] = { .name = "dhcpv6_raw", .type = BLOBMSG_TYPE_STRING }, + [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_OFFLINK] = { .name = "ra_offlink", .type = BLOBMSG_TYPE_BOOL }, @@ -89,7 +95,7 @@ enum { LEASE_ATTR_MAC, LEASE_ATTR_DUID, LEASE_ATTR_HOSTID, - LEASE_ATTR_HOSTNAME, + LEASE_ATTR_NAME, LEASE_ATTR_MAX }; @@ -99,7 +105,7 @@ static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = { [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_HOSTNAME] = { .name = "hostname", .type = BLOBMSG_TYPE_STRING }, + [LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING }, }; @@ -110,7 +116,7 @@ const struct uci_blob_param_list lease_attr_list = { enum { - ODHCPD_ATTR_LEGACY, + ODHCPD_ATTR_MAINDHCP, ODHCPD_ATTR_LEASEFILE, ODHCPD_ATTR_LEASETRIGGER, ODHCPD_ATTR_MAX @@ -118,7 +124,7 @@ enum { 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 }, }; @@ -147,6 +153,8 @@ static void clean_interface(struct interface *iface) free(iface->upstream); free(iface->static_ndp); free(iface->dhcpv4_dns); + free(iface->dhcpv6_raw); + free(iface->filter_class); memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra)); } @@ -190,7 +198,7 @@ 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_LEGACY])) + if ((c = tb[ODHCPD_ATTR_MAINDHCP])) config.legacy = blobmsg_get_bool(c); if ((c = tb[ODHCPD_ATTR_LEASEFILE])) { @@ -214,7 +222,7 @@ static int set_lease(struct uci_section *s) 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_HOSTNAME])) + if ((c = tb[LEASE_ATTR_NAME])) hostlen = blobmsg_data_len(c); struct lease *lease = calloc(1, sizeof(*lease) + hostlen); @@ -247,10 +255,12 @@ static int set_lease(struct uci_section *s) lease->duid_len = len; } - if ((c = tb[LEASE_ATTR_HOSTID])) - if (odhcpd_unhexlify((uint8_t*)&lease->hostid, sizeof(lease->hostid), - blobmsg_get_string(c)) < 0) + if ((c = tb[LEASE_ATTR_HOSTID])) { + errno = 0; + lease->hostid = strtoul(blobmsg_get_string(c), NULL, 16); + if (errno) goto err; + } list_add(&lease->head, &leases); return 0; @@ -283,6 +293,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr strncpy(iface->name, name, sizeof(iface->name) - 1); list_add(&iface->head, &interfaces); + overwrite = true; } const char *ifname = NULL; @@ -304,6 +315,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if (ifname) strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1); + if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0) + return -1; + iface->inuse = true; if ((c = tb[IFACE_ATTR_DYNAMICDHCP])) @@ -435,7 +449,13 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr continue; uint8_t buf[256]; - int len = dn_comp(blobmsg_get_string(cur), buf, sizeof(buf), NULL, NULL); + char *domain = blobmsg_get_string(cur); + size_t domainlen = strlen(domain); + if (domainlen > 0 && domain[domainlen - 1] == '.') + domain[domainlen - 1] = 0; + + int len = dn_comp(domain, buf, sizeof(buf), NULL, NULL); + free(domain); if (len <= 0) goto err; @@ -448,14 +468,24 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr } } - if ((c = tb[IFACE_ATTR_ULA_COMPAT])) - iface->deprecate_ula_if_public_avail = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_FILTER_CLASS])) { + iface->filter_class = realloc(iface->filter_class, blobmsg_data_len(c) + 1); + memcpy(iface->filter_class, blobmsg_get_string(c), blobmsg_data_len(c) + 1); + } + + 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_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 ((c = tb[IFACE_ATTR_RA_OFFLINK])) iface->ra_not_onlink = blobmsg_get_bool(c); @@ -473,8 +503,18 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr goto err; } + if ((c = tb[IFACE_ATTR_PD_MANAGER])) + strncpy(iface->dhcpv6_pd_manager, blobmsg_get_string(c), + sizeof(iface->dhcpv6_pd_manager) - 1); + + if ((c = tb[IFACE_ATTR_PD_CER]) && + inet_pton(AF_INET6, blobmsg_get_string(c), &iface->dhcpv6_pd_cer) < 1) + goto err; + 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); @@ -492,12 +532,14 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if (!iface->static_ndp) goto err; + if (iface->static_ndp_len) + iface->static_ndp[iface->static_ndp_len - 1] = ' '; + memcpy(&iface->static_ndp[iface->static_ndp_len], blobmsg_get_string(cur), len); iface->static_ndp_len += len; } } - iface->ignore = (iface->ifindex = if_nametoindex(iface->ifname)) < 0; return 0; err: @@ -516,8 +558,8 @@ static int set_interface(struct uci_section *s) void odhcpd_reload(void) { struct uci_context *uci = uci_alloc_context(); - struct lease *l; - list_for_each_entry(l, &leases, head) { + while (!list_empty(&leases)) { + struct lease *l = list_first_entry(&leases, struct lease, head); list_del(&l->head); free(l->duid); free(l); @@ -536,7 +578,7 @@ void odhcpd_reload(void) struct uci_element *e; uci_foreach_element(&dhcp->sections, e) { struct uci_section *s = uci_to_section(e); - if (!strcmp(s->type, "lease")) + if (!strcmp(s->type, "host")) set_lease(s); else if (!strcmp(s->type, "odhcpd")) set_config(s); @@ -554,6 +596,23 @@ void odhcpd_reload(void) ubus_apply_network(); #endif + bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false; + + // Test for + list_for_each_entry(i, &interfaces, head) { + if (i->master) + continue; + + if (i->dhcpv6 == RELAYD_HYBRID || i->dhcpv6 == RELAYD_RELAY) + any_dhcpv6_slave = true; + + if (i->ra == RELAYD_HYBRID || i->ra == RELAYD_RELAY) + any_ra_slave = true; + + if (i->ndp == RELAYD_HYBRID || i->ndp == RELAYD_RELAY) + any_ndp_slave = true; + } + // Evaluate hybrid mode for master list_for_each_entry(i, &interfaces, head) { if (!i->master) @@ -561,19 +620,28 @@ void odhcpd_reload(void) enum odhcpd_mode hybrid_mode = RELAYD_DISABLED; #ifdef WITH_UBUS - if (ubus_has_prefix(i->name, i->ifname)) + if (!ubus_has_prefix(i->name, i->ifname)) hybrid_mode = RELAYD_RELAY; #endif if (i->dhcpv6 == RELAYD_HYBRID) i->dhcpv6 = hybrid_mode; + if (i->dhcpv6 == RELAYD_RELAY && !any_dhcpv6_slave) + i->dhcpv6 = RELAYD_DISABLED; + if (i->ra == RELAYD_HYBRID) i->ra = hybrid_mode; + if (i->ra == RELAYD_RELAY && !any_ra_slave) + i->ra = RELAYD_DISABLED; + if (i->ndp == RELAYD_HYBRID) i->ndp = hybrid_mode; + if (i->ndp == RELAYD_RELAY && !any_ndp_slave) + i->ndp = RELAYD_DISABLED; + if (i->dhcpv6 == RELAYD_RELAY || i->ra == RELAYD_RELAY || i->ndp == RELAYD_RELAY) master = i; } @@ -592,7 +660,7 @@ void odhcpd_reload(void) if (i->ndp == RELAYD_HYBRID) i->ndp = (master && master->ndp == RELAYD_RELAY) ? - RELAYD_RELAY : RELAYD_SERVER; + RELAYD_RELAY : RELAYD_DISABLED; setup_router_interface(i, true); setup_dhcpv6_interface(i, true);