treewide: fix compiler warnings
[project/odhcpd.git] / src / router.c
index 70f946280d55edbe40099e02b33a6c102c813340..9055367e0b00cd75b32d956d64129e649557f8b7 100644 (file)
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2018 Hans Dedecker <dedeckeh@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
 #include <arpa/inet.h>
 #include <net/route.h>
 
+#include <libubox/utils.h>
+
 #include "router.h"
 #include "odhcpd.h"
 
 
 static void forward_router_solicitation(const struct interface *iface);
-static void forward_router_advertisement(uint8_t *data, size_t len);
+static void forward_router_advertisement(const struct interface *iface, uint8_t *data, size_t len);
 
 static void handle_icmpv6(void *addr, void *data, size_t len,
                struct interface *iface, void *dest);
 static void trigger_router_advert(struct uloop_timeout *event);
 static void router_netevent_cb(unsigned long event, struct netevent_handler_info *info);
 
-static struct odhcpd_event router_event = {.uloop = {.fd = -1}, .handle_dgram = handle_icmpv6, };
 static struct netevent_handler router_netevent_handler = { .cb = router_netevent_cb, };
 
 static FILE *fp_route = NULL;
@@ -45,78 +47,8 @@ static FILE *fp_route = NULL;
 
 int router_init(void)
 {
-       struct icmp6_filter filt;
        int ret = 0;
 
-       /* Open ICMPv6 socket */
-       router_event.uloop.fd = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC, IPPROTO_ICMPV6);
-       if (router_event.uloop.fd < 0) {
-               syslog(LOG_ERR, "socket(AF_INET6): %m");
-               ret = -1;
-               goto out;
-       }
-
-       /* Let the kernel compute our checksums */
-       int val = 2;
-       if (setsockopt(router_event.uloop.fd, IPPROTO_RAW, IPV6_CHECKSUM,
-                               &val, sizeof(val)) < 0) {
-               syslog(LOG_ERR, "setsockopt(IPV6_CHECKSUM): %m");
-               ret = -1;
-               goto out;
-       }
-
-       /* This is required by RFC 4861 */
-       val = 255;
-       if (setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
-                               &val, sizeof(val)) < 0) {
-               syslog(LOG_ERR, "setsockopt(IPV6_MULTICAST_HOPS): %m");
-               ret = -1;
-               goto out;
-       }
-
-       if (setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
-                               &val, sizeof(val)) < 0) {
-               syslog(LOG_ERR, "setsockopt(IPV6_UNICAST_HOPS): %m");
-               ret = -1;
-               goto out;
-       }
-
-       /* We need to know the source interface */
-       val = 1;
-       if (setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
-                               &val, sizeof(val)) < 0) {
-               syslog(LOG_ERR, "setsockopt(IPV6_RECVPKTINFO): %m");
-               ret = -1;
-               goto out;
-       }
-
-       if (setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT,
-                               &val, sizeof(val)) < 0) {
-               syslog(LOG_ERR, "setsockopt(IPV6_RECVHOPLIMIT): %m");
-               ret = -1;
-               goto out;
-       }
-
-       /* Don't loop back */
-       val = 0;
-       if (setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
-                               &val, sizeof(val)) < 0) {
-               syslog(LOG_ERR, "setsockopt(IPV6_MULTICAST_LOOP): %m");
-               ret = -1;
-               goto out;
-       }
-
-       /* Filter ICMPv6 package types */
-       ICMP6_FILTER_SETBLOCKALL(&filt);
-       ICMP6_FILTER_SETPASS(ND_ROUTER_ADVERT, &filt);
-       ICMP6_FILTER_SETPASS(ND_ROUTER_SOLICIT, &filt);
-       if (setsockopt(router_event.uloop.fd, IPPROTO_ICMPV6, ICMP6_FILTER,
-                               &filt, sizeof(filt)) < 0) {
-               syslog(LOG_ERR, "setsockopt(ICMP6_FILTER): %m");
-               ret = -1;
-               goto out;
-       }
-
        if (!(fp_route = fopen("/proc/net/ipv6_route", "r"))) {
                syslog(LOG_ERR, "fopen(/proc/net/ipv6_route): %m");
                ret = -1;
@@ -126,22 +58,12 @@ int router_init(void)
        if (netlink_add_netevent_handler(&router_netevent_handler) < 0) {
                syslog(LOG_ERR, "Failed to add netevent handler");
                ret = -1;
-               goto out;
        }
 
-       /* Register socket */
-       odhcpd_register(&router_event);
 out:
-       if (ret < 0) {
-               if (router_event.uloop.fd > 0) {
-                       close(router_event.uloop.fd);
-                       router_event.uloop.fd = -1;
-               }
-
-               if (fp_route) {
-                       fclose(fp_route);
-                       fp_route = NULL;
-               }
+       if (ret < 0 && fp_route) {
+               fclose(fp_route);
+               fp_route = NULL;
        }
 
        return ret;
@@ -150,48 +72,149 @@ out:
 
 int router_setup_interface(struct interface *iface, bool enable)
 {
-       struct ipv6_mreq mreq;
        int ret = 0;
 
-       if (!fp_route || router_event.uloop.fd < 0) {
+       if (!fp_route) {
                ret = -1;
                goto out;
        }
 
-       uloop_timeout_cancel(&iface->timer_rs);
-       iface->timer_rs.cb = NULL;
 
-       memset(&mreq, 0, sizeof(mreq));
-       mreq.ipv6mr_interface = iface->ifindex;
-       inet_pton(AF_INET6, ALL_IPV6_NODES, &mreq.ipv6mr_multiaddr);
-       setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
-                       &mreq, sizeof(mreq));
+       if ((!enable || iface->ra == MODE_DISABLED) && iface->router_event.uloop.fd >= 0) {
+               if (!iface->master) {
+                       uloop_timeout_cancel(&iface->timer_rs);
+                       iface->timer_rs.cb = NULL;
 
-       inet_pton(AF_INET6, ALL_IPV6_ROUTERS, &mreq.ipv6mr_multiaddr);
-       setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
-                       &mreq, sizeof(mreq));
-
-       if (!enable) {
-               if (iface->ra == MODE_SERVER || (iface->ra == MODE_RELAY && !iface->master))
                        trigger_router_advert(&iface->timer_rs);
-       } else {
+               }
+
+               uloop_fd_delete(&iface->router_event.uloop);
+               close(iface->router_event.uloop.fd);
+               iface->router_event.uloop.fd = -1;
+       } else if (enable && iface->ra != MODE_DISABLED) {
+               struct icmp6_filter filt;
+               struct ipv6_mreq mreq;
+               int val = 2;
+
+               if (iface->router_event.uloop.fd < 0) {
+                       /* Open ICMPv6 socket */
+                       iface->router_event.uloop.fd = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC,
+                                                             IPPROTO_ICMPV6);
+                       if (iface->router_event.uloop.fd < 0) {
+                               syslog(LOG_ERR, "socket(AF_INET6): %m");
+                               ret = -1;
+                               goto out;
+                       }
+
+                       if (setsockopt(iface->router_event.uloop.fd, SOL_SOCKET, SO_BINDTODEVICE,
+                                      iface->ifname, strlen(iface->ifname)) < 0) {
+                               syslog(LOG_ERR, "setsockopt(SO_BINDTODEVICE): %m");
+                               ret = -1;
+                               goto out;
+                       }
+
+                       /* Let the kernel compute our checksums */
+                       if (setsockopt(iface->router_event.uloop.fd, IPPROTO_RAW, IPV6_CHECKSUM,
+                                      &val, sizeof(val)) < 0) {
+                               syslog(LOG_ERR, "setsockopt(IPV6_CHECKSUM): %m");
+                               ret = -1;
+                               goto out;
+                       }
+
+                       /* This is required by RFC 4861 */
+                       val = 255;
+                       if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
+                                      &val, sizeof(val)) < 0) {
+                               syslog(LOG_ERR, "setsockopt(IPV6_MULTICAST_HOPS): %m");
+                               ret = -1;
+                               goto out;
+                       }
+
+                       if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
+                                      &val, sizeof(val)) < 0) {
+                               syslog(LOG_ERR, "setsockopt(IPV6_UNICAST_HOPS): %m");
+                               ret = -1;
+                               goto out;
+                       }
+
+                       /* We need to know the source interface */
+                       val = 1;
+                       if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
+                                      &val, sizeof(val)) < 0) {
+                               syslog(LOG_ERR, "setsockopt(IPV6_RECVPKTINFO): %m");
+                               ret = -1;
+                               goto out;
+                       }
+
+                       if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT,
+                                      &val, sizeof(val)) < 0) {
+                               syslog(LOG_ERR, "setsockopt(IPV6_RECVHOPLIMIT): %m");
+                               ret = -1;
+                               goto out;
+                       }
+
+                       /* Don't loop back */
+                       val = 0;
+                       if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
+                                      &val, sizeof(val)) < 0) {
+                               syslog(LOG_ERR, "setsockopt(IPV6_MULTICAST_LOOP): %m");
+                               ret = -1;
+                               goto out;
+                       }
+
+                       /* Filter ICMPv6 package types */
+                       ICMP6_FILTER_SETBLOCKALL(&filt);
+                       ICMP6_FILTER_SETPASS(ND_ROUTER_ADVERT, &filt);
+                       ICMP6_FILTER_SETPASS(ND_ROUTER_SOLICIT, &filt);
+                       if (setsockopt(iface->router_event.uloop.fd, IPPROTO_ICMPV6, ICMP6_FILTER,
+                                      &filt, sizeof(filt)) < 0) {
+                               syslog(LOG_ERR, "setsockopt(ICMP6_FILTER): %m");
+                               ret = -1;
+                               goto out;
+                       }
+
+                       iface->router_event.handle_dgram = handle_icmpv6;
+                       odhcpd_register(&iface->router_event);
+               } else {
+                       uloop_timeout_cancel(&iface->timer_rs);
+                       iface->timer_rs.cb = NULL;
+
+                       memset(&mreq, 0, sizeof(mreq));
+                       mreq.ipv6mr_interface = iface->ifindex;
+                       inet_pton(AF_INET6, ALL_IPV6_NODES, &mreq.ipv6mr_multiaddr);
+                       setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
+                                  &mreq, sizeof(mreq));
+
+                       inet_pton(AF_INET6, ALL_IPV6_ROUTERS, &mreq.ipv6mr_multiaddr);
+                       setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
+                                  &mreq, sizeof(mreq));
+               }
+
+               memset(&mreq, 0, sizeof(mreq));
+               mreq.ipv6mr_interface = iface->ifindex;
+               inet_pton(AF_INET6, ALL_IPV6_ROUTERS, &mreq.ipv6mr_multiaddr);
+
                if (iface->ra == MODE_RELAY && iface->master) {
                        inet_pton(AF_INET6, ALL_IPV6_NODES, &mreq.ipv6mr_multiaddr);
                        forward_router_solicitation(iface);
-               } else if (iface->ra == MODE_SERVER && !iface->master) {
+               } else if (iface->ra == MODE_SERVER) {
                        iface->timer_rs.cb = trigger_router_advert;
                        uloop_timeout_set(&iface->timer_rs, 1000);
                }
 
