#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;
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);
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 (write(procfd, "1\n", 2) < 0) {}
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);
odhcpd_send(ping_socket, &dest, &iov, 1, iface);
odhcpd_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);
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
// 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];
+
+ inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf));
+ syslog(LOG_NOTICE, "%s about %s%%%s",
+ (add) ? "Learned" : "Forgot", ipbuf, 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 = IN6_IS_ADDR_ULA(&a->addr) ? 1 : a->preferred;
- uint32_t b_pref = IN6_IS_ADDR_ULA(&b->addr) ? 1 : b->preferred;
- return (a_pref < b_pref) ? 1 : (a_pref > b_pref) ? -1 : 0;
-}
-
// Check address update
-static void check_addr_updates(struct interface *iface)
+static void check_addr6_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 = odhcpd_get_interface_addresses(iface->ifindex, true, &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) ||
+ 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];
+
+ inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf));
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;
+ bool neigh_add = (c->ndp == RELAYD_RELAY ? add : false);
- list_for_each_entry(c, &interfaces, head) {
- if (iface == c || c->ndp != RELAYD_RELAY ||
- c->external == true)
- continue;
-
- ping6(addr, c);
+ if (odhcpd_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);
struct in6_addr *addr = NULL;
struct interface *iface = NULL;
bool add = false;
+ char ipbuf[INET6_ADDRSTRLEN];
switch (hdr->nlmsg_type) {
case RTM_NEWROUTE:
case RTM_NEWADDR:
add = true;
+ /* fall through */
case RTM_DELADDR: {
struct ifaddrmsg *ifa = nlmsg_data(hdr);
struct nlattr *nla[__IFA_MAX];
IN6_IS_ADDR_MULTICAST(addr))
return NL_SKIP;
- check_addr_updates(iface);
+ inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf));
+ syslog(LOG_DEBUG, "Netlink %s %s%%%s", add ? "newaddr" : "deladdr",
+ ipbuf, iface->ifname);
+
+ check_addr6_updates(iface);
if (iface->ndp != RELAYD_RELAY)
break;
case RTM_NEWNEIGH:
add = true;
+ /* fall through */
case RTM_DELNEIGH: {
struct ndmsg *ndm = nlmsg_data(hdr);
struct nlattr *nla[__NDA_MAX];
IN6_IS_ADDR_MULTICAST(addr))
return NL_SKIP;
+ inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf));
+ syslog(LOG_DEBUG, "Netlink %s %s%%%s", add ? "newneigh" : "delneigh",
+ ipbuf, iface->ifname);
+
if (ndm->ndm_flags & NTF_PROXY) {
/* Dump and flush proxy entries */
if (hdr->nlmsg_type == RTM_NEWNEIGH) {
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);
if (nl_socket_set_buffer_size(ev_sock->sock, ev_sock->sock_bufsize, 0))
goto err;
- dump_addr_table();
+ dump_addr_table(true);
return;
err:
projects / project / odhcpd.git / blobdiff