diff options
| author | Dainis Jonitis <dainis.jonitis@ubnt.com> | 2019-04-29 14:40:14 +0300 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-05-03 14:51:52 +0200 |
| commit | a2dd8d6bd918fb211db491c7dcb1810032f3f8ca (patch) | |
| tree | ee6e81ddf764b091231cd6d38eedfb671e23350a /src/dhcpv4.c | |
| parent | a17665eaabee92b04b947bb68b8717b18ace6615 (diff) | |
treewide: always init interface list heads during initialization
When allocating interface, init dhcpv4_assignments, dhcpv4_fr_ips
and ia_assignments circular list heads to point to self. Avoids
checking whether next pointer is not null all over the place.
Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
Diffstat (limited to 'src/dhcpv4.c')
| -rw-r--r-- | src/dhcpv4.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/dhcpv4.c b/src/dhcpv4.c index b25046d..905f66f 100644 --- a/src/dhcpv4.c +++ b/src/dhcpv4.c @@ -88,12 +88,6 @@ int dhcpv4_setup_interface(struct interface *iface, bool enable) {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"); @@ -160,7 +154,7 @@ int dhcpv4_setup_interface(struct interface *iface, bool enable) 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)); @@ -347,10 +341,11 @@ static void valid_until_cb(struct uloop_timeout *event) 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); |