X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fndp.c;h=45bb9db4e1daf9eedc5f09aba6dea37e508682e1;hp=a3c69162a6870660bc26f5d82816c0dd049c2a9b;hb=ef74d8ae3d22dc3acba6d583c0de2983ada57f13;hpb=4262abef032ab0e3715c33aa7ecf227e810f12e1

diff --git a/src/ndp.c b/src/ndp.c
index a3c6916..45bb9db 100644
--- a/src/ndp.c
+++ b/src/ndp.c
@@ -115,6 +115,7 @@ static void dump_neigh_table(bool proxy)
 		{.ndm_family = AF_INET6, .ndm_flags = (proxy) ? NTF_PROXY : 0}
 	};
 	send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
+	odhcpd_process(&rtnl_event);
 }
 
 
@@ -125,7 +126,7 @@ int setup_ndp_interface(struct interface *iface, bool enable)
 	int procfd = open(procbuf, O_WRONLY);
 	bool dump_neigh = false;
 
-	if (iface->ndp_event.uloop.fd >= 0) {
+	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;
@@ -136,7 +137,8 @@ int setup_ndp_interface(struct interface *iface, bool enable)
 		dump_neigh = true;
 	}
 
-	if (enable && (iface->ra == RELAYD_SERVER || iface->dhcpv6 == RELAYD_SERVER)) {
+	if (enable && (iface->ra == RELAYD_SERVER ||
+			iface->dhcpv6 == RELAYD_SERVER || iface->ndp == RELAYD_RELAY)) {
 		// Synthesize initial address events
 		struct {
 			struct nlmsghdr nh;
@@ -257,7 +259,7 @@ static void handle_solicit(void *addr, void *data, size_t len,
 	struct interface *c;
 	list_for_each_entry(c, &interfaces, head)
 		if (iface->ndp == RELAYD_RELAY && iface != c &&
-				(!ns_is_dad || !c->external == false))
+				(ns_is_dad || !c->external))
 			ping6(&req->nd_ns_target, c);
 }
 
@@ -295,7 +297,7 @@ void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
 	if (add) {
 		req.nh.nlmsg_type = RTM_NEWROUTE;
 		req.nh.nlmsg_flags |= (NLM_F_CREATE | NLM_F_REPLACE);
-		req.rtm.rtm_protocol = RTPROT_BOOT;
+		req.rtm.rtm_protocol = RTPROT_STATIC;
 		req.rtm.rtm_scope = (gw) ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK;
 		req.rtm.rtm_type = RTN_UNICAST;
 	} else {
@@ -303,23 +305,20 @@ void odhcpd_setup_route(const struct in6_addr *addr, int prefixlen,
 		req.rtm.rtm_scope = RT_SCOPE_NOWHERE;
 	}
 
-	size_t reqlen = (gw) ? sizeof(req) : offsetof(struct req, rta_gw);
-	send(rtnl_event.uloop.fd, &req, reqlen, MSG_DONTWAIT);
+	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)
+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) ? iface->ifname : "<pending>");
+	syslog(LOG_NOTICE, "%s about %s on %s",
+			(add) ? "Learned" : "Forgot", namebuf, iface->ifname);
 
-	if (!iface || !iface->learn_routes)
-		return;
-
-	odhcpd_setup_route(addr, 128, iface, NULL, add);
+	if (iface->learn_routes)
+		odhcpd_setup_route(addr, 128, iface, NULL, add);
 }
 
 
@@ -405,6 +404,7 @@ static void handle_rtnetlink(_unused void *addr, void *data, size_t len,
 				if (nh->nlmsg_type == RTM_NEWNEIGH) {
 					req.ndm.ndm_ifindex = iface->ifindex;
 					send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
+					setup_route(addr, iface, false);
 					dump_neigh = true;
 				}
 			} else if (add) {