-               if (iface->ra == MODE_RELAY || (iface->ra == MODE_SERVER && !iface->master)) {
-                       if (setsockopt(router_event.uloop.fd, IPPROTO_IPV6,
-                                       IPV6_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
-                               ret = -1;
-                               syslog(LOG_ERR, "setsockopt(IPV6_ADD_MEMBERSHIP): %m");
-                       }
+               if (setsockopt(iface->router_event.uloop.fd, IPPROTO_IPV6,
+                              IPV6_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) {
+                       ret = -1;
+                       syslog(LOG_ERR, "setsockopt(IPV6_ADD_MEMBERSHIP): %m");
+                       goto out;
                }
        }
 out:
+       if (ret < 0 && iface->router_event.uloop.fd >= 0) {
+               close(iface->router_event.uloop.fd);
+               iface->router_event.uloop.fd = -1;
+       }
+
        return ret;
 }
 
@@ -206,7 +229,7 @@ static void router_netevent_cb(unsigned long event, struct netevent_handler_info
                if (info->rt.dst_len)
                        break;
 
-               list_for_each_entry(iface, &interfaces, head) {
+               avl_for_each_element(&interfaces, iface, avl) {
                        if (iface->ra == MODE_SERVER && !iface->master)
                                uloop_timeout_set(&iface->timer_rs, 1000);
                }
@@ -289,7 +312,6 @@ static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len)
                                        break;
                                }
                        }
