+#include <fcntl.h>
#include <resolv.h>
#include <signal.h>
#include <arpa/inet.h>
+#include <unistd.h>
#include <uci.h>
#include <uci_blob.h>
#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};
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,
[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 },
LEASE_ATTR_MAC,
LEASE_ATTR_DUID,
LEASE_ATTR_HOSTID,
- LEASE_ATTR_HOSTNAME,
+ LEASE_ATTR_NAME,
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 },
};
enum {
- ODHCPD_ATTR_LEGACY,
+ ODHCPD_ATTR_MAINDHCP,
ODHCPD_ATTR_LEASEFILE,
ODHCPD_ATTR_LEASETRIGGER,
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 },
};
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));
}
struct blob_attr *tb[ODHCPD_ATTR_MAX], *c;
blob_buf_init(&b, 0);
- uci_to_blob(&b, s, &lease_attr_list);
- blobmsg_parse(lease_attrs, ODHCPD_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head));
+ 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])) {
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);
+ if (!lease)
+ goto err;
if (hostlen > 1)
memcpy(lease->hostname, blobmsg_get_string(c), hostlen);
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 = odhcpd_unhexlify(lease->duid,
duidlen, blobmsg_get_string(c));
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;
err:
- free(lease->duid);
- free(lease);
+ if (lease) {
+ free(lease->duid);
+ free(lease);
+ }
return -1;
}
-int config_parse_interface(struct blob_attr *b, const char *name, bool overwrite)
+int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
{
struct blob_attr *tb[IFACE_ATTR_MAX], *c;
- blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(b), blob_len(b));
+ blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, data, len);
if (tb[IFACE_ATTR_INTERFACE])
name = blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]);
struct interface *iface = get_interface(name);
if (!iface) {
iface = calloc(1, sizeof(*iface));
+ if (!iface)
+ return -1;
+
strncpy(iface->name, name, sizeof(iface->name) - 1);
list_add(&iface->head, &interfaces);
- } else {
- clean_interface(iface);
+ overwrite = true;
}
const char *ifname = NULL;
#ifdef WITH_UBUS
- if (overwrite)
+ if (overwrite || !iface->ifname[0])
ifname = ubus_get_ifname(name);
#endif
- if ((c = tb[IFACE_ATTR_IFNAME]))
- ifname = blobmsg_get_string(c);
- else if ((c = tb[IFACE_ATTR_NETWORKID]))
- ifname = blobmsg_get_string(c);
- if (!ifname)
+ if (overwrite) {
+ if ((c = tb[IFACE_ATTR_IFNAME]))
+ ifname = blobmsg_get_string(c);
+ else if ((c = tb[IFACE_ATTR_NETWORKID]))
+ ifname = blobmsg_get_string(c);
+ }
+
+ if (!iface->ifname[0] && !ifname)
return -1;
- strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
- iface->inuse = true;
+ if (ifname)
+ strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
- if (overwrite)
- clean_interface(iface);
+ if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
+ return -1;
+
+ iface->inuse = true;
if ((c = tb[IFACE_ATTR_DYNAMICDHCP]))
iface->no_dynamic_dhcp = !blobmsg_get_bool(c);
- if ((c = tb[IFACE_ATTR_IGNORE]))
+ if (overwrite && (c = tb[IFACE_ATTR_IGNORE]))
iface->ignore = blobmsg_get_bool(c);
if ((c = tb[IFACE_ATTR_LEASETIME])) {
if ((c = tb[IFACE_ATTR_MASTER]))
iface->master = blobmsg_get_bool(c);
- if ((c = tb[IFACE_ATTR_UPSTREAM])) {
+ if (overwrite && (c = tb[IFACE_ATTR_UPSTREAM])) {
struct blob_attr *cur;
unsigned rem;
iface->upstream = realloc(iface->upstream,
iface->upstream_len + blobmsg_data_len(cur));
+ if (!iface->upstream)
+ goto err;
+
memcpy(iface->upstream + iface->upstream_len, blobmsg_get_string(cur), blobmsg_data_len(cur));
iface->upstream_len += blobmsg_data_len(cur);
}
if (inet_pton(AF_INET, blobmsg_get_string(cur), &addr4) == 1) {
iface->dhcpv4_dns = realloc(iface->dhcpv4_dns,
(++iface->dhcpv4_dns_cnt) * sizeof(*iface->dhcpv4_dns));
+ if (!iface->dhcpv4_dns)
+ goto err;
+
iface->dhcpv4_dns[iface->dhcpv4_dns_cnt - 1] = addr4;
} else if (inet_pton(AF_INET6, blobmsg_get_string(cur), &addr6) == 1) {
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;
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;
iface->search = realloc(iface->search, iface->search_len + len);
+ if (!iface->search)
+ goto err;
+
memcpy(&iface->search[iface->search_len], buf, len);
iface->search_len += len;
}
}
- 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);
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);
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] = ' ';
+
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:
{
blob_buf_init(&b, 0);
uci_to_blob(&b, s, &interface_attr_list);
- return config_parse_interface(b.head, s->e.name, true);
+ return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true);
}
-static volatile int do_reload = false;
-static void set_stop(int signal)
-{
- uloop_end();
- do_reload = (signal == SIGHUP);
-}
-
-void odhcpd_run(void)
+void odhcpd_reload(void)
{
struct uci_context *uci = uci_alloc_context();
- signal(SIGTERM, set_stop);
- signal(SIGHUP, set_stop);
- signal(SIGINT, set_stop);
+ while (!list_empty(&leases)) {
+ struct lease *l = list_first_entry(&leases, struct lease, head);
+ list_del(&l->head);
+ free(l->duid);
+ free(l);
+ }
-#ifdef WITH_UBUS
- init_ubus();
-#endif
+ struct interface *master = NULL, *i, *n;
- do {
- do_reload = uloop_cancelled = false;
+ if (!uci)
+ return;
- struct lease *l;
- list_for_each_entry(l, &leases, head) {
- list_del(&l->head);
- free(l->duid);
- free(l);
- }
+ list_for_each_entry(i, &interfaces, head)
+ clean_interface(i);
- struct uci_package *dhcp = NULL;
- if (!uci_load(uci, "dhcp", &dhcp)) {
- struct uci_element *e;
- uci_foreach_element(&dhcp->sections, e) {
- struct uci_section *s = uci_to_section(e);
- if (!strcmp(s->type, "lease"))
- set_lease(s);
- else if (!strcmp(s->type, "odhcpd"))
- set_config(s);
- }
+ struct uci_package *dhcp = NULL;
+ if (!uci_load(uci, "dhcp", &dhcp)) {
+ struct uci_element *e;
+ 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"))
+ set_config(s);
+ }
- uci_foreach_element(&dhcp->sections, e) {
- struct uci_section *s = uci_to_section(e);
- if (!strcmp(s->type, "dhcp"))
- set_interface(s);
- }
+ uci_foreach_element(&dhcp->sections, e) {
+ struct uci_section *s = uci_to_section(e);
+ if (!strcmp(s->type, "dhcp"))
+ set_interface(s);
}
+ }
+
#ifdef WITH_UBUS
- ubus_apply_network();
+ ubus_apply_network();
#endif
- // Evaluate hybrid mode for master
- struct interface *master = NULL, *i, *n;
- list_for_each_entry(i, &interfaces, head) {
- if (!i->master)
- continue;
+ 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)
+ continue;
- enum odhcpd_mode hybrid_mode = RELAYD_DISABLED;
+ enum odhcpd_mode hybrid_mode = RELAYD_DISABLED;
#ifdef WITH_UBUS
- if (ubus_has_prefix(i->name, i->ifname))
- hybrid_mode = RELAYD_RELAY;
+ 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;
+ }
+
+
+ list_for_each_entry_safe(i, n, &interfaces, head) {
+ if (i->inuse) {
+ // Resolve hybrid mode
if (i->dhcpv6 == RELAYD_HYBRID)
- i->dhcpv6 = hybrid_mode;
+ i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
+ RELAYD_RELAY : RELAYD_SERVER;
if (i->ra == RELAYD_HYBRID)
- i->ra = hybrid_mode;
+ i->ra = (master && master->ra == RELAYD_RELAY) ?
+ RELAYD_RELAY : RELAYD_SERVER;
if (i->ndp == RELAYD_HYBRID)
- i->ndp = hybrid_mode;
-
- if (i->dhcpv6 == RELAYD_RELAY || i->ra == RELAYD_RELAY || i->ndp == RELAYD_RELAY)
- master = i;
+ 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 {
+ close_interface(i);
}
+ }
+ uci_unload(uci, dhcp);
+ uci_free_context(uci);
+}
- list_for_each_entry_safe(i, n, &interfaces, head) {
- 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;
+static void handle_signal(int signal)
+{
+ char b[1] = {0};
+ if (signal == SIGHUP)
+ write(reload_pipe[1], b, sizeof(b));
+ else
+ uloop_end();
+}
- if (i->ndp == RELAYD_HYBRID)
- i->ndp = (master && master->ndp == RELAYD_RELAY) ?
- RELAYD_RELAY : RELAYD_SERVER;
- setup_router_interface(i, true);
- setup_dhcpv6_interface(i, true);
- setup_ndp_interface(i, true);
- setup_dhcpv4_interface(i, true);
- } else {
- close_interface(i);
- }
- }
- uloop_run();
+static void reload_cb(struct uloop_fd *u, _unused unsigned int events)
+{
+ char b[512];
+ read(u->fd, b, sizeof(b));
+ odhcpd_reload();
+}
+
+static struct uloop_fd reload_fd = { .cb = reload_cb };
+
+void odhcpd_run(void)
+{
+ pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC);
+ reload_fd.fd = reload_pipe[0];
+ uloop_fd_add(&reload_fd, ULOOP_READ);
+
+ signal(SIGTERM, handle_signal);
+ signal(SIGINT, handle_signal);
+ signal(SIGHUP, handle_signal);
+
+#ifdef WITH_UBUS
+ while (init_ubus())
+ sleep(1);
+#endif
- if (dhcp)
- uci_unload(uci, dhcp);
- } while (do_reload);
+ odhcpd_reload();
+ uloop_run();
}
projects / project / odhcpd.git / blobdiff