X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=8345e5d206e710e1f9bd4eeafba87edd375b0f2b;hp=c7b8b8f66c8c45bdcdf3dbdd7f57de9376d8402b;hb=a637dba6e4393f0ec8f8bf294fbeb89b8e4ebc66;hpb=575b1fe1bc8f15e65d89a0905e1640277c17fadc

diff --git a/system-linux.c b/system-linux.c
index c7b8b8f..8345e5d 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -154,7 +154,7 @@ static void system_set_sysctl(const char *path, const char *val)
 
 static void system_set_dev_sysctl(const char *path, const char *device, const char *val)
 {
-	snprintf(dev_buf, sizeof(dev_buf), path, val);
+	snprintf(dev_buf, sizeof(dev_buf), path, device);
 	system_set_sysctl(dev_buf, val);
 }
 
@@ -235,6 +235,9 @@ found:
 	if (dev->type != &simple_device_type)
 		return;
 
+	if (add && system_if_force_external(dev->ifname))
+		return;
+
 	device_set_present(dev, add);
 }
 
@@ -275,6 +278,8 @@ int system_bridge_delbr(struct device *bridge)
 static int system_bridge_if(const char *bridge, struct device *dev, int cmd, void *data)
 {
 	struct ifreq ifr;
+
+	memset(&ifr, 0, sizeof(ifr));
 	if (dev)
 		ifr.ifr_ifindex = dev->ifindex;
 	else
@@ -350,6 +355,8 @@ static int system_if_resolve(struct device *dev)
 static int system_if_flags(const char *ifname, unsigned add, unsigned rem)
 {
 	struct ifreq ifr;
+
+	memset(&ifr, 0, sizeof(ifr));
 	strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
 	ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr);
 	ifr.ifr_flags |= add;
@@ -375,8 +382,13 @@ static bool check_ifaddr(struct nlmsghdr *hdr, int ifindex)
 
 static bool check_route(struct nlmsghdr *hdr, int ifindex)
 {
+	struct rtmsg *r = NLMSG_DATA(hdr);
 	struct nlattr *tb[__RTA_MAX];
 
+	if (r->rtm_protocol == RTPROT_KERNEL &&
+	    r->rtm_family == AF_INET6)
+		return false;
+
 	nlmsg_parse(hdr, sizeof(struct rtmsg), tb, __RTA_MAX - 1, NULL);
 	if (!tb[RTA_OIF])
 		return false;
@@ -625,7 +637,7 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
 	}
 }
 
-static void
+void
 system_if_apply_settings(struct device *dev, struct device_settings *s)
 {
 	struct ifreq ifr;
@@ -642,7 +654,7 @@ system_if_apply_settings(struct device *dev, struct device_settings *s)
 		if (ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr) < 0)
 			s->flags &= ~DEV_OPT_TXQUEUELEN;
 	}
-	if (s->flags & DEV_OPT_MACADDR) {
+	if ((s->flags & DEV_OPT_MACADDR) && !dev->external) {
 		ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
 		memcpy(&ifr.ifr_hwaddr.sa_data, s->macaddr, sizeof(s->macaddr));
 		if (ioctl(sock_ioctl, SIOCSIFHWADDR, &ifr) < 0)
@@ -735,14 +747,14 @@ retry:
 }
 
 static bool
-read_int_file(int dir_fd, const char *file, int *val)
+read_uint64_file(int dir_fd, const char *file, uint64_t *val)
 {
 	char buf[64];
 	bool ret = false;
 
 	ret = read_string_file(dir_fd, file, buf, sizeof(buf));
 	if (ret)
-		*val = strtoul(buf, NULL, 0);
+		*val = strtoull(buf, NULL, 0);
 
 	return ret;
 }
@@ -769,6 +781,16 @@ static void system_add_link_modes(struct blob_buf *b, __u32 mask)
 	}
 }
 