-
                }
        }
 
@@ -356,6 +378,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        time_t now = odhcpd_time();
        int mtu = iface->ra_mtu;
        int hlim = iface->ra_hoplimit;
+       char buf[INET6_ADDRSTRLEN];
 
        if (mtu == 0)
                mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
@@ -421,11 +444,19 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                        default_route = true;
        }
 
-
-       struct in6_addr dns_pref, *dns_addr = &dns_pref;
-       size_t dns_cnt = 1;
-
-       odhcpd_get_interface_dns_addr(iface, &dns_pref);
+       /* DNS Recursive DNS */
+       struct in6_addr dns_pref, *dns_addr = NULL;
+       size_t dns_cnt = 0;
+
+       if (iface->ra_dns) {
+               if (iface->dns_cnt > 0) {
+                       dns_addr = iface->dns;
+                       dns_cnt = iface->dns_cnt;
+               } else if (!odhcpd_get_interface_dns_addr(iface, &dns_pref)) {
+                       dns_addr = &dns_pref;
+                       dns_cnt = 1;
+               }
+       }
 
        /* Construct Prefix Information options */
        size_t pfxs_cnt = 0;
@@ -437,18 +468,20 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                uint32_t valid = 0;
 
                if (addr->prefix > 96 || addr->valid <= (uint32_t)now) {
-                       char namebuf[INET6_ADDRSTRLEN];
-
-                       inet_ntop(AF_INET6, &addr->addr.in6, namebuf, sizeof(namebuf));
                        syslog(LOG_INFO, "Address %s (prefix %d, valid %u) not suitable as RA prefix on %s",
-                                       namebuf, addr->prefix, addr->valid, iface->ifname);
+                               inet_ntop(AF_INET6, &addr->addr.in6, buf, sizeof(buf)), addr->prefix,
+                               addr->valid, iface->name);
                        continue;
                }
 
                if (odhcpd_bmemcmp(&addr->addr, &iface->pio_filter_addr,
-                               iface->pio_filter_length) != 0 ||
-                               addr->prefix < iface->pio_filter_length)
-                       continue; // PIO filtered out of this RA
+                                  iface->pio_filter_length) != 0 ||
+                   addr->prefix < iface->pio_filter_length) {
+                       syslog(LOG_INFO, "Address %s filtered out as RA prefix on %s",
+                              inet_ntop(AF_INET6, &addr->addr.in6, buf, sizeof(buf)),
+                              iface->name);
+                       continue; /* PIO filtered out of this RA */
+               }
 
                struct nd_opt_prefix_info *p = NULL;
                for (size_t i = 0; i < pfxs_cnt; ++i) {
@@ -463,7 +496,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 
                        tmp = realloc(pfxs, sizeof(*pfxs) * (pfxs_cnt + 1));
                        if (!tmp) {
-                               syslog(LOG_ERR, "Realloc failed for RA prefix option on interface %s", iface->ifname);
+                               syslog(LOG_ERR, "Realloc failed for RA prefix option on %s", iface->name);
                                continue;
                        }
 
@@ -513,7 +546,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        if (default_route) {
                if (!valid_prefix) {
                        syslog(LOG_WARNING, "A default route is present but there is no public prefix "
-                                       "on %s thus we don't announce a default route!", iface->ifname);
+                                       "on %s thus we don't announce a default route!", iface->name);
                        adv.h.nd_ra_router_lifetime = 0;
                } else
                        adv.h.nd_ra_router_lifetime = htons(calc_ra_lifetime(iface, maxival));
@@ -521,16 +554,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        } else
                adv.h.nd_ra_router_lifetime = 0;
 
