X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=d6b4e81ab027e8cdbfa1d0784837f4f71afbcb88;hp=e3bf78a96d55e7879fbf9b639eea3bebad2e9868;hb=9dd5316deae6402de68ddc8a08d1a6b496101828;hpb=bf4ebc0bf37c0a0dce6143f8db70b0bef40332d2;ds=sidebyside diff --git a/src/config.c b/src/config.c index e3bf78a..d6b4e81 100644 --- a/src/config.c +++ b/src/config.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -16,7 +17,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, @@ -43,7 +46,11 @@ enum { 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_MTU, IFACE_ATTR_PD_MANAGER, IFACE_ATTR_PD_CER, IFACE_ATTR_NDPROXY_ROUTING, @@ -78,7 +85,11 @@ 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_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 }, }; @@ -120,16 +131,20 @@ const struct uci_blob_param_list lease_attr_list = { }; 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 = { @@ -180,6 +195,16 @@ static struct interface* get_interface(const char *name) return NULL; } +static void set_interface_defaults(struct interface *iface) +{ + iface->managed = 1; + iface->learn_routes = 1; + iface->dhcpv4_leasetime = 43200; + iface->ra_maxinterval = 600; + iface->ra_mininterval = iface->ra_maxinterval/3; + iface->ra_lifetime = -1; +} + static void clean_interface(struct interface *iface) { free(iface->dns); @@ -190,6 +215,7 @@ 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) @@ -228,9 +254,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)); @@ -240,6 +269,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) { @@ -261,10 +299,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; @@ -324,8 +362,7 @@ 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); @@ -357,9 +394,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr strncpy(iface->name, name, sizeof(iface->name) - 1); - /* Default settings */ - iface->managed = 1; - iface->learn_routes = true; + set_interface_defaults(iface); list_add(&iface->head, &interfaces); overwrite = true; @@ -400,14 +435,13 @@ 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) + if (config.main_dhcpv4 && config.legacy) iface->dhcpv4 = RELAYD_SERVER; } @@ -445,8 +479,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; } @@ -560,15 +596,30 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_RA_MANAGEMENT])) iface->managed = blobmsg_get_u32(c); + if ((c = tb[IFACE_ATTR_RA_MTU])) { + iface->ra_mtu = blobmsg_get_u32(c); + if (iface->ra_mtu < 1280) + goto err; + } + if ((c = tb[IFACE_ATTR_RA_OFFLINK])) iface->ra_not_onlink = blobmsg_get_bool(c); 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); @@ -721,15 +772,15 @@ void odhcpd_reload(void) 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 { + setup_router_interface(i, !i->ignore || i->ra != RELAYD_DISABLED); + setup_dhcpv6_interface(i, !i->ignore || i->dhcpv6 != RELAYD_DISABLED); + setup_ndp_interface(i, !i->ignore || i->ndp != RELAYD_DISABLED); + setup_dhcpv4_interface(i, !i->ignore || i->dhcpv4 != RELAYD_DISABLED); + } else close_interface(i); - } } + ndp_handle_addr6_dump(); uci_unload(uci, dhcp); uci_free_context(uci); }