X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frelayd.git;a=blobdiff_plain;f=route.c;h=03046abf7b0984e0aa51080b8d3d06372d9c4cda;hp=abe026310dfff7d6064c9a85bb799114e7895902;hb=4e8f1fa4ca2b176500362843a9e57ea5abd4b7a3;hpb=82c536bbfca7d684fec1a363fb3119267bb98576

diff --git a/route.c b/route.c
index abe0263..03046ab 100644
--- a/route.c
+++ b/route.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <time.h>
 
 #include <linux/fib_rules.h>
 
@@ -47,6 +48,14 @@ enum {
 	RULE_F_DEFGW_WORKAROUND = (1 << 1),
 };
 
+static int get_route_table(struct relayd_interface *rif)
+{
+	if (rif)
+		return rif->rt_table;
+	else
+		return local_route_table;
+}
+
 static void
 rtnl_rule_request(struct relayd_interface *rif, int flags)
 {
@@ -73,21 +82,24 @@ rtnl_rule_request(struct relayd_interface *rif, int flags)
 			.rta_len = sizeof(req.table),
 		},
 	};
-
+	const char *ifname = "lo";
 	int padding = sizeof(req.dev.ifname);
 
+	if (rif)
+		ifname = rif->ifname;
+
 	if (!(flags & RULE_F_DEFGW_WORKAROUND)) {
 		req.dev.rta.rta_type = FRA_IFNAME;
-		padding -= strlen(rif->ifname) + 1;
-		strcpy(req.dev.ifname, rif->ifname);
-		req.dev.rta.rta_len = sizeof(req.dev.rta) + strlen(rif->ifname) + 1;
+		padding -= strlen(ifname) + 1;
+		strcpy(req.dev.ifname, ifname);
+		req.dev.rta.rta_len = sizeof(req.dev.rta) + strlen(ifname) + 1;
 	} else {
 		req.dev.rta.rta_type = FRA_PRIORITY;
 		req.dev.rta.rta_len = sizeof(req.dev.rta) + sizeof(uint32_t);
 		padding -= sizeof(uint32_t);
 		*((uint32_t *) &req.dev.ifname) = 1;
 	}
-	req.table.table = rif->rt_table;
+	req.table.table = get_route_table(rif);
 	req.nl.nlmsg_len = sizeof(req) - padding;
 
 	req.nl.nlmsg_flags = NLM_F_REQUEST;
@@ -105,6 +117,19 @@ rtnl_rule_request(struct relayd_interface *rif, int flags)
 	rtnl_flush();
 }
 