-       syslog(LOG_INFO, "Using a RA lifetime of %d seconds on %s", ntohs(adv.h.nd_ra_router_lifetime), iface->ifname);
-
-       /* DNS Recursive DNS */
-       if (iface->dns_cnt > 0) {
-               dns_addr = iface->dns;
-               dns_cnt = iface->dns_cnt;
-       }
-
-       if (!dns_addr || IN6_IS_ADDR_UNSPECIFIED(dns_addr))
-               dns_cnt = 0;
+       syslog(LOG_INFO, "Using a RA lifetime of %d seconds on %s", ntohs(adv.h.nd_ra_router_lifetime), iface->name);
 
        struct {
                uint8_t type;
@@ -541,15 +565,22 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        } dns = {ND_OPT_RECURSIVE_DNS, (1 + (2 * dns_cnt)), 0, 0, 0};
 
        /* DNS Search options */
-       uint8_t search_buf[256], *search_domain = iface->search;
-       size_t search_len = iface->search_len, search_padded = 0;
-
-       if (!search_domain && !res_init() && _res.dnsrch[0] && _res.dnsrch[0][0]) {
-               int len = dn_comp(_res.dnsrch[0], search_buf,
-                               sizeof(search_buf), NULL, NULL);
-               if (len > 0) {
-                       search_domain = search_buf;
-                       search_len = len;
+       uint8_t *search_domain = NULL;
+       size_t search_len = 0, search_padded = 0;
+
+       if (iface->ra_dns) {
+               search_len = iface->search_len;
+               search_domain = iface->search;
+
+               if (!search_domain && !res_init() && _res.dnsrch[0] && _res.dnsrch[0][0]) {
+                       uint8_t search_buf[256];
+
+                       int len = dn_comp(_res.dnsrch[0], search_buf,
+                                       sizeof(search_buf), NULL, NULL);
+                       if (len > 0) {
+                               search_domain = search_buf;
+                               search_len = len;
+                       }
                }
        }
 
@@ -587,8 +618,22 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 
        for (ssize_t i = 0; i < ipcnt; ++i) {
                struct odhcpd_ipaddr *addr = &addrs[i];
-               if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= (uint32_t)now)
-                       continue; // Address not suitable
+               if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= (uint32_t)now) {
+                       syslog(LOG_INFO, "Address %s (dprefix %d, valid %u) not suitable as RA route on %s",
+                               inet_ntop(AF_INET6, &addr->addr.in6, buf, sizeof(buf)),
+                               addr->dprefix, addr->valid, iface->name);
+
+                       continue; /* Address not suitable */
+               }
+
+               if (odhcpd_bmemcmp(&addr->addr, &iface->pio_filter_addr,
+                               iface->pio_filter_length) != 0 ||
+                               addr->prefix < iface->pio_filter_length) {
+                       syslog(LOG_INFO, "Address %s filtered out as RA route on %s",
+                              inet_ntop(AF_INET6, &addr->addr.in6, buf, sizeof(buf)),
+                              iface->name);
+                       continue; /* PIO filtered out of this RA */
+               }
 
                if (addr->dprefix > 32) {
                        addr->addr.in6.s6_addr32[1] &= htonl(~((1U << (64 - addr->dprefix)) - 1));
@@ -599,7 +644,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 
                tmp = realloc(routes, sizeof(*routes) * (routes_cnt + 1));
                if (!tmp) {
-                       syslog(LOG_ERR, "Realloc failed for RA route option on interface %s", iface->ifname);
+                       syslog(LOG_ERR, "Realloc failed for RA route option on %s", iface->name);
                        continue;
                }
 
@@ -650,8 +695,9 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        else
                inet_pton(AF_INET6, ALL_IPV6_NODES, &dest.sin6_addr);
 
-       odhcpd_send(router_event.uloop.fd,
-                       &dest, iov, ARRAY_SIZE(iov), iface);
+       syslog(LOG_INFO, "Sending a RA on %s", iface->name);
+
+       odhcpd_send(iface->router_event.uloop.fd, &dest, iov, ARRAY_SIZE(iov), iface);
 
        free(pfxs);
        free(routes);
@@ -685,10 +731,17 @@ static void handle_icmpv6(void *addr, void *data, size_t len,
                if (hdr->icmp6_type == ND_ROUTER_SOLICIT)
                        send_router_advert(iface, &from->sin6_addr);
        } else if (iface->ra == MODE_RELAY) { /* Relay mode */
-               if (hdr->icmp6_type == ND_ROUTER_ADVERT && iface->master)
-                       forward_router_advertisement(data, len);
-               else if (hdr->icmp6_type == ND_ROUTER_SOLICIT && !iface->master)
-                       forward_router_solicitation(odhcpd_get_master_interface());
+               if (hdr->icmp6_type == ND_ROUTER_SOLICIT && !iface->master) {
+                       struct interface *c;
+
+                       avl_for_each_element(&interfaces, c, avl) {
+                               if (!c->master || c->ra != MODE_RELAY)
+                                       continue;
+
+                               forward_router_solicitation(c);
+                       }
+               } else if (hdr->icmp6_type == ND_ROUTER_ADVERT && iface->master)
+                       forward_router_advertisement(iface, data, len);
        }
 }
 
@@ -708,24 +761,25 @@ static void forward_router_solicitation(const struct interface *iface)
        inet_pton(AF_INET6, ALL_IPV6_ROUTERS, &all_routers.sin6_addr);
        all_routers.sin6_scope_id = iface->ifindex;
 
-       syslog(LOG_NOTICE, "Sending RS to %s", iface->ifname);
-       odhcpd_send(router_event.uloop.fd, &all_routers, &iov, 1, iface);
+       syslog(LOG_NOTICE, "Sending RS to %s", iface->name);
+       odhcpd_send(iface->router_event.uloop.fd, &all_routers, &iov, 1, iface);
 }
 
 
 /* Handler for incoming router solicitations on slave interfaces */
