summaryrefslogtreecommitdiff
path: root/src/ndp.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ndp.c')
-rw-r--r--src/ndp.c160
1 files changed, 83 insertions, 77 deletions
diff --git a/src/ndp.c b/src/ndp.c
index 5e8b5ac..7f63f96 100644
--- a/src/ndp.c
+++ b/src/ndp.c
@@ -29,6 +29,7 @@
#include <linux/rtnetlink.h>
#include <linux/filter.h>
#include "router.h"
+#include "dhcpv6.h"
#include "ndp.h"
@@ -37,8 +38,6 @@ static void handle_solicit(void *addr, void *data, size_t len,
struct interface *iface, void *dest);
static void handle_rtnetlink(void *addr, void *data, size_t len,
struct interface *iface, void *dest);
-static ssize_t ping6(struct in6_addr *addr,
- const struct interface *iface);
static uint32_t rtnl_seqid = 0;
static int ping_socket = -1;
@@ -209,17 +208,16 @@ int setup_ndp_interface(struct interface *iface, bool enable)
// Send an ICMP-ECHO. This is less for actually pinging but for the
// neighbor cache to be kept up-to-date.
-static ssize_t ping6(struct in6_addr *addr,
+static void ping6(struct in6_addr *addr,
const struct interface *iface)
{
- struct sockaddr_in6 dest = {AF_INET6, 0, 0, *addr, 0};
+ struct sockaddr_in6 dest = {AF_INET6, 0, 0, *addr, iface->ifindex};
struct icmp6_hdr echo = {.icmp6_type = ICMP6_ECHO_REQUEST};
struct iovec iov = {&echo, sizeof(echo)};
- // Linux seems to not honor IPV6_PKTINFO on raw-sockets, so work around
- setsockopt(ping_socket, SOL_SOCKET, SO_BINDTODEVICE,
- iface->ifname, sizeof(iface->ifname));
- return odhcpd_send(ping_socket, &dest, &iov, 1, iface);
+ odhcpd_setup_route(addr, 128, iface, NULL, 128, true);
+ odhcpd_send(ping_socket, &dest, &iov, 1, iface);
+ odhcpd_setup_route(addr, 128, iface, NULL, 128, false);
}
@@ -263,52 +261,6 @@ static void handle_solicit(void *addr, void *data, size_t len,
ping6(&req->nd_ns_target, c);
}
-
-void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
- const struct interface *iface, const struct in6_addr *gw, bool add)
-{
- struct req {
- struct nlmsghdr nh;
- struct rtmsg rtm;
- struct rtattr rta_dst;
- struct in6_addr dst_addr;
- struct rtattr rta_oif;
- uint32_t ifindex;
- struct rtattr rta_table;
- uint32_t table;
- struct rtattr rta_gw;
- struct in6_addr gw;
- } req = {
- {sizeof(req), 0, NLM_F_REQUEST, ++rtnl_seqid, 0},
- {AF_INET6, prefixlen, 0, 0, 0, 0, 0, 0, 0},
- {sizeof(struct rtattr) + sizeof(struct in6_addr), RTA_DST},
- *addr,
- {sizeof(struct rtattr) + sizeof(uint32_t), RTA_OIF},
- iface->ifindex,
- {sizeof(struct rtattr) + sizeof(uint32_t), RTA_TABLE},
- RT_TABLE_MAIN,
- {sizeof(struct rtattr) + sizeof(struct in6_addr), RTA_GATEWAY},
- IN6ADDR_ANY_INIT,
- };
-
- if (gw)
- req.gw = *gw;
-
- if (add) {
- req.nh.nlmsg_type = RTM_NEWROUTE;
- req.nh.nlmsg_flags |= (NLM_F_CREATE | NLM_F_REPLACE);
- req.rtm.rtm_protocol = RTPROT_STATIC;
- req.rtm.rtm_scope = (gw) ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK;
- req.rtm.rtm_type = RTN_UNICAST;
- } else {
- req.nh.nlmsg_type = RTM_DELROUTE;
- req.rtm.rtm_scope = RT_SCOPE_NOWHERE;
- }
-
- req.nh.nlmsg_len = (gw) ? sizeof(req) : offsetof(struct req, rta_gw);
- send(rtnl_event.uloop.fd, &req, req.nh.nlmsg_len, MSG_DONTWAIT);
-}
-
// Use rtnetlink to modify kernel routes
static void setup_route(struct in6_addr *addr, struct interface *iface, bool add)
{
@@ -318,7 +270,59 @@ static void setup_route(struct in6_addr *addr, struct interface *iface, bool add
(add) ? "Learned" : "Forgot", namebuf, iface->ifname);
if (iface->learn_routes)
- odhcpd_setup_route(addr, 128, iface, NULL, add);
+ odhcpd_setup_route(addr, 128, iface, NULL, 1024, add);
+}
+
+// compare prefixes
+static int prefixcmp(const void *va, const void *vb)
+{
+ const struct odhcpd_ipaddr *a = va, *b = vb;
+ uint32_t a_pref = ((a->addr.s6_addr[0] & 0xfe) != 0xfc) ? a->preferred : 1;
+ uint32_t b_pref = ((b->addr.s6_addr[0] & 0xfe) != 0xfc) ? b->preferred : 1;
+ return (a_pref < b_pref) ? 1 : (a_pref > b_pref) ? -1 : 0;
+}
+
+// Check address update
+static void check_updates(struct interface *iface)
+{
+ struct odhcpd_ipaddr addr[8] = {{IN6ADDR_ANY_INIT, 0, 0, 0, 0}};
+ time_t now = odhcpd_time();
+ ssize_t len = odhcpd_get_interface_addresses(iface->ifindex, addr, 8);
+
+ if (len < 0)
+ return;
+
+ qsort(addr, len, sizeof(*addr), prefixcmp);
+
+ for (int i = 0; i < len; ++i) {
+ addr[i].addr.s6_addr32[3] = 0;
+
+ if (addr[i].preferred < UINT32_MAX - now)
+ addr[i].preferred += now;
+
+ if (addr[i].valid < UINT32_MAX - now)
+ addr[i].valid += now;
+ }
+
+ bool change = len != (ssize_t)iface->ia_addr_len;
+ for (ssize_t i = 0; !change && i < len; ++i)
+ if (!IN6_ARE_ADDR_EQUAL(&addr[i].addr, &iface->ia_addr[i].addr) ||
+ (addr[i].preferred > 0) != (iface->ia_addr[i].preferred > 0) ||
+ addr[i].valid < iface->ia_addr[i].valid ||
+ addr[i].preferred < iface->ia_addr[i].preferred)
+ change = true;
+
+ if (change)
+ dhcpv6_ia_preupdate(iface);
+
+ memcpy(iface->ia_addr, addr, len * sizeof(*addr));
+ iface->ia_addr_len = len;
+
+ if (change)
+ dhcpv6_ia_postupdate(iface, now);
+
+ if (change)
+ raise(SIGUSR1);
}
@@ -332,43 +336,46 @@ static void handle_rtnetlink(_unused void *addr, void *data, size_t len,
for (struct nlmsghdr *nh = data; NLMSG_OK(nh, len);
nh = NLMSG_NEXT(nh, len)) {
+ struct ndmsg *ndm = NLMSG_DATA(nh);
struct rtmsg *rtm = NLMSG_DATA(nh);
- if ((nh->nlmsg_type == RTM_NEWROUTE ||
- nh->nlmsg_type == RTM_DELROUTE) &&
- rtm->rtm_dst_len == 0)
- raise(SIGUSR1); // Inform about a change in default route
- struct ndmsg *ndm = NLMSG_DATA(nh);
- struct ifaddrmsg *ifa = NLMSG_DATA(nh);
- if (nh->nlmsg_type != RTM_NEWNEIGH
- && nh->nlmsg_type != RTM_DELNEIGH
- && nh->nlmsg_type != RTM_NEWADDR
- && nh->nlmsg_type != RTM_DELADDR)
- continue; // Unrelated message type
bool is_addr = (nh->nlmsg_type == RTM_NEWADDR
|| nh->nlmsg_type == RTM_DELADDR);
+ bool is_route = (nh->nlmsg_type == RTM_NEWROUTE
+ || nh->nlmsg_type == RTM_DELROUTE);
+ bool is_neigh = (nh->nlmsg_type == RTM_NEWNEIGH
+ || nh->nlmsg_type == RTM_DELNEIGH);
// Family and ifindex are on the same offset for NEIGH and ADDR
- if (NLMSG_PAYLOAD(nh, 0) < sizeof(*ndm)
+ if ((!is_addr && !is_route && !is_neigh)
+ || NLMSG_PAYLOAD(nh, 0) < sizeof(*ndm)
|| ndm->ndm_family != AF_INET6)
- continue; //
+ continue;
- // Lookup interface
- struct interface *iface;
- if (!(iface = odhcpd_get_interface_by_index(ndm->ndm_ifindex)))
+ // Inform about a change in default route
+ if (is_route && rtm->rtm_dst_len == 0)
+ raise(SIGUSR1);
+ else if (is_route)
continue;
// Data to retrieve
- size_t rta_offset = (is_addr) ? sizeof(*ifa) : sizeof(*ndm);
+ size_t rta_offset = (is_addr) ? sizeof(struct ifaddrmsg) : sizeof(*ndm);
uint16_t atype = (is_addr) ? IFA_ADDRESS : NDA_DST;
ssize_t alen = NLMSG_PAYLOAD(nh, rta_offset);
struct in6_addr *addr = NULL;
for (struct rtattr *rta = (void*)(((uint8_t*)ndm) + rta_offset);
- RTA_OK(rta, alen); rta = RTA_NEXT(rta, alen))
+ RTA_OK(rta, alen); rta = RTA_NEXT(rta, alen)) {
if (rta->rta_type == atype &&
- RTA_PAYLOAD(rta) >= sizeof(*addr))
+ RTA_PAYLOAD(rta) >= sizeof(*addr)) {
addr = RTA_DATA(rta);
+ }
+ }
+
+ // Lookup interface
+ struct interface *iface = odhcpd_get_interface_by_index(ndm->ndm_ifindex);
+ if (!iface)
+ continue;
// Address not specified or unrelated
if (!addr || IN6_IS_ADDR_LINKLOCAL(addr) ||
@@ -458,8 +465,7 @@ static void handle_rtnetlink(_unused void *addr, void *data, size_t len,
}
if (is_addr) {
- if (iface->ra == RELAYD_SERVER)
- raise(SIGUSR1); // Inform about a change in addresses
+ check_updates(iface);
if (iface->dhcpv6 == RELAYD_SERVER)
iface->ia_reconf = true;
@@ -474,7 +480,7 @@ static void handle_rtnetlink(_unused void *addr, void *data, size_t len,
struct interface *c;
list_for_each_entry(c, &interfaces, head) {
if (c->ndp == RELAYD_RELAY && !c->master) {
- ifa->ifa_index = c->ifindex;
+ ndm->ndm_ifindex = c->ifindex;
send(rtnl_event.uloop.fd, nh, nh->nlmsg_len, MSG_DONTWAIT);
}
}
View Lorry Controller Status