#include <signal.h>
#include <arpa/inet.h>
#include <unistd.h>
+#include <libgen.h>
+#include <string.h>
+#include <sys/stat.h>
#include <uci.h>
#include <uci_blob.h>
.info = iface_attr_info,
};
-
enum {
LEASE_ATTR_IP,
LEASE_ATTR_MAC,
LEASE_ATTR_DUID,
LEASE_ATTR_HOSTID,
+ LEASE_ATTR_LEASETIME,
LEASE_ATTR_NAME,
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 },
[LEASE_ATTR_DUID] = { .name = "duid", .type = BLOBMSG_TYPE_STRING },
[LEASE_ATTR_HOSTID] = { .name = "hostid", .type = BLOBMSG_TYPE_STRING },
+ [LEASE_ATTR_LEASETIME] = { .name = "leasetime", .type = BLOBMSG_TYPE_STRING },
[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_MAINDHCP,
ODHCPD_ATTR_LEASEFILE,
ODHCPD_ATTR_MAX
};
-
static const struct blobmsg_policy odhcpd_attrs[LEASE_ATTR_MAX] = {
[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 },
};
-
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 struct interface* get_interface(const char *name)
{
return NULL;
}
-
static void clean_interface(struct interface *iface)
{
free(iface->dns);
memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra));
}
-
static void close_interface(struct interface *iface)
{
if (iface->head.next)
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;
}
}
+static double parse_leasetime(struct blob_attr *c) {
+ 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')
+ time *= 60;
+ else if (endptr[0] == 'h')
+ time *= 3600;
+ else if (endptr[0] == 'd')
+ time *= 24 * 3600;
+ else if (endptr[0] == 'w')
+ time *= 7 * 24 * 3600;
+ else
+ goto err;
+ }
+
+ if (time >= 60)
+ return time;
+
+ return 0;
+
+err:
+ return -1;
+}
static int set_lease(struct uci_section *s)
{
goto err;
}
+ if ((c = tb[LEASE_ATTR_LEASETIME])) {
+ double time = parse_leasetime(c);
+ if (time < 0)
+ goto err;
+
+ if (time >= 60)
+ lease->dhcpv4_leasetime = time;
+ }
+
list_add(&lease->head, &leases);
return 0;
return -1;
}
-
int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
{
struct blob_attr *tb[IFACE_ATTR_MAX], *c;
return -1;
strncpy(iface->name, name, sizeof(iface->name) - 1);
+
+ /* Default settings */
+ iface->managed = 1;
+ iface->learn_routes = true;
+
list_add(&iface->head, &interfaces);
overwrite = true;
}
iface->ignore = blobmsg_get_bool(c);
if ((c = tb[IFACE_ATTR_LEASETIME])) {
- char *val = blobmsg_get_string(c), *endptr;
- double time = strtod(val, &endptr);
- if (time && endptr[0]) {
- if (endptr[0] == 's')
- time *= 1;
- else if (endptr[0] == 'm')
- time *= 60;
- else if (endptr[0] == 'h')
- time *= 3600;
- else if (endptr[0] == 'd')
- time *= 24 * 3600;
- else if (endptr[0] == 'w')
- time *= 7 * 24 * 3600;
- else
- goto err;
- }
+ double time = parse_leasetime(c);
+ if (time < 0)
+ goto err;
if (time >= 60)
iface->dhcpv4_leasetime = time;
unsigned rem;
blobmsg_for_each_attr(cur, c, rem) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
continue;
iface->upstream = realloc(iface->upstream,
unsigned rem;
blobmsg_for_each_attr(cur, c, rem) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
continue;
struct in_addr addr4;
goto err;
iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;
- } else {
+ } else
goto err;
- }
}
}
iface->always_rewrite_dns = true;
blobmsg_for_each_attr(cur, c, rem) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
continue;
struct in_addr addr4;
goto err;
iface->dns[iface->dns_cnt - 1] = addr6;
- } else {
+ } else
goto err;
- }
}
}
unsigned rem;
blobmsg_for_each_attr(cur, c, rem) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
continue;
uint8_t buf[256];
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);
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);
{
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);
}
}
+ if (config.dhcp_statefile) {
+ char *path = strdup(config.dhcp_statefile);
+
+ mkdir_p(dirname(path), 0755);
+ free(path);
+ }
#ifdef WITH_UBUS
ubus_apply_network();
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;
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;
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;
uci_free_context(uci);
}
-
static void handle_signal(int signal)
{
char b[1] = {0};
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();
}
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);
projects / project / odhcpd.git / blobdiff