X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fndp.c;h=72fd3bc37d87e360caf2d30c75dffd972cebb3ed;hp=882487991f3c9d0f6d7545feebe75c03bf2f8683;hb=7aa2594c5a127d92fa8f04328ac7b43e595bcaa7;hpb=8a615ad3c4f2318667630e2505888df09901320d diff --git a/src/ndp.c b/src/ndp.c index 8824879..72fd3bc 100644 --- a/src/ndp.c +++ b/src/ndp.c @@ -26,38 +26,20 @@ #include #include -#include #include +#include -#include -#include -#include - -#include "router.h" #include "dhcpv6.h" -#include "ndp.h" +#include "odhcpd.h" -struct event_socket { - struct odhcpd_event ev; - struct nl_sock *sock; -}; +static void ndp_netevent_cb(unsigned long event, struct netevent_handler_info *info); +static void setup_route(struct in6_addr *addr, struct interface *iface, bool add); +static void setup_addr_for_relaying(struct in6_addr *addr, struct interface *iface, bool add); 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 int ping_socket = -1; -static struct event_socket rtnl_event = { - .ev = { - .uloop = {.fd = - 1, }, - .handle_dgram = NULL, - .handle_error = catch_rtnetlink, - .recv_msgs = handle_rtnl_event, - }, - .sock = NULL, -}; // Filter ICMPv6 messages of type neighbor soliciation static struct sock_filter bpf[] = { @@ -70,42 +52,20 @@ static struct sock_filter bpf[] = { BPF_STMT(BPF_RET | BPF_K, 0), }; static const struct sock_fprog bpf_prog = {sizeof(bpf) / sizeof(*bpf), bpf}; - +static struct netevent_handler ndp_netevent_handler = { .cb = ndp_netevent_cb, }; // Initialize NDP-proxy -int init_ndp(void) +int ndp_init(void) { - int val = 256 * 1024; - - rtnl_event.sock = odhcpd_create_nl_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)) - 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)) - goto err; - - odhcpd_register(&rtnl_event.ev); + int val = 2; // Open ICMPv6 socket ping_socket = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC, IPPROTO_ICMPV6); if (ping_socket < 0) { - syslog(LOG_ERR, "Unable to open raw socket: %s", strerror(errno)); + syslog(LOG_ERR, "Unable to open raw socket: %m"); return -1; } - val = 2; setsockopt(ping_socket, IPPROTO_RAW, IPV6_CHECKSUM, &val, sizeof(val)); // This is required by RFC 4861 @@ -118,86 +78,44 @@ int init_ndp(void) ICMP6_FILTER_SETBLOCKALL(&filt); setsockopt(ping_socket, IPPROTO_ICMPV6, ICMP6_FILTER, &filt, sizeof(filt)); - return 0; - -err: - if (rtnl_event.sock) { - nl_socket_free(rtnl_event.sock); - rtnl_event.sock = NULL; - rtnl_event.ev.uloop.fd = -1; - } - - return -1; -} - -static void dump_neigh_table(const bool proxy) -{ - struct nl_msg *msg; - struct ndmsg ndm = { - .ndm_family = AF_INET6, - .ndm_flags = proxy ? NTF_PROXY : 0, - }; - - msg = nlmsg_alloc_simple(RTM_GETNEIGH, NLM_F_REQUEST | NLM_F_DUMP); - if (!msg) - return; - - nlmsg_append(msg, &ndm, sizeof(ndm), 0); - - nl_send_auto_complete(rtnl_event.sock, msg); - - nlmsg_free(msg); -} - -static void dump_addr_table(void) -{ - struct nl_msg *msg; - struct ifaddrmsg ifa = { - .ifa_family = AF_INET6, - }; - - msg = nlmsg_alloc_simple(RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP); - if (!msg) - return; - - nlmsg_append(msg, &ifa, sizeof(ifa), 0); - - nl_send_auto_complete(rtnl_event.sock, msg); + netlink_add_netevent_handler(&ndp_netevent_handler); - nlmsg_free(msg); + return 0; } -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; + syslog(LOG_ERR, "Unable to open packet socket: %m"); + ret = -1; + goto out; } #ifdef PACKET_RECV_TYPE @@ -207,8 +125,9 @@ int setup_ndp_interface(struct interface *iface, bool enable) 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; + syslog(LOG_ERR, "Failed to set BPF: %m"); + ret = -1; + goto out; } struct sockaddr_ll ll = { @@ -231,18 +150,65 @@ int setup_ndp_interface(struct interface *iface, bool enable) // If we already were enabled dump is unnecessary, if not do dump if (!dump_neigh) - dump_neigh_table(false); + netlink_dump_neigh_table(false); else dump_neigh = false; - } else - close(procfd); + } if (dump_neigh) - dump_neigh_table(true); + netlink_dump_neigh_table(true); - return 0; +out: + if (procfd >= 0) + close(procfd); + + return ret; } +static void ndp_netevent_cb(unsigned long event, struct netevent_handler_info *info) +{ + struct interface *iface = info->iface; + bool add = true; + + if (!iface || iface->ndp == MODE_DISABLED) + return; + + switch (event) { + case NETEV_ADDR6_DEL: + add = false; + netlink_dump_neigh_table(false); + /* fall through */ + case NETEV_ADDR6_ADD: + setup_addr_for_relaying(&info->addr.in6, iface, add); + break; + case NETEV_NEIGH6_DEL: + add = false; + /* fall through */ + case NETEV_NEIGH6_ADD: + if (info->neigh.flags & NTF_PROXY) { + if (add) { + netlink_setup_proxy_neigh(&info->neigh.dst.in6, iface->ifindex, false); + setup_route(&info->neigh.dst.in6, iface, false); + netlink_dump_neigh_table(false); + } + break; + } + + if (add && + !(info->neigh.state & + (NUD_REACHABLE|NUD_STALE|NUD_DELAY|NUD_PROBE|NUD_PERMANENT|NUD_NOARP))) + break; + + setup_addr_for_relaying(&info->neigh.dst.in6, iface, add); + setup_route(&info->neigh.dst.in6, iface, add); + + if (!add) + netlink_dump_neigh_table(false); + break; + default: + break; + } +} // Send an ICMP-ECHO. This is less for actually pinging but for the // neighbor cache to be kept up-to-date. @@ -252,13 +218,16 @@ static void ping6(struct in6_addr *addr, 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]; - odhcpd_setup_route(addr, 128, iface, NULL, 128, true); + inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf)); + syslog(LOG_NOTICE, "Pinging for %s%%%s", ipbuf, iface->ifname); + + netlink_setup_route(addr, 128, iface->ifindex, 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->ifindex, NULL, 128, false); } - // Handle solicitations static void handle_solicit(void *addr, void *data, size_t len, struct interface *iface, _unused void *dest) @@ -266,6 +235,8 @@ static void handle_solicit(void *addr, void *data, size_t len, 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); @@ -273,7 +244,7 @@ static void handle_solicit(void *addr, void *data, size_t len, // 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)) @@ -284,18 +255,16 @@ static void handle_solicit(void *addr, void *data, size_t len, 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); } @@ -303,227 +272,36 @@ static void handle_solicit(void *addr, void *data, size_t len, // 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); - - if (iface->learn_routes) - 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_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)); - - 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; + char ipbuf[INET6_ADDRSTRLEN]; - if (change) - dhcpv6_ia_postupdate(iface, now); + inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf)); + syslog(LOG_NOTICE, "%s about %s%s%%%s", + (add) ? "Learning" : "Forgetting", + iface->learn_routes ? "proxy routing for " : "", + ipbuf, iface->ifname); - if (change) { - syslog(LOG_INFO, "Raising SIGUSR1 due to address change on %s", iface->ifname); - raise(SIGUSR1); - } + if (iface->learn_routes) + netlink_setup_route(addr, 128, iface->ifindex, NULL, 1024, add); } -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); - } -} - -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); + bool neigh_add = (c->ndp == MODE_RELAY ? add : false); - nl_recvmsgs_default(ev_sock->sock); -} - - -// Handler for neighbor cache entries from the kernel. This is our source -// to learn and unlearn hosts on interfaces. -static int cb_rtnl_valid(struct nl_msg *msg, _unused void *arg) -{ - struct nlmsghdr *hdr = nlmsg_hdr(msg); - struct in6_addr *addr = NULL; - struct interface *iface = NULL; - bool add = false; - - switch (hdr->nlmsg_type) { - case RTM_NEWROUTE: - case RTM_DELROUTE: { - struct rtmsg *rtm = nlmsg_data(hdr); - - if (!nlmsg_valid_hdr(hdr, sizeof(*rtm)) || - rtm->rtm_family != AF_INET6) - return NL_SKIP; - - if (rtm->rtm_dst_len == 0) { - syslog(LOG_INFO, "Raising SIGUSR1 due to default route change"); - raise(SIGUSR1); - } - return NL_OK; - } - - case RTM_NEWADDR: - add = true; - 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) - return NL_SKIP; - - iface = odhcpd_get_interface_by_index(ifa->ifa_index); - if (!iface) - 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; - - check_addr_updates(iface); - - if (iface->ndp != RELAYD_RELAY) - break; - - /* handle the relay logic below */ - setup_addr_for_relaying(addr, iface, add); - - if (!add) - dump_neigh_table(false); - break; - } - - case RTM_NEWNEIGH: - add = true; - case RTM_DELNEIGH: { - struct ndmsg *ndm = nlmsg_data(hdr); - struct nlattr *nla[__NDA_MAX]; - - if (!nlmsg_valid_hdr(hdr, sizeof(*ndm)) || - ndm->ndm_family != AF_INET6) - return NL_SKIP; - - iface = odhcpd_get_interface_by_index(ndm->ndm_ifindex); - if (!iface || iface->ndp != RELAYD_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)) - return NL_SKIP; - - 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); - dump_neigh_table(false); - } - - return NL_OK; - } - - 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); - } - - return NL_OK; - } - - setup_addr_for_relaying(addr, iface, add); - setup_route(addr, iface, add); - - if (!add) - dump_neigh_table(false); - break; - } - - default: - return NL_SKIP; + if (netlink_setup_proxy_neigh(addr, c->ifindex, 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); } - - return NL_OK; -} - -static void catch_rtnetlink(int error) -{ - if (error == ENOBUFS) - dump_addr_table(); }