#include <netlink/socket.h>
#include <netlink/attr.h>
-#include "router.h"
#include "dhcpv6.h"
-#include "ndp.h"
+#include "odhcpd.h"
struct event_socket {
struct odhcpd_event ev;
struct nl_sock *sock;
+ int sock_bufsize;
};
static void handle_solicit(void *addr, void *data, size_t len,
struct interface *iface, void *dest);
static void handle_rtnl_event(struct odhcpd_event *ev);
static int cb_rtnl_valid(struct nl_msg *msg, void *arg);
-static void catch_rtnetlink(int error);
+static void catch_rtnl_err(struct odhcpd_event *e, int error);
static int ping_socket = -1;
static struct event_socket rtnl_event = {
.ev = {
.uloop = {.fd = - 1, },
.handle_dgram = NULL,
- .handle_error = catch_rtnetlink,
+ .handle_error = catch_rtnl_err,
.recv_msgs = handle_rtnl_event,
},
.sock = NULL,
+ .sock_bufsize = 133120,
};
// Filter ICMPv6 messages of type neighbor soliciation
// Initialize NDP-proxy
-int init_ndp(void)
+int ndp_init(void)
{
- int val = 256 * 1024;
+ int val = 2;
- rtnl_event.sock = odhcpd_create_nl_socket(NETLINK_ROUTE);
+ rtnl_event.sock = netlink_create_socket(NETLINK_ROUTE);
if (!rtnl_event.sock)
goto err;
rtnl_event.ev.uloop.fd = nl_socket_get_fd(rtnl_event.sock);
- if (nl_socket_set_buffer_size(rtnl_event.sock, val, 0))
+ if (nl_socket_set_buffer_size(rtnl_event.sock, rtnl_event.sock_bufsize, 0))
goto err;
nl_socket_disable_seq_check(rtnl_event.sock);
nl_socket_modify_cb(rtnl_event.sock, NL_CB_VALID, NL_CB_CUSTOM,
cb_rtnl_valid, NULL);
- // Receive IPv6 address, IPv6 routes and neighbor events
- if (nl_socket_add_memberships(rtnl_event.sock, RTNLGRP_IPV6_IFADDR,
- RTNLGRP_IPV6_ROUTE, RTNLGRP_NEIGH, 0))
+ // Receive IPv4 address, IPv6 address, IPv6 routes and neighbor events
+ if (nl_socket_add_memberships(rtnl_event.sock, RTNLGRP_IPV4_IFADDR,
+ RTNLGRP_IPV6_IFADDR, RTNLGRP_IPV6_ROUTE,
+ RTNLGRP_NEIGH, RTNLGRP_LINK, 0))
goto err;
odhcpd_register(&rtnl_event.ev);
return -1;
}
- val = 2;
setsockopt(ping_socket, IPPROTO_RAW, IPV6_CHECKSUM, &val, sizeof(val));
// This is required by RFC 4861
nlmsg_free(msg);
}
-static void dump_addr_table(void)
+static void dump_addr_table(bool v6)
{
struct nl_msg *msg;
struct ifaddrmsg ifa = {
- .ifa_family = AF_INET6,
+ .ifa_family = v6 ? AF_INET6 : AF_INET,
};
msg = nlmsg_alloc_simple(RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP);
nlmsg_free(msg);
}
-int setup_ndp_interface(struct interface *iface, bool enable)
+int ndp_setup_interface(struct interface *iface, bool enable)
{
+ int ret = 0, procfd;
+ bool dump_neigh = false;
char procbuf[64];
+
snprintf(procbuf, sizeof(procbuf), "/proc/sys/net/ipv6/conf/%s/proxy_ndp", iface->ifname);
- int procfd = open(procbuf, O_WRONLY);
- bool dump_neigh = false;
+ procfd = open(procbuf, O_WRONLY);
+
+ if (procfd < 0) {
+ ret = -1;
+ goto out;
+ }
if (iface->ndp_event.uloop.fd > 0) {
uloop_fd_delete(&iface->ndp_event.uloop);
close(iface->ndp_event.uloop.fd);
iface->ndp_event.uloop.fd = -1;
- if (!enable || iface->ndp != RELAYD_RELAY)
+ if (!enable || iface->ndp != MODE_RELAY)
if (write(procfd, "0\n", 2) < 0) {}
dump_neigh = true;
}
- if (enable && (iface->ra == RELAYD_SERVER ||
- iface->dhcpv6 == RELAYD_SERVER || iface->ndp == RELAYD_RELAY))
- dump_addr_table();
-
- if (enable && iface->ndp == RELAYD_RELAY) {
+ if (enable && iface->ndp == MODE_RELAY) {
if (write(procfd, "1\n", 2) < 0) {}
- close(procfd);
int sock = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC, htons(ETH_P_IPV6));
if (sock < 0) {
syslog(LOG_ERR, "Unable to open packet socket: %s",
strerror(errno));
- return -1;
+ ret = -1;
+ goto out;
}
#ifdef PACKET_RECV_TYPE
if (setsockopt(sock, SOL_SOCKET, SO_ATTACH_FILTER,
&bpf_prog, sizeof(bpf_prog))) {
syslog(LOG_ERR, "Failed to set BPF: %s", strerror(errno));
- return -1;
+ ret = -1;
+ goto out;
}
struct sockaddr_ll ll = {
dump_neigh_table(false);
else
dump_neigh = false;
- } else
- close(procfd);
+ }
if (dump_neigh)
dump_neigh_table(true);
- return 0;
+out:
+ if (procfd >= 0)
+ close(procfd);
+
+ return ret;
}
struct sockaddr_in6 dest = { .sin6_family = AF_INET6, .sin6_addr = *addr, .sin6_scope_id = iface->ifindex, };
struct icmp6_hdr echo = { .icmp6_type = ICMP6_ECHO_REQUEST };
struct iovec iov = { .iov_base = &echo, .iov_len = sizeof(echo) };
+ char ipbuf[INET6_ADDRSTRLEN];
+
+ inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf));
+ syslog(LOG_NOTICE, "Pinging for %s%%%s", ipbuf, iface->ifname);
- odhcpd_setup_route(addr, 128, iface, NULL, 128, true);
+ netlink_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);
+ netlink_setup_route(addr, 128, iface, NULL, 128, false);
}
-
// Handle solicitations
static void handle_solicit(void *addr, void *data, size_t len,
struct interface *iface, _unused void *dest)
struct ip6_hdr *ip6 = data;
struct nd_neighbor_solicit *req = (struct nd_neighbor_solicit*)&ip6[1];
struct sockaddr_ll *ll = addr;
+ char ipbuf[INET6_ADDRSTRLEN];
+ uint8_t mac[6];
// Solicitation is for duplicate address detection
bool ns_is_dad = IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src);
// Don't process solicit messages on non relay interfaces
// Don't forward any non-DAD solicitation for external ifaces
// TODO: check if we should even forward DADs for them
- if (iface->ndp != RELAYD_RELAY || (iface->external && !ns_is_dad))
+ if (iface->ndp != MODE_RELAY || (iface->external && !ns_is_dad))
return;
if (len < sizeof(*ip6) + sizeof(*req))
IN6_IS_ADDR_MULTICAST(&req->nd_ns_target))
return; // Invalid target
- char ipbuf[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, &req->nd_ns_target, ipbuf, sizeof(ipbuf));
- syslog(LOG_DEBUG, "Got a NS for %s", ipbuf);
+ syslog(LOG_DEBUG, "Got a NS for %s%%%s", ipbuf, iface->ifname);
- uint8_t mac[6];
odhcpd_get_mac(iface, mac);
if (!memcmp(ll->sll_addr, mac, sizeof(mac)))
return; // Looped back
struct interface *c;
list_for_each_entry(c, &interfaces, head)
- if (iface != c && c->ndp == RELAYD_RELAY &&
+ if (iface != c && c->ndp == MODE_RELAY &&
(ns_is_dad || !c->external))
ping6(&req->nd_ns_target, c);
}
// Use rtnetlink to modify kernel routes
static void setup_route(struct in6_addr *addr, struct interface *iface, bool add)
{
- char namebuf[INET6_ADDRSTRLEN];
- inet_ntop(AF_INET6, addr, namebuf, sizeof(namebuf));
- syslog(LOG_NOTICE, "%s about %s on %s",
- (add) ? "Learned" : "Forgot", namebuf, iface->ifname);
+ char ipbuf[INET6_ADDRSTRLEN];
- if (iface->learn_routes)
- odhcpd_setup_route(addr, 128, iface, NULL, 1024, add);
-}
+ inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf));
+ syslog(LOG_NOTICE, "%s about %s%%%s",
+ (add) ? "Learned" : "Forgot", ipbuf, iface->ifname);
-// 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;
+ if (iface->learn_routes)
+ netlink_setup_route(addr, 128, iface, NULL, 1024, add);
}
// Check address update
static void check_addr_updates(struct interface *iface)
{
- struct odhcpd_ipaddr addr[RELAYD_MAX_ADDRS] = {{IN6ADDR_ANY_INIT, 0, 0, 0, 0}};
- time_t now = odhcpd_time();
- ssize_t len = odhcpd_get_interface_addresses(iface->ifindex, addr, ARRAY_SIZE(addr));
+ struct odhcpd_ipaddr *addr = NULL;
+ ssize_t len = netlink_get_interface_addrs(iface->ifindex, false, &addr);
if (len < 0)
return;
- qsort(addr, len, sizeof(*addr), prefixcmp);
+ bool change = len != (ssize_t)iface->addr4_len;
+ for (ssize_t i = 0; !change && i < len; ++i)
+ if (addr[i].addr.in.s_addr != iface->addr4[i].addr.in.s_addr)
+ change = true;
- for (int i = 0; i < len; ++i) {
- addr[i].addr.s6_addr32[3] = 0;
+ free(iface->addr4);
+ iface->addr4 = addr;
+ iface->addr4_len = len;
- if (addr[i].preferred < UINT32_MAX - now)
- addr[i].preferred += now;
+ if (change)
+ dhcpv4_addr_update(iface);
+}
- if (addr[i].valid < UINT32_MAX - now)
- addr[i].valid += now;
- }
+// Check v6 address update
+static void check_addr6_updates(struct interface *iface)
+{
+ struct odhcpd_ipaddr *addr = NULL;
+ ssize_t len = netlink_get_interface_addrs(iface->ifindex, true, &addr);
+
+ if (len < 0)
+ return;
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) ||
+ if (!IN6_ARE_ADDR_EQUAL(&addr[i].addr.in6, &iface->ia_addr[i].addr.in6) ||
(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)
if (change)
dhcpv6_ia_preupdate(iface);
- memcpy(iface->ia_addr, addr, len * sizeof(*addr));
+ free(iface->ia_addr);
+ iface->ia_addr = addr;
iface->ia_addr_len = len;
- if (change)
- dhcpv6_ia_postupdate(iface, now);
-
if (change) {
+ dhcpv6_ia_postupdate(iface);
syslog(LOG_INFO, "Raising SIGUSR1 due to address change on %s", iface->ifname);
raise(SIGUSR1);
}
}
-void setup_addr_for_relaying(struct in6_addr *addr, struct interface *iface, bool add)
+static void setup_addr_for_relaying(struct in6_addr *addr, struct interface *iface, bool add)
{
struct interface *c;
+ char ipbuf[INET6_ADDRSTRLEN];
- list_for_each_entry(c, &interfaces, head) {
- if (iface == c || (c->ndp != RELAYD_RELAY && !add))
- continue;
-
- odhcpd_setup_proxy_neigh(addr, c, c->ndp == RELAYD_RELAY ? add : false);
- }
-}
-
-void setup_ping6(struct in6_addr *addr, struct interface *iface)
-{
- struct interface *c;
+ inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf));
list_for_each_entry(c, &interfaces, head) {
- if (iface == c || c->ndp != RELAYD_RELAY ||
- c->external == true)
+ if (iface == c || (c->ndp != MODE_RELAY && !add))
continue;
- ping6(addr, c);
+ bool neigh_add = (c->ndp == MODE_RELAY ? add : false);
+
+ if (netlink_setup_proxy_neigh(addr, c, neigh_add))
+ syslog(LOG_DEBUG, "Failed to %s proxy neighbour entry %s%%%s",
+ neigh_add ? "add" : "delete", ipbuf, c->ifname);
+ else
+ syslog(LOG_DEBUG, "%s proxy neighbour entry %s%%%s",
+ neigh_add ? "Added" : "Deleted", ipbuf, c->ifname);
}
}
-static struct in6_addr last_solicited;
-
static void handle_rtnl_event(struct odhcpd_event *e)
{
struct event_socket *ev_sock = container_of(e, struct event_socket, ev);
static int cb_rtnl_valid(struct nl_msg *msg, _unused void *arg)
{
struct nlmsghdr *hdr = nlmsg_hdr(msg);
- struct in6_addr *addr = NULL;
+ struct in6_addr *addr6 = NULL;
struct interface *iface = NULL;
bool add = false;
+ char ipbuf[INET6_ADDRSTRLEN];
switch (hdr->nlmsg_type) {
+ case RTM_NEWLINK: {
+ struct ifinfomsg *ifi = nlmsg_data(hdr);
+ struct nlattr *nla[__IFLA_MAX];
+
+ if (!nlmsg_valid_hdr(hdr, sizeof(*ifi)) ||
+ ifi->ifi_family != AF_UNSPEC)
+ return NL_SKIP;
+
+ nlmsg_parse(hdr, sizeof(struct ifinfomsg), nla, __IFLA_MAX - 1, NULL);
+ if (!nla[IFLA_IFNAME])
+ return NL_SKIP;
+
+ struct interface *iface = odhcpd_get_interface_by_name(nla_data(nla[IFLA_IFNAME]));
+ if (!iface)
+ return NL_SKIP;
+
+ if (iface->ifindex != ifi->ifi_index) {
+ iface->ifindex = ifi->ifi_index;
+ check_addr_updates(iface);
+ }
+ break;
+ }
+
case RTM_NEWROUTE:
case RTM_DELROUTE: {
struct rtmsg *rtm = nlmsg_data(hdr);
syslog(LOG_INFO, "Raising SIGUSR1 due to default route change");
raise(SIGUSR1);
}
- return NL_OK;
+ break;
}
case RTM_NEWADDR:
add = true;
+ /* fall through */
case RTM_DELADDR: {
struct ifaddrmsg *ifa = nlmsg_data(hdr);
struct nlattr *nla[__IFA_MAX];
if (!nlmsg_valid_hdr(hdr, sizeof(*ifa)) ||
- ifa->ifa_family != AF_INET6)
+ (ifa->ifa_family != AF_INET6 &&
+ ifa->ifa_family != AF_INET))
return NL_SKIP;
iface = odhcpd_get_interface_by_index(ifa->ifa_index);
return NL_SKIP;
nlmsg_parse(hdr, sizeof(*ifa), nla, __IFA_MAX - 1, NULL);
- if (!nla[IFA_ADDRESS])
- return NL_SKIP;
- addr = nla_data(nla[IFA_ADDRESS]);
- if (!addr || IN6_IS_ADDR_LINKLOCAL(addr) ||
- IN6_IS_ADDR_MULTICAST(addr))
- return NL_SKIP;
+ if (ifa->ifa_family == AF_INET6) {
+ if (!nla[IFA_ADDRESS])
+ return NL_SKIP;
- check_addr_updates(iface);
+ addr6 = nla_data(nla[IFA_ADDRESS]);
+ if (!addr6 || IN6_IS_ADDR_LINKLOCAL(addr6) ||
+ IN6_IS_ADDR_MULTICAST(addr6))
+ return NL_SKIP;
- if (iface->ndp != RELAYD_RELAY)
- break;
+ inet_ntop(AF_INET6, addr6, ipbuf, sizeof(ipbuf));
+ syslog(LOG_DEBUG, "Netlink %s %s%%%s", add ? "newaddr" : "deladdr",
+ ipbuf, iface->ifname);
- /* handle the relay logic below */
- setup_addr_for_relaying(addr, iface, add);
+ check_addr6_updates(iface);
- if (!add)
- dump_neigh_table(false);
+ if (iface->ndp != MODE_RELAY)
+ break;
+
+ /* handle the relay logic below */
+ setup_addr_for_relaying(addr6, iface, add);
+
+ if (!add)
+ dump_neigh_table(false);
+ } else {
+ if (!nla[IFA_LOCAL])
+ return NL_SKIP;
+
+ struct in_addr *addr = nla_data(nla[IFA_ADDRESS]);
+
+ inet_ntop(AF_INET, addr, ipbuf, sizeof(ipbuf));
+ syslog(LOG_DEBUG, "Netlink %s %s%%%s", add ? "newaddr" : "deladdr",
+ ipbuf, iface->ifname);
+
+ check_addr_updates(iface);
+ }
break;
}
case RTM_NEWNEIGH:
add = true;
+ /* fall through */
case RTM_DELNEIGH: {
struct ndmsg *ndm = nlmsg_data(hdr);
struct nlattr *nla[__NDA_MAX];
return NL_SKIP;
iface = odhcpd_get_interface_by_index(ndm->ndm_ifindex);
- if (!iface || iface->ndp != RELAYD_RELAY)
+ if (!iface || iface->ndp != MODE_RELAY)
return (iface ? NL_OK : NL_SKIP);
nlmsg_parse(hdr, sizeof(*ndm), nla, __NDA_MAX - 1, NULL);
if (!nla[NDA_DST])
return NL_SKIP;
- addr = nla_data(nla[NDA_DST]);
- if (!addr || IN6_IS_ADDR_LINKLOCAL(addr) ||
- IN6_IS_ADDR_MULTICAST(addr))
+ addr6 = nla_data(nla[NDA_DST]);
+ if (!addr6 || IN6_IS_ADDR_LINKLOCAL(addr6) ||
+ IN6_IS_ADDR_MULTICAST(addr6))
return NL_SKIP;
+ inet_ntop(AF_INET6, addr6, ipbuf, sizeof(ipbuf));
+ syslog(LOG_DEBUG, "Netlink %s %s%%%s", true ? "newneigh" : "delneigh",
+ ipbuf, iface->ifname);
+
if (ndm->ndm_flags & NTF_PROXY) {
/* Dump and flush proxy entries */
if (hdr->nlmsg_type == RTM_NEWNEIGH) {
- odhcpd_setup_proxy_neigh(addr, iface, false);
- setup_route(addr, iface, false);
+ netlink_setup_proxy_neigh(addr6, iface, false);
+ setup_route(addr6, iface, false);
dump_neigh_table(false);
}
if (add && !(ndm->ndm_state &
(NUD_REACHABLE | NUD_STALE | NUD_DELAY | NUD_PROBE |
- NUD_PERMANENT | NUD_NOARP))) {
- if (!IN6_ARE_ADDR_EQUAL(&last_solicited, addr)) {
- last_solicited = *addr;
- setup_ping6(addr, iface);
- }
-
+ NUD_PERMANENT | NUD_NOARP)))
return NL_OK;
- }
- setup_addr_for_relaying(addr, iface, add);
- setup_route(addr, iface, add);
+ setup_addr_for_relaying(addr6, iface, add);
+ setup_route(addr6, iface, add);
if (!add)
dump_neigh_table(false);
return NL_OK;
}
-static void catch_rtnetlink(int error)
+static void catch_rtnl_err(struct odhcpd_event *e, int error)
{
- if (error == ENOBUFS)
- dump_addr_table();
+ struct event_socket *ev_sock = container_of(e, struct event_socket, ev);
+
+ if (error != ENOBUFS)
+ goto err;
+
+ /* Double netlink event buffer size */
+ ev_sock->sock_bufsize *= 2;
+
+ if (nl_socket_set_buffer_size(ev_sock->sock, ev_sock->sock_bufsize, 0))
+ goto err;
+
+ dump_addr_table(true);
+ return;
+
+err:
+ odhcpd_deregister(e);
}
projects / project / odhcpd.git / blobdiff