#include <libgen.h>
#include <string.h>
#include <sys/stat.h>
+#include <syslog.h>
#include <uci.h>
#include <uci_blob.h>
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,
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,
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_PD_MANAGER,
IFACE_ATTR_PD_CER,
IFACE_ATTR_NDPROXY_ROUTING,
[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 },
[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_NDPROXY_ROUTING] = { .name = "ndproxy_routing", .type = BLOBMSG_TYPE_BOOL },
[IFACE_ATTR_NDPROXY_SLAVE] = { .name = "ndproxy_slave", .type = BLOBMSG_TYPE_BOOL },
};
};
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 = {
return NULL;
}
+static void set_interface_defaults(struct interface *iface)
+{
+ iface->managed = 1;
+ iface->learn_routes = 1;
+ iface->dhcpv4_leasetime = 43200;
+ iface->dhcpv6_assignall = true;
+ 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);
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)
setup_router_interface(iface, false);
setup_dhcpv6_interface(iface, false);
setup_ndp_interface(iface, false);
+#ifdef DHCPV4_SUPPORT
setup_dhcpv4_interface(iface, false);
+#endif
clean_interface(iface);
free(iface);
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));
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) {
goto err;
}
- if (time >= 60)
- return time;
+ if (time < 60)
+ time = 60;
- return 0;
+ return time;
err:
return -1;
if (time < 0)
goto err;
- if (time >= 60)
- lease->dhcpv4_leasetime = time;
+ lease->dhcpv4_leasetime = time;
}
list_add(&lease->head, &leases);
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;
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;
}
}
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;
}
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);
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);
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);
+#ifdef DHCPV4_SUPPORT
setup_dhcpv4_interface(i, !i->ignore || i->dhcpv4 != RELAYD_DISABLED);
- } else {
+#endif
+ } else
close_interface(i);
- }
}
+ ndp_handle_addr6_dump();
uci_unload(uci, dhcp);
uci_free_context(uci);
}