X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fndp.c;h=93b70fc2e0af91ac6b98d7b62f45d6a437953860;hp=8bed4ea9e4d1770b2a3c5e2a81f48abbe33bbda1;hb=24d21c7c26d07e93fb329ac62da5e974cf44213b;hpb=b02f3e6ddfca200643b37bfaae233dc20f1348a4

diff --git a/src/ndp.c b/src/ndp.c
index 8bed4ea..93b70fc 100644
--- a/src/ndp.c
+++ b/src/ndp.c
@@ -40,23 +40,25 @@
 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
@@ -75,7 +77,7 @@ static const struct sock_fprog bpf_prog = {sizeof(bpf) / sizeof(*bpf), bpf};
 // Initialize NDP-proxy
 int init_ndp(void)
 {
-	int val = 256 * 1024;
+	int val = 2;
 
 	rtnl_event.sock = odhcpd_create_nl_socket(NETLINK_ROUTE);
 	if (!rtnl_event.sock)
@@ -83,7 +85,7 @@ int init_ndp(void)
 
 	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);
@@ -105,7 +107,6 @@ int init_ndp(void)
 			return -1;
 	}
 
-	val = 2;
 	setsockopt(ping_socket, IPPROTO_RAW, IPV6_CHECKSUM, &val, sizeof(val));
 
 	// This is required by RFC 4861
@@ -263,13 +264,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];
+
+	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)
@@ -277,6 +281,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);
@@ -295,11 +301,9 @@ 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
@@ -314,10 +318,11 @@ 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);
+	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);
@@ -327,8 +332,8 @@ static void setup_route(struct in6_addr *addr, struct interface *iface, bool add
 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;
+	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;
 }
 
@@ -380,12 +385,22 @@ static void check_addr_updates(struct interface *iface)
 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);
+		add = (c->ndp == RELAYD_RELAY ? add : false);
+
+		if (odhcpd_setup_proxy_neigh(addr, c, add))
+			syslog(LOG_DEBUG, "Failed to %s proxy neighbour entry %s%%%s",
+				add ? "add" : "delete", ipbuf, iface->ifname);
+		else
+			syslog(LOG_DEBUG, "%s proxy neighbour entry %s%%%s",
+				add ? "Added" : "Deleted", ipbuf, iface->ifname);
 	}
 }
 
@@ -420,6 +435,7 @@ static int cb_rtnl_valid(struct nl_msg *msg, _unused void *arg)
 	struct in6_addr *addr = NULL;
 	struct interface *iface = NULL;
 	bool add = false;
+	char ipbuf[INET6_ADDRSTRLEN];
 
 	switch (hdr->nlmsg_type) {
 	case RTM_NEWROUTE:
@@ -460,6 +476,10 @@ static int cb_rtnl_valid(struct nl_msg *msg, _unused void *arg)
 				IN6_IS_ADDR_MULTICAST(addr))
 			return NL_SKIP;
 
+		inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf));
+		syslog(LOG_DEBUG, "Netlink %s %s%%%s", true ? "newaddr" : "deladdr",
+			ipbuf, iface->ifname);
+
 		check_addr_updates(iface);
 
 		if (iface->ndp != RELAYD_RELAY)
@@ -496,6 +516,10 @@ static int cb_rtnl_valid(struct nl_msg *msg, _unused void *arg)
 				IN6_IS_ADDR_MULTICAST(addr))
 			return NL_SKIP;
 
+		inet_ntop(AF_INET6, addr, 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) {
@@ -533,8 +557,22 @@ static int cb_rtnl_valid(struct nl_msg *msg, _unused void *arg)
 	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();
+	return;
+
+err:
+	odhcpd_deregister(e);
 }