iface->ndp_event.uloop.fd = -1;
iface->ndp_ping_fd = -1;
iface->dhcpv4_event.uloop.fd = -1;
+ INIT_LIST_HEAD(&iface->ia_assignments);
+ INIT_LIST_HEAD(&iface->dhcpv4_assignments);
+ INIT_LIST_HEAD(&iface->dhcpv4_fr_ips);
+
set_interface_defaults(iface);
avl_insert(&interfaces, &iface->avl);
{INADDR_ANY}, {0}};
int val = 1;
- if (!iface->dhcpv4_assignments.next)
- INIT_LIST_HEAD(&iface->dhcpv4_assignments);
-
- if (!iface->dhcpv4_fr_ips.next)
- INIT_LIST_HEAD(&iface->dhcpv4_fr_ips);
-
iface->dhcpv4_event.uloop.fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
if (iface->dhcpv4_event.uloop.fd < 0) {
syslog(LOG_ERR, "socket(AF_INET): %m");
iface->dhcpv4_event.handle_dgram = handle_dhcpv4;
odhcpd_register(&iface->dhcpv4_event);
- } else if (iface->dhcpv4_assignments.next) {
+ } else {
while (!list_empty(&iface->dhcpv4_assignments))
free_assignment(list_first_entry(&iface->dhcpv4_assignments,
struct dhcp_assignment, head));
time_t now = odhcpd_time();
avl_for_each_element(&interfaces, iface, avl) {
- if (iface->dhcpv4 != MODE_SERVER || iface->dhcpv4_assignments.next == NULL)
+ struct dhcp_assignment *a, *n;
+
+ if (iface->dhcpv4 != MODE_SERVER)
continue;
- struct dhcp_assignment *a, *n;
list_for_each_entry_safe(a, n, &iface->dhcpv4_assignments, head) {
if (!INFINITE_VALID(a->valid_until) && a->valid_until < now)
free_assignment(a);
int dhcpv6_ia_setup_interface(struct interface *iface, bool enable)
{
- if (!enable && iface->ia_assignments.next) {
+ if (!enable) {
struct dhcp_assignment *c;
while (!list_empty(&iface->ia_assignments)) {
if (enable && iface->dhcpv6 == MODE_SERVER) {
struct dhcp_assignment *border;
- if (!iface->ia_assignments.next)
- INIT_LIST_HEAD(&iface->ia_assignments);
-
if (list_empty(&iface->ia_assignments)) {
border = calloc(1, sizeof(*border));
ctxt.iface->dhcpv4 != MODE_SERVER)
continue;
- if (ctxt.iface->dhcpv6 == MODE_SERVER &&
- ctxt.iface->ia_assignments.next) {
+ if (ctxt.iface->dhcpv6 == MODE_SERVER) {
list_for_each_entry(ctxt.c, &ctxt.iface->ia_assignments, head) {
if (!(ctxt.c->flags & OAF_BOUND) || ctxt.c->managed_size < 0)
continue;
}
}
- if (ctxt.iface->dhcpv4 == MODE_SERVER &&
- ctxt.iface->dhcpv4_assignments.next) {
+ if (ctxt.iface->dhcpv4 == MODE_SERVER) {
struct dhcp_assignment *c;
+
list_for_each_entry(c, &ctxt.iface->dhcpv4_assignments, head) {
if (!(c->flags & OAF_BOUND))
continue;
avl_for_each_element(&interfaces, iface, avl) {
struct dhcp_assignment *a, *n;
- if (iface->dhcpv6 != MODE_SERVER || iface->ia_assignments.next == NULL)
+ if (iface->dhcpv6 != MODE_SERVER)
continue;
list_for_each_entry_safe(a, n, &iface->ia_assignments, head) {
a = blobmsg_open_table(&b, "device");
avl_for_each_element(&interfaces, iface, avl) {
- if (iface->dhcpv4 != MODE_SERVER || iface->dhcpv4_assignments.next == NULL)
+ if (iface->dhcpv4 != MODE_SERVER)
continue;
void *i = blobmsg_open_table(&b, iface->ifname);
a = blobmsg_open_table(&b, "device");
avl_for_each_element(&interfaces, iface, avl) {
- if (iface->dhcpv6 != MODE_SERVER || iface->ia_assignments.next == NULL)
+ if (iface->dhcpv6 != MODE_SERVER)
continue;
void *i = blobmsg_open_table(&b, iface->ifname);