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)
{
- 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;
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;
int router_setup_interface(struct interface *iface, bool enable)
{
- struct ipv6_mreq mreq;
int ret = 0;
- if (!fp_route || router_event.uloop.fd < 0) {
+ enable = enable && (iface->ra != MODE_DISABLED);
+
+ 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));
- 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 && iface->router_event.uloop.fd >= 0) {
+ if (!iface->master) {
+ uloop_timeout_cancel(&iface->timer_rs);
+ iface->timer_rs.cb = NULL;
- 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) {
+ 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) {
+ if (iface->router_event.uloop.registered)
+ uloop_fd_delete(&iface->router_event.uloop);
+
+ close(iface->router_event.uloop.fd);
+ iface->router_event.uloop.fd = -1;
+ }
+
return ret;
}
struct interface *iface;
switch (event) {
+ case NETEV_IFINDEX_CHANGE:
+ iface = info->iface;
+ if (iface && iface->router_event.uloop.fd >= 0) {
+ if (iface->router_event.uloop.registered)
+ uloop_fd_delete(&iface->router_event.uloop);
+
+ close(iface->router_event.uloop.fd);
+ iface->router_event.uloop.fd = -1;
+ }
+ break;
case NETEV_ROUTE6_ADD:
case NETEV_ROUTE6_DEL:
if (info->rt.dst_len)
/* 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);
-
- char line[512], ifname[16];
- bool found_default = false;
struct odhcpd_ipaddr p = { .addr.in6 = IN6ADDR_ANY_INIT, .prefix = 0,
.dprefix = 0, .preferred = 0, .valid = 0};
+ bool found_default = false;
+ char line[512], ifname[16];
+
+ rewind(fp_route);
while (fgets(line, sizeof(line), fp_route)) {
uint32_t rflags;
}
static int calc_adv_interval(struct interface *iface, uint32_t minvalid,
- uint32_t *maxival)
+ uint32_t *maxival)
{
uint32_t minival = iface->ra_mininterval;
int msecs;
return msecs;
}
-static uint16_t calc_ra_lifetime(struct interface *iface, uint32_t maxival)
+static uint32_t calc_ra_lifetime(struct interface *iface, uint32_t maxival)
{
- uint16_t lifetime = 3*maxival;
+ uint32_t lifetime = 3*maxival;
if (iface->ra_lifetime >= 0) {
lifetime = iface->ra_lifetime;
IOV_RA_PFXS,
IOV_RA_ROUTES,
IOV_RA_DNS,
- IOV_RA_DNS_ADDR,
IOV_RA_SEARCH,
IOV_RA_ADV_INTERVAL,
IOV_RA_TOTAL,
};
+struct adv_msg {
+ struct nd_router_advert h;
+ struct icmpv6_opt lladdr;
+ struct nd_opt_mtu mtu;
+};
+
+struct nd_opt_dns_server {
+ uint8_t type;
+ uint8_t len;
+ uint8_t pad;
+ uint8_t pad2;
+ uint32_t lifetime;
+ struct in6_addr addr[];
+};
+
+struct nd_opt_search_list {
+ uint8_t type;
+ uint8_t len;
+ uint8_t pad;
+ uint8_t pad2;
+ uint32_t lifetime;
+ uint8_t name[];
+};
+
+struct nd_opt_route_info {
+ uint8_t type;
+ uint8_t len;
+ uint8_t prefix;
+ uint8_t flags;
+ uint32_t lifetime;
+ uint32_t addr[4];
+};
+
/* Router Advert server mode */
-static uint64_t send_router_advert(struct interface *iface, const struct in6_addr *from)
+static int 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;
+ struct odhcpd_ipaddr *addrs = NULL;
+ struct adv_msg adv;
+ struct nd_opt_prefix_info *pfxs = NULL;
+ struct nd_opt_dns_server *dns = NULL;
+ struct nd_opt_search_list *search = NULL;
+ struct nd_opt_route_info *routes = NULL;
+ struct nd_opt_adv_interval adv_interval;
+ struct iovec iov[IOV_RA_TOTAL];
+ struct sockaddr_in6 dest;
+ size_t dns_sz = 0, search_sz = 0, pfxs_cnt = 0, routes_cnt = 0;
+ ssize_t addr_cnt = 0;
+ uint32_t minvalid = UINT32_MAX, maxival, lifetime;
+ int msecs, mtu = iface->ra_mtu, hlim = iface->ra_hoplimit;
+ bool default_route = false;
+ bool valid_prefix = false;
char buf[INET6_ADDRSTRLEN];
- if (mtu == 0)
- mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
-
- if (mtu < 1280)
- mtu = 1280;
+ memset(&adv, 0, sizeof(adv));
+ adv.h.nd_ra_type = ND_ROUTER_ADVERT;
if (hlim == 0)
hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
- struct {
- struct nd_router_advert h;
- struct icmpv6_opt lladdr;
- struct nd_opt_mtu mtu;
- } adv = {
- .h = {{.icmp6_type = ND_ROUTER_ADVERT, .icmp6_code = 0}, 0, 0},
- .lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
- .mtu = {ND_OPT_MTU, 1, 0, htonl(mtu)},
- };
-
if (hlim > 0)
adv.h.nd_ra_curhoplimit = hlim;
- if (iface->dhcpv6) {
+ if (iface->dhcpv6 != MODE_DISABLED) {
adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER;
if (iface->ra_managed >= RA_MANAGED_MFLAG)
adv.h.nd_ra_reachable = htonl(iface->ra_reachabletime);
adv.h.nd_ra_retransmit = htonl(iface->ra_retranstime);
+ adv.lladdr.type = ND_OPT_SOURCE_LINKADDR;
+ adv.lladdr.len = 1;
odhcpd_get_mac(iface, adv.lladdr.data);
- /* 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;
+ adv.mtu.nd_opt_mtu_type = ND_OPT_MTU;
+ adv.mtu.nd_opt_mtu_len = 1;
+
+ if (mtu == 0)
+ mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
+
+ if (mtu < 1280)
+ mtu = 1280;
+
+ adv.mtu.nd_opt_mtu_mtu = htonl(mtu);
+
+ iov[IOV_RA_ADV].iov_base = (char *)&adv;
+ iov[IOV_RA_ADV].iov_len = sizeof(adv);
/* If not shutdown */
if (iface->timer_rs.cb) {
size_t size = sizeof(*addrs) * iface->addr6_len;
+
addrs = alloca(size);
memcpy(addrs, iface->addr6, size);
- ipcnt = iface->addr6_len;
+ addr_cnt = iface->addr6_len;
/* Check default route */
if (iface->default_router) {
if (iface->default_router > 1)
valid_prefix = true;
- } else if (parse_routes(addrs, ipcnt))
+ } else if (parse_routes(addrs, addr_cnt))
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;
- }
- }
-
/* Construct Prefix Information options */
- size_t pfxs_cnt = 0;
- struct nd_opt_prefix_info *pfxs = NULL;
-
- for (ssize_t i = 0; i < ipcnt; ++i) {
+ for (ssize_t i = 0; i < addr_cnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
+ struct nd_opt_prefix_info *p = NULL;
uint32_t preferred = 0;
uint32_t valid = 0;
continue; /* PIO filtered out of this RA */
}
- struct nd_opt_prefix_info *p = NULL;
for (size_t i = 0; i < pfxs_cnt; ++i) {
if (addr->prefix == pfxs[i].nd_opt_pi_prefix_len &&
!odhcpd_bmemcmp(&pfxs[i].nd_opt_pi_prefix,
p->nd_opt_pi_valid_time = htonl(valid);
}
+ iov[IOV_RA_PFXS].iov_base = (char *)pfxs;
+ iov[IOV_RA_PFXS].iov_len = pfxs_cnt * sizeof(*pfxs);
+
/* Calculate periodic transmit */
- uint32_t maxival;
- int msecs = calc_adv_interval(iface, minvalid, &maxival);
+ msecs = calc_adv_interval(iface, minvalid, &maxival);
+ lifetime = calc_ra_lifetime(iface, maxival);
if (default_route) {
if (!valid_prefix) {
"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));
+ adv.h.nd_ra_router_lifetime = htons(lifetime < UINT16_MAX ? lifetime : UINT16_MAX);
} 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->name);
+ syslog(LOG_DEBUG, "Using a RA lifetime of %d seconds on %s", ntohs(adv.h.nd_ra_router_lifetime), iface->name);
- struct {
- uint8_t type;
- uint8_t len;
- uint8_t pad;
- uint8_t pad2;
- uint32_t lifetime;
- } dns = {ND_OPT_RECURSIVE_DNS, (1 + (2 * dns_cnt)), 0, 0, 0};
+ /* DNS options */
+ if (iface->ra_dns) {
+ struct in6_addr dns_pref, *dns_addr = NULL;
+ size_t dns_cnt = 0, search_len = iface->search_len;
+ uint8_t *search_domain = iface->search;
+ uint8_t search_buf[256];
+
+ /* DNS Recursive 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;
+ }
- /* DNS Search options */
- uint8_t *search_domain = NULL;
- size_t search_len = 0, search_padded = 0;
+ if (dns_cnt) {
+ dns_sz = sizeof(*dns) + sizeof(struct in6_addr)*dns_cnt;
- if (iface->ra_dns) {
- search_len = iface->search_len;
- search_domain = iface->search;
+ dns = alloca(dns_sz);
+ memset(dns, 0, dns_sz);
+ dns->type = ND_OPT_RECURSIVE_DNS;
+ dns->len = 1 + (2 * dns_cnt);
+ dns->lifetime = htonl(lifetime);
+ memcpy(dns->addr, dns_addr, sizeof(struct in6_addr)*dns_cnt);
+ }
+ /* DNS Search options */
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_len = len;
}
}
- }
- if (search_len > 0)
- search_padded = ((search_len + 7) & (~7)) + 8;
-
- struct {
- uint8_t type;
- uint8_t len;
- uint8_t pad;
- uint8_t pad2;
- uint32_t lifetime;
- uint8_t name[];
- } *search = alloca(sizeof(*search) + search_padded);
-
- search->type = ND_OPT_DNS_SEARCH;
- search->len = search_len ? ((sizeof(*search) + search_padded) / 8) : 0;
- search->pad = 0;
- search->pad2 = 0;
-
- if (search_len > 0) {
- memcpy(search->name, search_domain, search_len);
- memset(&search->name[search_len], 0, search_padded - search_len);
+ if (search_len > 0) {
+ size_t search_padded = ((search_len + 7) & (~7)) + 8;
+
+ search_sz = sizeof(*search) + search_padded;
+
+ search = alloca(search_sz);
+ memset(search, 0, search_sz);
+ search->type = ND_OPT_DNS_SEARCH;
+ search->len = search_len ? ((sizeof(*search) + search_padded) / 8) : 0;
+ search->lifetime = htonl(lifetime);
+ memcpy(search->name, search_domain, search_len);
+ memset(&search->name[search_len], 0, search_padded - search_len);
+ }
}
- size_t routes_cnt = 0;
- struct {
- uint8_t type;
- uint8_t len;
- uint8_t prefix;
- uint8_t flags;
- uint32_t lifetime;
- uint32_t addr[4];
- } *tmp, *routes = NULL;
-
- for (ssize_t i = 0; i < ipcnt; ++i) {
+ iov[IOV_RA_DNS].iov_base = (char *)dns;
+ iov[IOV_RA_DNS].iov_len = dns_sz;
+ iov[IOV_RA_SEARCH].iov_base = (char *)search;
+ iov[IOV_RA_SEARCH].iov_len = search_sz;
+
+ /*
+ * RFC7084 ยง 4.3 :
+ * L-3: An IPv6 CE router MUST advertise itself as a router for the
+ * delegated prefix(es) (and ULA prefix if configured to provide
+ * ULA addressing) using the "Route Information Option" specified
+ * in Section 2.3 of [RFC4191]. This advertisement is
+ * independent of having or not having IPv6 connectivity on the
+ * WAN interface.
+ */
+
+ for (ssize_t i = 0; i < addr_cnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
- if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= (uint32_t)now) {
+ struct nd_opt_route_info *tmp;
+ uint32_t valid;
+
+ 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);
routes[routes_cnt].flags |= ND_RA_PREF_LOW;
else if (iface->route_preference > 0)
routes[routes_cnt].flags |= ND_RA_PREF_HIGH;
- routes[routes_cnt].lifetime = htonl(TIME_LEFT(addr->valid, now));
+
+ valid = TIME_LEFT(addr->valid, now);
+ routes[routes_cnt].lifetime = htonl(valid < lifetime ? valid : lifetime);
routes[routes_cnt].addr[0] = addr->addr.in6.s6_addr32[0];
routes[routes_cnt].addr[1] = addr->addr.in6.s6_addr32[1];
routes[routes_cnt].addr[2] = 0;
++routes_cnt;
}
- search->lifetime = htonl(maxival*10);
- dns.lifetime = search->lifetime;
-
- struct icmpv6_opt adv_interval = {
- .type = ND_OPT_RTR_ADV_INTERVAL,
- .len = 1,
- .data = {0, 0, (maxival*1000) >> 24, (maxival*1000) >> 16, (maxival*1000) >> 8, maxival*1000}
- };
-
- struct iovec iov[IOV_RA_TOTAL] = {
- [IOV_RA_ADV] = {&adv, sizeof(adv)},
- [IOV_RA_PFXS] = {pfxs, pfxs_cnt * sizeof(*pfxs)},
- [IOV_RA_ROUTES] = {routes, routes_cnt * sizeof(*routes)},
- [IOV_RA_DNS] = {&dns, (dns_cnt) ? sizeof(dns) : 0},
- [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;
+ iov[IOV_RA_ROUTES].iov_base = (char *)routes;
+ iov[IOV_RA_ROUTES].iov_len = routes_cnt * sizeof(*routes);
+
+ memset(&adv_interval, 0, sizeof(adv_interval));
+ adv_interval.nd_opt_adv_interval_type = ND_OPT_RTR_ADV_INTERVAL;
+ adv_interval.nd_opt_adv_interval_len = 1;
+ adv_interval.nd_opt_adv_interval_ival = htonl(maxival);
+
+ iov[IOV_RA_ADV_INTERVAL].iov_base = (char *)&adv_interval;
+ iov[IOV_RA_ADV_INTERVAL].iov_len = adv_interval.nd_opt_adv_interval_len * 8;
memset(&dest, 0, sizeof(dest));
dest.sin6_family = AF_INET6;
else
inet_pton(AF_INET6, ALL_IPV6_NODES, &dest.sin6_addr);
- syslog(LOG_INFO, "Sending a RA on %s", iface->name);
+ syslog(LOG_NOTICE, "Sending a RA on %s", iface->name);
- odhcpd_send(router_event.uloop.fd,
- &dest, iov, ARRAY_SIZE(iov), iface);
+ odhcpd_send(iface->router_event.uloop.fd, &dest, iov, ARRAY_SIZE(iov), iface);
free(pfxs);
free(routes);
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)
+ 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);
- else if (hdr->icmp6_type == ND_ROUTER_SOLICIT && !iface->master)
- forward_router_solicitation(odhcpd_get_master_interface());
}
}
all_routers.sin6_scope_id = iface->ifindex;
syslog(LOG_NOTICE, "Sending RS to %s", iface->name);
- odhcpd_send(router_event.uloop.fd, &all_routers, &iov, 1, iface);
+ odhcpd_send(iface->router_event.uloop.fd, &all_routers, &iov, 1, iface);
}
syslog(LOG_NOTICE, "Forward a RA on %s", c->name);
- odhcpd_send(router_event.uloop.fd, &all_nodes, &iov, 1, c);
+ odhcpd_send(c->router_event.uloop.fd, &all_nodes, &iov, 1, c);
}
}
projects / project / odhcpd.git / blobdiff