+struct rtnl_addr {
+	struct rtattr rta;
+	uint8_t ipaddr[4];
+} __packed;
+
+static struct rtnl_addr *
+rtnl_add_addr(struct rtnl_addr *addr, int *len, int type, const uint8_t *ipaddr)
+{
+	addr->rta.rta_type = type;
+	memcpy(addr->ipaddr, ipaddr, 4);
+	*len += sizeof(*addr);
+	return addr + 1;
+}
 
 static void
 rtnl_route_request(struct relayd_interface *rif, struct relayd_host *host,
@@ -115,20 +140,13 @@ rtnl_route_request(struct relayd_interface *rif, struct relayd_host *host,
 		struct rtmsg rt;
 		struct {
 			struct rtattr rta;
-			uint8_t ipaddr[4];
-		} __packed dst;
-		struct {
-			struct rtattr rta;
 			int table;
 		} __packed table;
 		struct {
 			struct rtattr rta;
 			int ifindex;
 		} __packed dev;
-		struct {
-			struct rtattr rta;
-			uint8_t ipaddr[4];
-		} __packed gw;
+		struct rtnl_addr addr[3];
 	} __packed req = {
 		.rt = {
 			.rtm_family = AF_INET,
@@ -139,22 +157,20 @@ rtnl_route_request(struct relayd_interface *rif, struct relayd_host *host,
 			.rta_type = RTA_TABLE,
 			.rta_len = sizeof(req.table),
 		},
-		.dst.rta = {
-			.rta_len = sizeof(req.dst),
-		},
 		.dev.rta = {
 			.rta_type = RTA_OIF,
 			.rta_len = sizeof(req.dev),
 		},
-		.gw.rta = {
-			.rta_type = RTA_GATEWAY,
-			.rta_len = sizeof(req.gw),
-		},
+		.addr[0].rta.rta_len = sizeof(struct rtnl_addr),
+		.addr[1].rta.rta_len = sizeof(struct rtnl_addr),
+		.addr[2].rta.rta_len = sizeof(struct rtnl_addr),
 	};
-	int pktlen = sizeof(req);
+	int pktlen = sizeof(req) - sizeof(req.addr);
+	struct rtnl_addr *addr = &req.addr[0];
+	const char *ifname = "loopback";
 
 	req.dev.ifindex = host->rif->sll.sll_ifindex;
-	req.table.table = rif->rt_table;
+	req.table.table = get_route_table(rif);
 
 	req.nl.nlmsg_flags = NLM_F_REQUEST;
 	if (add) {
@@ -173,27 +189,29 @@ rtnl_route_request(struct relayd_interface *rif, struct relayd_host *host,
 		req.rt.rtm_scope = RT_SCOPE_NOWHERE;
 	}
 
-	req.dst.rta.rta_type = RTA_DST;
+	if (rif)
+		ifname = rif->ifname;
+
 	if (route) {
-		DPRINTF(2, "%s: add route to "IP_FMT"/%d via "IP_FMT"\n",
-			host->rif->ifname, IP_BUF(route->dest), route->mask, IP_BUF(host->ipaddr));
-		if (!route->mask) {
-			/* No DST -> reuse the DST attribute as the gateway attribute */
-			memcpy(req.dst.ipaddr, host->ipaddr, sizeof(req.dst.ipaddr));
-			req.dst.rta.rta_type = RTA_GATEWAY;
-			pktlen -= sizeof(req.gw);
-			req.rt.rtm_dst_len = 0;
-		} else {
-			memcpy(req.gw.ipaddr, host->ipaddr, sizeof(req.gw.ipaddr));
-			memcpy(req.dst.ipaddr, route->dest, sizeof(req.dst.ipaddr));
-			req.rt.rtm_dst_len = route->mask;
-		}
+		DPRINTF(2, "%s: add route to "IP_FMT"/%d via "IP_FMT" (%s)\n", ifname,
+			IP_BUF(route->dest), route->mask, IP_BUF(host->ipaddr),
+			host->rif->ifname);
+
+		req.rt.rtm_dst_len = route->mask;
+		if (route->mask)
+			addr = rtnl_add_addr(addr, &pktlen, RTA_DST, route->dest);
+		addr = rtnl_add_addr(addr, &pktlen, RTA_GATEWAY, host->ipaddr);
 	} else {
-		pktlen -= sizeof(req.gw);
+		DPRINTF(2, "%s: add host route to "IP_FMT" (%s)\n", ifname,
+			IP_BUF(host->ipaddr), host->rif->ifname);
+		addr = rtnl_add_addr(addr, &pktlen, RTA_DST, host->ipaddr);
 		req.rt.rtm_dst_len = 32;
-		memcpy(req.dst.ipaddr, host->ipaddr, sizeof(req.dst.ipaddr));
 	}
 
+	/* local route */
+	if (!rif)
+		addr = rtnl_add_addr(addr, &pktlen, RTA_PREFSRC, local_addr);
+
 	req.nl.nlmsg_len = pktlen;
 	if (route)
 		rtnl_rule_request(rif, RULE_F_DEFGW_WORKAROUND | RULE_F_ADD);
@@ -214,6 +232,8 @@ rtnl_route_set(struct relayd_host *host, struct relayd_route *route, bool add)
 
 		rtnl_route_request(rif, host, route, add);
 	}
+	if (local_route_table)
+		rtnl_route_request(NULL, host, route, add);
 }
 
 void relayd_add_interface_routes(struct relayd_interface *rif)
@@ -372,12 +392,14 @@ int relayd_rtnl_init(void)
 	rtnl_seq = time(NULL);
 	rtnl_dump_seq = rtnl_seq;
 	rtnl_dump_request(RTM_GETNEIGH);
+	rtnl_rule_request(NULL, RULE_F_ADD);
 
 	return 0;
 }
 
 void relayd_rtnl_done(void)
 {
+	rtnl_rule_request(NULL, 0);
 	uloop_fd_delete(&rtnl_sock);
 	close(rtnl_sock.fd);
 }