+bool
+system_if_force_external(const char *ifname)
+{
+	char buf[64];
+	struct stat s;
+
+	snprintf(buf, sizeof(buf), "/sys/class/net/%s/phy80211", ifname);
+	return stat(buf, &s) == 0;
+}
+
 int
 system_if_dump_info(struct device *dev, struct blob_buf *b)
 {
@@ -776,12 +798,13 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
 	struct ifreq ifr;
 	char buf[64], *s;
 	void *c;
-	int dir_fd, val = 0;
+	int dir_fd;
+	uint64_t val = 0;
 
 	snprintf(buf, sizeof(buf), "/sys/class/net/%s", dev->ifname);
 	dir_fd = open(buf, O_DIRECTORY);
 
-	if (read_int_file(dir_fd, "carrier", &val))
+	if (read_uint64_file(dir_fd, "carrier", &val))
 		blobmsg_add_u8(b, "link", !!val);
 
 	memset(&ecmd, 0, sizeof(ecmd));
@@ -824,7 +847,8 @@ system_if_dump_stats(struct device *dev, struct blob_buf *b)
 	};
 	char buf[64];
 	int stats_dir;
-	int i, val = 0;
+	int i;
+	uint64_t val = 0;
 
 	snprintf(buf, sizeof(buf), "/sys/class/net/%s/statistics", dev->ifname);
 	stats_dir = open(buf, O_DIRECTORY);
@@ -832,8 +856,8 @@ system_if_dump_stats(struct device *dev, struct blob_buf *b)
 		return -1;
 
 	for (i = 0; i < ARRAY_SIZE(counters); i++)
-		if (read_int_file(stats_dir, counters[i], &val))
-			blobmsg_add_u32(b, counters[i], val);
+		if (read_uint64_file(stats_dir, counters[i], &val))
+			blobmsg_add_u64(b, counters[i], val);
 
 	close(stats_dir);
 	return 0;
@@ -843,6 +867,7 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
 {
 	bool v4 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4);
 	int alen = v4 ? 4 : 16;
+	unsigned int flags = 0;
 	struct ifaddrmsg ifa = {
 		.ifa_family = (alen == 4) ? AF_INET : AF_INET6,
 		.ifa_prefixlen = addr->mask,
@@ -850,8 +875,10 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
 	};
 
 	struct nl_msg *msg;
+	if (cmd == RTM_NEWADDR)
+		flags |= NLM_F_CREATE | NLM_F_REPLACE;
 
-	msg = nlmsg_alloc_simple(cmd, 0);
+	msg = nlmsg_alloc_simple(cmd, flags);
 	if (!msg)
 		return -1;
 
@@ -862,6 +889,27 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
 			nla_put_u32(msg, IFA_BROADCAST, addr->broadcast);
 		if (addr->point_to_point)
 			nla_put_u32(msg, IFA_ADDRESS, addr->point_to_point);
+	} else {
+		time_t now = system_get_rtime();
+		struct ifa_cacheinfo cinfo = {0xffffffffU, 0xffffffffU, 0, 0};
+
+		if (addr->preferred_until) {
+			int preferred = addr->preferred_until - now;
+			if (preferred < 0)
+				preferred = 0;
+
+			cinfo.ifa_prefered = preferred;
+		}
+
+		if (addr->valid_until) {
+			int valid = addr->valid_until - now;
+			if (valid <= 0)
+				return -1;
+
+			cinfo.ifa_valid = valid;
+		}
+
+		nla_put(msg, IFA_CACHEINFO, sizeof(cinfo), &cinfo);
 	}
 
 	return system_rtnl_call(msg);
@@ -882,7 +930,6 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
 	int alen = ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4) ? 4 : 16;
 	bool have_gw;
 	unsigned int flags = 0;
-	int ifindex = dev->ifindex;
 
 	if (alen == 4)
 		have_gw = !!route->nexthop.in.s_addr;
@@ -899,15 +946,21 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
 		.rtm_family = (alen == 4) ? AF_INET : AF_INET6,
 		.rtm_dst_len = route->mask,
 		.rtm_table = RT_TABLE_MAIN,
-		.rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_BOOT,
+		.rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_STATIC,
 		.rtm_scope = scope,
 		.rtm_type = (cmd == RTM_DELROUTE) ? 0: RTN_UNICAST,
 	};
 	struct nl_msg *msg;
 