-static void forward_router_advertisement(uint8_t *data, size_t len)
+static void forward_router_advertisement(const struct interface *iface, uint8_t *data, size_t len)
 {
        struct nd_router_advert *adv = (struct nd_router_advert *)data;
        struct sockaddr_in6 all_nodes;
-
+       struct icmpv6_opt *opt;
+       struct interface *c;
+       struct iovec iov = { .iov_base = data, .iov_len = len };
        /* Rewrite options */
        uint8_t *end = data + len;
        uint8_t *mac_ptr = NULL;
        struct in6_addr *dns_ptr = NULL;
        size_t dns_count = 0;
 
-       struct icmpv6_opt *opt;
        icmpv6_for_each_option(opt, &adv[1], end) {
                if (opt->type == ND_OPT_SOURCE_LINKADDR) {
                        /* Store address of source MAC-address */
@@ -737,7 +791,7 @@ static void forward_router_advertisement(uint8_t *data, size_t len)
                }
        }
 
-       syslog(LOG_NOTICE, "Got a RA");
+       syslog(LOG_NOTICE, "Got a RA on %s", iface->name);
 
        /* Indicate a proxy, however we don't follow the rest of RFC 4389 yet */
        adv->nd_ra_flags_reserved |= ND_RA_FLAG_PROXY;
@@ -747,25 +801,22 @@ static void forward_router_advertisement(uint8_t *data, size_t len)
        all_nodes.sin6_family = AF_INET6;
        inet_pton(AF_INET6, ALL_IPV6_NODES, &all_nodes.sin6_addr);
 
-       struct iovec iov = {data, len};
-
-       struct interface *iface;
-       list_for_each_entry(iface, &interfaces, head) {
-               if (iface->ra != MODE_RELAY || iface->master)
+       avl_for_each_element(&interfaces, c, avl) {
+               if (c->ra != MODE_RELAY || c->master)
                        continue;
 
                /* Fixup source hardware address option */
                if (mac_ptr)
-                       odhcpd_get_mac(iface, mac_ptr);
+                       odhcpd_get_mac(c, mac_ptr);
 
                /* If we have to rewrite DNS entries */
-               if (iface->always_rewrite_dns && dns_ptr && dns_count > 0) {
-                       const struct in6_addr *rewrite = iface->dns;
+               if (c->always_rewrite_dns && dns_ptr && dns_count > 0) {
+                       const struct in6_addr *rewrite = c->dns;
                        struct in6_addr addr;
-                       size_t rewrite_cnt = iface->dns_cnt;
+                       size_t rewrite_cnt = c->dns_cnt;
 
                        if (rewrite_cnt == 0) {
-                               if (odhcpd_get_interface_dns_addr(iface, &addr))
+                               if (odhcpd_get_interface_dns_addr(c, &addr))
                                        continue; /* Unable to comply */
 
                                rewrite = &addr;
@@ -779,6 +830,8 @@ static void forward_router_advertisement(uint8_t *data, size_t len)
                        }
                }
 
-               odhcpd_send(router_event.uloop.fd, &all_nodes, &iov, 1, iface);
+               syslog(LOG_NOTICE, "Forward a RA on %s", c->name);
+
+               odhcpd_send(c->router_event.uloop.fd, &all_nodes, &iov, 1, c);
        }
 }