#include <arpa/inet.h>
#include <unistd.h>
#include <libgen.h>
+#include <net/if.h>
#include <string.h>
#include <sys/stat.h>
#include <syslog.h>
#include <uci.h>
#include <uci_blob.h>
+#include <libubox/utils.h>
#include "odhcpd.h"
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_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 },
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_managed = RA_MANAGED_MFLAG;
iface->ra_maxinterval = 600;
iface->ra_mininterval = iface->ra_maxinterval/3;
iface->ra_lifetime = -1;
setup_dhcpv4_interface(iface, false);
clean_interface(iface);
+ free(iface->addr4);
+ free(iface->ia_addr);
+ free(iface->ifname);
free(iface);
}
int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
{
struct blob_attr *tb[IFACE_ATTR_MAX], *c;
+ bool get_addrs = false;
+
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, data, len);
if (tb[IFACE_ATTR_INTERFACE])
struct interface *iface = get_interface(name);
if (!iface) {
- iface = calloc(1, sizeof(*iface));
+ char *iface_name;
+
+ iface = calloc_a(sizeof(*iface), &iface_name, strlen(name) + 1);
if (!iface)
return -1;
- strncpy(iface->name, name, sizeof(iface->name) - 1);
+ iface->name = strcpy(iface_name, name);
set_interface_defaults(iface);
list_add(&iface->head, &interfaces);
- overwrite = true;
+ get_addrs = overwrite = true;
}
const char *ifname = NULL;
}
#ifdef WITH_UBUS
- if (overwrite || !iface->ifname[0])
+ if (overwrite || !iface->ifname)
ifname = ubus_get_ifname(name);
#endif
- if (!iface->ifname[0] && !ifname)
+ if (!iface->ifname && !ifname)
goto err;
- if (ifname)
- strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
+ if (ifname) {
+ free(iface->ifname);
+ iface->ifname = strdup(ifname);
+
+ if (!iface->ifname)
+ goto err;
+ }
if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
goto err;
+ if (get_addrs) {
+ ssize_t len = odhcpd_get_interface_addresses(iface->ifindex,
+ true, &iface->ia_addr);
+
+ if (len > 0)
+ iface->ia_addr_len = len;
+
+ len = odhcpd_get_interface_addresses(iface->ifindex,
+ false, &iface->addr4);
+ if (len > 0)
+ iface->addr4_len = len;
+ }
+
iface->inuse = true;
if ((c = tb[IFACE_ATTR_DYNAMICDHCP]))
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_MANAGEMENT]))
- iface->managed = blobmsg_get_u32(c);
+ iface->ra_managed = blobmsg_get_u32(c);
if ((c = tb[IFACE_ATTR_RA_REACHABLETIME])) {
- iface->ra_reachabletime = blobmsg_get_u32(c);
- if (iface->ra_reachabletime > 3600000)
+ uint32_t ra_reachabletime = blobmsg_get_u32(c);
+ if (ra_reachabletime > 3600000)
goto err;
+
+ iface->ra_reachabletime = ra_reachabletime;
}
- if ((c = tb[IFACE_ATTR_RA_RETRANSTIME]))
- iface->ra_retranstime = blobmsg_get_u32(c);
+ if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) {
+ uint32_t ra_retranstime = blobmsg_get_u32(c);
+ if (ra_retranstime > 60000)
+ goto err;
+
+ iface->ra_retranstime = ra_retranstime;
+ }
if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) {
- iface->ra_hoplimit = blobmsg_get_u32(c);
- if (iface->ra_hoplimit > 255)
+ uint32_t ra_hoplimit = blobmsg_get_u32(c);
+ if (ra_hoplimit > 255)
goto err;
+
+ iface->ra_hoplimit = ra_hoplimit;
}
if ((c = tb[IFACE_ATTR_RA_MTU])) {
- iface->ra_mtu = blobmsg_get_u32(c);
- if (iface->ra_mtu < 1280)
+ uint32_t ra_mtu = blobmsg_get_u32(c);
+ if (ra_mtu < 1280 || ra_mtu > 65535)
goto err;
+
+ iface->ra_mtu = ra_mtu;
}
if ((c = tb[IFACE_ATTR_RA_OFFLINK]))
close_interface(i);
}
- ndp_handle_addr6_dump();
uci_unload(uci, dhcp);
uci_free_context(uci);
}