X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=211ac1fd7a9a9b49df2d4c751c84dfab6bdc3091;hp=ef511129f64c3a9e290d6084830c5ec70332edd5;hb=2cb6b4872a1981f2acce40018107481c82a529dc;hpb=e63a2837acfaf54c97a9db466bf485e9f7024fe8 diff --git a/src/config.c b/src/config.c index ef51112..211ac1f 100644 --- a/src/config.c +++ b/src/config.c @@ -3,6 +3,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -13,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, @@ -40,7 +46,13 @@ 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_REACHABLETIME, + IFACE_ATTR_RA_HOPLIMIT, + IFACE_ATTR_RA_MTU, IFACE_ATTR_PD_MANAGER, IFACE_ATTR_PD_CER, IFACE_ATTR_NDPROXY_ROUTING, @@ -75,7 +87,13 @@ 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_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 }, }; @@ -92,7 +110,6 @@ const struct uci_blob_param_list interface_attr_list = { .info = iface_attr_info, }; - enum { LEASE_ATTR_IP, LEASE_ATTR_MAC, @@ -103,7 +120,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 +129,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: %s\n", dir, mask, strerror(errno)); + + 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 +199,15 @@ 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) { @@ -161,9 +219,9 @@ 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) @@ -178,23 +236,20 @@ static void close_interface(struct interface *iface) free(iface); } - static int parse_mode(const char *mode) { - if (!strcmp(mode, "disabled")) { + if (!strcmp(mode, "disabled")) return RELAYD_DISABLED; - } else if (!strcmp(mode, "server")) { + else if (!strcmp(mode, "server")) return RELAYD_SERVER; - } else if (!strcmp(mode, "relay")) { + else if (!strcmp(mode, "relay")) return RELAYD_RELAY; - } else if (!strcmp(mode, "hybrid")) { + else if (!strcmp(mode, "hybrid")) return RELAYD_HYBRID; - } else { + else return -1; - } } - static void set_config(struct uci_section *s) { struct blob_attr *tb[ODHCPD_ATTR_MAX], *c; @@ -203,9 +258,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,12 +273,22 @@ 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; - double time = strtod(val, &endptr); - if (time && endptr[0]) { + 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') @@ -235,10 +303,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; @@ -298,22 +366,19 @@ 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; @@ -332,6 +397,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr return -1; strncpy(iface->name, name, sizeof(iface->name) - 1); + + set_interface_defaults(iface); + list_add(&iface->head, &interfaces); overwrite = true; } @@ -371,14 +439,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; } @@ -416,8 +483,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; } @@ -452,9 +521,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; - } } } @@ -483,9 +551,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; - } } } @@ -532,8 +599,24 @@ 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); - else if (overwrite) - iface->managed = 1; + + if ((c = tb[IFACE_ATTR_RA_REACHABLETIME])) { + iface->ra_reachabletime = blobmsg_get_u32(c); + if (iface->ra_reachabletime > 3600000) + goto err; + } + + if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) { + iface->ra_hoplimit = blobmsg_get_u32(c); + if (iface->ra_hoplimit > 255) + goto err; + } + + 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); @@ -541,9 +624,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); @@ -567,8 +659,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr 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); @@ -584,19 +674,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; @@ -624,6 +711,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(); @@ -631,7 +724,7 @@ 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; @@ -646,7 +739,7 @@ void odhcpd_reload(void) 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; @@ -682,7 +775,7 @@ void odhcpd_reload(void) list_for_each_entry_safe(i, n, &interfaces, head) { if (i->inuse) { - // Resolve hybrid mode + /* Resolve hybrid mode */ if (i->dhcpv6 == RELAYD_HYBRID) i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ? RELAYD_RELAY : RELAYD_SERVER; @@ -695,20 +788,19 @@ 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); } - static void handle_signal(int signal) { char b[1] = {0}; @@ -719,12 +811,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(); } @@ -733,6 +824,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);