-	if (cmd == RTM_NEWROUTE)
+	if (cmd == RTM_NEWROUTE) {
 		flags |= NLM_F_CREATE | NLM_F_REPLACE;
 
+		if (!dev) { // Add null-route
+			rtm.rtm_scope = RT_SCOPE_UNIVERSE;
+			rtm.rtm_type = RTN_UNREACHABLE;
+		}
+	}
+
 	msg = nlmsg_alloc_simple(cmd, flags);
 	if (!msg)
 		return -1;
@@ -923,7 +976,8 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
 	if (have_gw)
 		nla_put(msg, RTA_GATEWAY, alen, &route->nexthop);
 
-	nla_put_u32(msg, RTA_OIF, ifindex);
+	if (dev)
+		nla_put_u32(msg, RTA_OIF, dev->ifindex);
 
 	return system_rtnl_call(msg);
 }
@@ -1001,6 +1055,33 @@ int system_del_ip_tunnel(const char *name)
 	return tunnel_ioctl(name, SIOCDELTUNNEL, &p);
 }
 
+int system_update_ipv6_mtu(struct device *dev, int mtu)
+{
+	int ret = -1;
+	char buf[64];
+	snprintf(buf, sizeof(buf), "/proc/sys/net/ipv6/conf/%s/mtu",
+			dev->ifname);
+
+	int fd = open(buf, O_RDWR);
+	ssize_t len = read(fd, buf, sizeof(buf) - 1);
+	if (len < 0)
+		goto out;
+
+	buf[len] = 0;
+	ret = atoi(buf);
+
+	if (!mtu || ret <= mtu)
+		goto out;
+
+	lseek(fd, 0, SEEK_SET);
+	if (write(fd, buf, snprintf(buf, sizeof(buf), "%i", mtu)) <= 0)
+		ret = -1;
+
+out:
+	close(fd);
+	return ret;
+}
+
 static int parse_ipaddr(struct blob_attr *attr, __be32 *addr)
 {
 	if (!attr)
@@ -1016,7 +1097,7 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
 	struct blob_attr *cur;
 	struct ip_tunnel_parm p;
 	const char *base, *str;
-	int cmd = SIOCADDTUNNEL;
+	bool is_sit;
 
 	system_del_ip_tunnel(name);
 
@@ -1025,12 +1106,12 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
 	blobmsg_parse(tunnel_attr_list.params, __TUNNEL_ATTR_MAX, tb,
 		blob_data(attr), blob_len(attr));
 
-	cur = tb[TUNNEL_ATTR_TYPE];
-	if (!cur)
+	if (!(cur = tb[TUNNEL_ATTR_TYPE]))
 		return -EINVAL;
-
 	str = blobmsg_data(cur);
-	if (!strcmp(str, "sit")) {
+	is_sit = !strcmp(str, "sit");
+
+	if (is_sit) {
 		p.iph.protocol = IPPROTO_IPV6;
 		base = "sit0";
 	} else
@@ -1052,5 +1133,35 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
 	}
 
 	strncpy(p.name, name, sizeof(p.name));
-	return tunnel_ioctl(base, cmd, &p);
+	if (tunnel_ioctl(base, SIOCADDTUNNEL, &p) < 0)
+		return -1;
+
+#ifdef SIOCADD6RD
+	cur = tb[TUNNEL_ATTR_6RD_PREFIX];
+	if (cur && is_sit) {
+		unsigned int mask;
+		struct ip_tunnel_6rd p6;
+
+		memset(&p6, 0, sizeof(p6));
+
+		if (!parse_ip_and_netmask(AF_INET6, blobmsg_data(cur),
+					&p6.prefix, &mask) || mask > 128)
+			return -EINVAL;
+		p6.prefixlen = mask;
+
+		if ((cur = tb[TUNNEL_ATTR_6RD_RELAY_PREFIX])) {
+			if (!parse_ip_and_netmask(AF_INET, blobmsg_data(cur),
+						&p6.relay_prefix, &mask) || mask > 32)
+				return -EINVAL;
+			p6.relay_prefixlen = mask;
+		}
+
+		if (tunnel_ioctl(name, SIOCADD6RD, &p6) < 0) {
+			system_del_ip_tunnel(name);
+			return -1;
+		}
+	}
+#endif
+
+	return 0;
 }