X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=src%2Fconfig.c;h=19b901c87cd41c19911f54d0077bc33d476e2cd5;hb=296b4a0ddd7d6d77e48ee36f3407b0769caaa0d7;hp=8670efc316d943a74fe26b23e5422d8b94f44b06;hpb=f4d38e0a853e933a4da54fde8ec2711b5dc5b741;p=project%2Fodhcpd.git diff --git a/src/config.c b/src/config.c index 8670efc..19b901c 100644 --- a/src/config.c +++ b/src/config.c @@ -43,6 +43,7 @@ enum { IFACE_ATTR_DOMAIN, IFACE_ATTR_FILTER_CLASS, IFACE_ATTR_DHCPV6_RAW, + IFACE_ATTR_DHCPV6_ASSIGNALL, IFACE_ATTR_RA_DEFAULT, IFACE_ATTR_RA_MANAGEMENT, IFACE_ATTR_RA_OFFLINK, @@ -83,6 +84,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_DOMAIN] = { .name = "domain", .type = BLOBMSG_TYPE_ARRAY }, [IFACE_ATTR_FILTER_CLASS] = { .name = "filter_class", .type = BLOBMSG_TYPE_STRING }, [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 }, @@ -205,9 +207,10 @@ static struct interface* get_interface(const char *name) static void set_interface_defaults(struct interface *iface) { - iface->ra_managed = RA_MANAGED_MFLAG; 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; @@ -617,6 +620,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr 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);