/**
* 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;
int router_init(void)
{
- // Open ICMPv6 socket
- int sock = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC, IPPROTO_ICMPV6);
- if (sock < 0 && errno != EAFNOSUPPORT) {
- syslog(LOG_ERR, "Failed to open RAW-socket: %m");
- return -1;
+ int ret = 0;
+
+ if (!(fp_route = fopen("/proc/net/ipv6_route", "r"))) {
+ syslog(LOG_ERR, "fopen(/proc/net/ipv6_route): %m");
+ ret = -1;
+ goto out;
}
- // Let the kernel compute our checksums
- int val = 2;
- setsockopt(sock, IPPROTO_RAW, IPV6_CHECKSUM, &val, sizeof(val));
+ if (netlink_add_netevent_handler(&router_netevent_handler) < 0) {
+ syslog(LOG_ERR, "Failed to add netevent handler");
+ ret = -1;
+ }
- // This is required by RFC 4861
- val = 255;
- setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &val, sizeof(val));
- setsockopt(sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &val, sizeof(val));
+out:
+ if (ret < 0 && fp_route) {
+ fclose(fp_route);
+ fp_route = NULL;
+ }
- // We need to know the source interface
- val = 1;
- setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &val, sizeof(val));
- setsockopt(sock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &val, sizeof(val));
+ return ret;
+}
- // Don't loop back
- val = 0;
- setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &val, sizeof(val));
- // Filter ICMPv6 package types
- struct icmp6_filter filt;
- ICMP6_FILTER_SETBLOCKALL(&filt);
- ICMP6_FILTER_SETPASS(ND_ROUTER_ADVERT, &filt);
- ICMP6_FILTER_SETPASS(ND_ROUTER_SOLICIT, &filt);
- setsockopt(sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt, sizeof(filt));
+int router_setup_interface(struct interface *iface, bool enable)
+{
+ int ret = 0;
- // Register socket
- router_event.uloop.fd = sock;
- odhcpd_register(&router_event);
+ if (!fp_route) {
+ ret = -1;
+ goto out;
+ }
- if (!(fp_route = fopen("/proc/net/ipv6_route", "r")))
- syslog(LOG_ERR, "Failed to open routing table: %m");
- netlink_add_netevent_handler(&router_netevent_handler);
+ 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;
- return 0;
-}
+ trigger_router_advert(&iface->timer_rs);
+ }
+ 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;
+ }
-int router_setup_interface(struct interface *iface, bool enable)
-{
- if (!fp_route || router_event.uloop.fd < 0)
- return -1;
+ 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;
+ }
- struct ipv6_mreq all_nodes = {ALL_IPV6_NODES, iface->ifindex};
- struct ipv6_mreq all_routers = {ALL_IPV6_ROUTERS, iface->ifindex};
+ /* 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;
+ }
- uloop_timeout_cancel(&iface->timer_rs);
- iface->timer_rs.cb = NULL;
+ 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;
+ }
- if (iface->ifindex <= 0)
- return -1;
+ /* 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;
+ }
- setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
- &all_nodes, sizeof(all_nodes));
- setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
- &all_routers, sizeof(all_routers));
+ 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;
+ }
- if (!enable) {
- if (iface->ra)
- trigger_router_advert(&iface->timer_rs);
- } else {
- void *mreq = &all_routers;
+ /* 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) {
- mreq = &all_nodes;
+ 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))
- setsockopt(router_event.uloop.fd, IPPROTO_IPV6,
- IPV6_ADD_MEMBERSHIP, mreq, sizeof(all_nodes));
+ 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 0;
+
+ return ret;
}
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);
}
hdr->icmp6_type == ND_ROUTER_SOLICIT)
return false;
- // Check all options parsed successfully
+ /* Check all options parsed successfully */
return opt == end;
}
-// Detect whether a default route exists, also find the source prefixes
+/* Detect whether a default route exists, also find the source prefixes */
static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len)
{
rewind(fp_route);
break;
}
}
-
}
}
IOV_RA_TOTAL,
};
-// Router Advert server mode
+/* Router Advert server mode */
static uint64_t send_router_advert(struct interface *iface, const struct in6_addr *from)
{
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");
if (hlim > 0)
adv.h.nd_ra_curhoplimit = hlim;
- if (iface->dhcpv6)
+ if (iface->dhcpv6) {
adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER;
- if (iface->ra_managed >= RA_MANAGED_MFLAG)
- adv.h.nd_ra_flags_reserved |= ND_RA_FLAG_MANAGED;
+ if (iface->ra_managed >= RA_MANAGED_MFLAG)
+ adv.h.nd_ra_flags_reserved |= ND_RA_FLAG_MANAGED;
+ }
if (iface->route_preference < 0)
adv.h.nd_ra_flags_reserved |= ND_RA_PREF_LOW;
odhcpd_get_mac(iface, adv.lladdr.data);
- // If not currently shutting down
+ /* If not currently shutting down */
struct odhcpd_ipaddr *addrs = NULL;
ssize_t ipcnt = 0;
uint32_t minvalid = UINT32_MAX;
bool default_route = false;
bool valid_prefix = false;
- // If not shutdown
+ /* If not shutdown */
if (iface->timer_rs.cb) {
size_t size = sizeof(*addrs) * iface->addr6_len;
addrs = alloca(size);
ipcnt = iface->addr6_len;
- // Check default route
+ /* Check default route */
if (iface->default_router) {
default_route = true;
default_route = true;
}
+ /* 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;
+ }
+ }
- struct in6_addr dns_pref, *dns_addr = &dns_pref;
- size_t dns_cnt = 1;
-
- odhcpd_get_interface_dns_addr(iface, &dns_pref);
-
- // Construct Prefix Information options
+ /* Construct Prefix Information options */
size_t pfxs_cnt = 0;
struct nd_opt_prefix_info *pfxs = NULL;
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) {
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;
}
p->nd_opt_pi_valid_time = htonl(valid);
}
- // Calculate periodic transmit
+ /* Calculate periodic transmit */
uint32_t maxival;
int msecs = calc_adv_interval(iface, minvalid, &maxival);
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));
} 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;
uint32_t lifetime;
} 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;
+ /* DNS Search options */
+ uint8_t *search_domain = NULL;
+ size_t search_len = 0, 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;
+ 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;
+ }
}
}
search->len = search_len ? ((sizeof(*search) + search_padded) / 8) : 0;
search->pad = 0;
search->pad2 = 0;
- memcpy(search->name, search_domain, search_len);
- memset(&search->name[search_len], 0, search_padded - search_len);
+ if (search_len > 0) {
+ memcpy(search->name, search_domain, search_len);
+ memset(&search->name[search_len], 0, search_padded - search_len);
+ }
size_t routes_cnt = 0;
struct {
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));
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;
}
[IOV_RA_DNS_ADDR] = {dns_addr, dns_cnt * sizeof(*dns_addr)},
[IOV_RA_SEARCH] = {search, search->len * 8},
[IOV_RA_ADV_INTERVAL] = {&adv_interval, adv_interval.len * 8}};
- struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_NODES, 0};
+ struct sockaddr_in6 dest;
+
+ memset(&dest, 0, sizeof(dest));
+ dest.sin6_family = AF_INET6;
if (from && !IN6_IS_ADDR_UNSPECIFIED(from))
dest.sin6_addr = *from;
+ 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);
struct interface *iface = container_of(event, struct interface, timer_rs);
int msecs = send_router_advert(iface, NULL);
- // Rearm timer if not shut down
+ /* Rearm timer if not shut down */
if (event->cb)
uloop_timeout_set(event, msecs);
}
-// Event handler for incoming ICMPv6 packets
+/* Event handler for incoming ICMPv6 packets */
static void handle_icmpv6(void *addr, void *data, size_t len,
struct interface *iface, _unused void *dest)
{
if (!router_icmpv6_valid(addr, data, len))
return;
- if ((iface->ra == MODE_SERVER && !iface->master)) { // Server mode
+ if ((iface->ra == MODE_SERVER && !iface->master)) { /* Server mode */
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());
+ } else if (iface->ra == MODE_RELAY) { /* Relay mode */
+ 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);
}
}
-// Forward router solicitation
+/* Forward router solicitation */
static void forward_router_solicitation(const struct interface *iface)
{
+ struct icmp6_hdr rs = {ND_ROUTER_SOLICIT, 0, 0, {{0}}};
+ struct iovec iov = {&rs, sizeof(rs)};
+ struct sockaddr_in6 all_routers;
+
if (!iface)
return;
- struct icmp6_hdr rs = {ND_ROUTER_SOLICIT, 0, 0, {{0}}};
- struct iovec iov = {&rs, sizeof(rs)};
- struct sockaddr_in6 all_routers =
- {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, iface->ifindex};
+ memset(&all_routers, 0, sizeof(all_routers));
+ all_routers.sin6_family = AF_INET6;
+ 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)
+/* Handler for incoming router solicitations on slave interfaces */
+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;
-
- // Rewrite options
+ 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
+ /* Store address of source MAC-address */
mac_ptr = opt->data;
} else if (opt->type == ND_OPT_RECURSIVE_DNS && opt->len > 1) {
- // Check if we have to rewrite DNS
+ /* Check if we have to rewrite DNS */
dns_ptr = (struct in6_addr*)&opt->data[6];
dns_count = (opt->len - 1) / 2;
}
}
- 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
+ /* Indicate a proxy, however we don't follow the rest of RFC 4389 yet */
adv->nd_ra_flags_reserved |= ND_RA_FLAG_PROXY;
- // Forward advertisement to all slave interfaces
- struct sockaddr_in6 all_nodes = {AF_INET6, 0, 0, ALL_IPV6_NODES, 0};
- struct iovec iov = {data, len};
+ /* Forward advertisement to all slave interfaces */
+ memset(&all_nodes, 0, sizeof(all_nodes));
+ all_nodes.sin6_family = AF_INET6;
+ inet_pton(AF_INET6, ALL_IPV6_NODES, &all_nodes.sin6_addr);
- 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
+ /* 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 we have to rewrite DNS entries */
+ 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))
- continue; // Unable to comply
+ if (odhcpd_get_interface_dns_addr(c, &addr))
+ continue; /* Unable to comply */
rewrite = &addr;
rewrite_cnt = 1;
}
- // Copy over any other addresses
+ /* Copy over any other addresses */
for (size_t i = 0; i < dns_count; ++i) {
size_t j = (i < rewrite_cnt) ? i : rewrite_cnt - 1;
dns_ptr[i] = rewrite[j];
}
}
- 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);
}
}