X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=9c4bea63b9b51b8d7cef03165c413c0d0a10db10;hp=4737fa6e2c7083185af760c0e5142afb0175ece1;hb=827145f01d849c663f18e356157fd71f1a7cc45d;hpb=6b4570a107447034b5ae3861a7ca388d3052460a diff --git a/system-linux.c b/system-linux.c index 4737fa6..9c4bea6 100644 --- a/system-linux.c +++ b/system-linux.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -43,10 +44,24 @@ #define RTN_FAILED_POLICY 12 #endif +#ifndef RT_TABLE_PRELOCAL +#define RT_TABLE_PRELOCAL 128 +#endif + +#ifndef IFA_F_NOPREFIXROUTE +#define IFA_F_NOPREFIXROUTE 0x200 +#endif + +#ifndef IFA_FLAGS +#define IFA_FLAGS (IFA_MULTICAST + 1) +#endif + + #include #include #include #include +#include #include #include @@ -285,6 +300,31 @@ static void system_set_mldversion(struct device *dev, const char *val) system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/force_mld_version", dev->ifname, val); } +static void system_set_neigh4reachabletime(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/base_reachable_time_ms", dev->ifname, val); +} + +static void system_set_neigh6reachabletime(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/base_reachable_time_ms", dev->ifname, val); +} + +static void system_set_dadtransmits(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits", dev->ifname, val); +} + +static void system_bridge_set_multicast_to_unicast(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/class/net/%s/brport/multicast_to_unicast", dev->ifname, val); +} + +static void system_bridge_set_hairpin_mode(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/class/net/%s/brport/hairpin_mode", dev->ifname, val); +} + static int system_get_sysctl(const char *path, char *buf, const size_t buf_sz) { int fd = -1, ret = -1; @@ -343,11 +383,28 @@ static int system_get_mldversion(struct device *dev, char *buf, const size_t buf dev->ifname, buf, buf_sz); } +static int system_get_neigh4reachabletime(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/base_reachable_time_ms", + dev->ifname, buf, buf_sz); +} + +static int system_get_neigh6reachabletime(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/base_reachable_time_ms", + dev->ifname, buf, buf_sz); +} + +static int system_get_dadtransmits(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits", + dev->ifname, buf, buf_sz); +} + // Evaluate netlink messages static int cb_rtnl_event(struct nl_msg *msg, void *arg) { struct nlmsghdr *nh = nlmsg_hdr(msg); - struct ifinfomsg *ifi = NLMSG_DATA(nh); struct nlattr *nla[__IFLA_MAX]; int link_state = 0; char buf[10]; @@ -355,7 +412,7 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg) if (nh->nlmsg_type != RTM_NEWLINK) goto out; - nlmsg_parse(nh, sizeof(*ifi), nla, __IFLA_MAX - 1, NULL); + nlmsg_parse(nh, sizeof(struct ifinfomsg), nla, __IFLA_MAX - 1, NULL); if (!nla[IFLA_IFNAME]) goto out; @@ -509,12 +566,16 @@ static char *system_get_bridge(const char *name, char *buf, int buflen) return path + 1; } -static void system_bridge_set_wireless(const char *bridge, const char *dev) +static void +system_bridge_set_wireless(struct device *dev) { - snprintf(dev_buf, sizeof(dev_buf), - "/sys/devices/virtual/net/%s/brif/%s/multicast_to_unicast", - bridge, dev); - system_set_sysctl(dev_buf, "1"); + bool hairpin = true; + + if (dev->wireless_isolate) + hairpin = false; + + system_bridge_set_multicast_to_unicast(dev, "1"); + system_bridge_set_hairpin_mode(dev, hairpin ? "1" : "0"); } int system_bridge_addif(struct device *bridge, struct device *dev) @@ -527,7 +588,7 @@ int system_bridge_addif(struct device *bridge, struct device *dev) ret = system_bridge_if(bridge->ifname, dev, SIOCBRADDIF, NULL); if (dev->wireless) - system_bridge_set_wireless(bridge->ifname, dev->ifname); + system_bridge_set_wireless(dev); return ret; } @@ -755,6 +816,7 @@ sec_to_jiffies(int val) int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg) { + char buf[64]; unsigned long args[4] = {}; if (ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname) < 0) @@ -772,7 +834,11 @@ int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg) bridge->ifname, cfg->igmp_snoop ? "1" : "0"); system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_querier", - bridge->ifname, cfg->igmp_snoop ? "1" : "0"); + bridge->ifname, cfg->multicast_querier ? "1" : "0"); + + snprintf(buf, sizeof(buf), "%i", cfg->hash_max); + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/hash_max", + bridge->ifname, buf); args[0] = BRCTL_SET_BRIDGE_PRIORITY; args[1] = cfg->priority; @@ -978,6 +1044,10 @@ system_if_get_settings(struct device *dev, struct device_settings *s) s->flags |= DEV_OPT_MTU; } + s->mtu6 = system_update_ipv6_mtu(dev, 0); + if (s->mtu6 > 0) + s->flags |= DEV_OPT_MTU6; + if (ioctl(sock_ioctl, SIOCGIFTXQLEN, &ifr) == 0) { s->txqueuelen = ifr.ifr_qlen; s->flags |= DEV_OPT_TXQUEUELEN; @@ -1017,15 +1087,60 @@ system_if_get_settings(struct device *dev, struct device_settings *s) s->mldversion = strtoul(buf, NULL, 0); s->flags |= DEV_OPT_MLDVERSION; } + + if (!system_get_neigh4reachabletime(dev, buf, sizeof(buf))) { + s->neigh4reachabletime = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_NEIGHREACHABLETIME; + } + + if (!system_get_neigh6reachabletime(dev, buf, sizeof(buf))) { + s->neigh6reachabletime = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_NEIGHREACHABLETIME; + } + + if (!system_get_dadtransmits(dev, buf, sizeof(buf))) { + s->dadtransmits = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_DADTRANSMITS; + } +} + +static void +system_if_set_rps_xps_val(const char *path, int val) +{ + char val_buf[8]; + glob_t gl; + int i; + + if (glob(path, 0, NULL, &gl)) + return; + + snprintf(val_buf, sizeof(val_buf), "%x", val); + for (i = 0; i < gl.gl_pathc; i++) + system_set_sysctl(gl.gl_pathv[i], val_buf); +} + +static void +system_if_apply_rps_xps(struct device *dev, struct device_settings *s) +{ + long n_cpus = sysconf(_SC_NPROCESSORS_ONLN); + int val; + + if (n_cpus < 2) + return; + + val = (1 << n_cpus) - 1; + snprintf(dev_buf, sizeof(dev_buf), "/sys/class/net/%s/queues/*/rps_cpus", dev->ifname); + system_if_set_rps_xps_val(dev_buf, s->rps ? val : 0); + + snprintf(dev_buf, sizeof(dev_buf), "/sys/class/net/%s/queues/*/xps_cpus", dev->ifname); + system_if_set_rps_xps_val(dev_buf, s->xps ? val : 0); } void system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned int apply_mask) { struct ifreq ifr; - - if (!apply_mask) - return; + char buf[12]; memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name)); @@ -1034,6 +1149,9 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned if (ioctl(sock_ioctl, SIOCSIFMTU, &ifr) < 0) s->flags &= ~DEV_OPT_MTU; } + if (s->flags & DEV_OPT_MTU6 & apply_mask) { + system_update_ipv6_mtu(dev, s->mtu6); + } if (s->flags & DEV_OPT_TXQUEUELEN & apply_mask) { ifr.ifr_qlen = s->txqueuelen; if (ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr) < 0) @@ -1053,25 +1171,31 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned s->flags &= ~DEV_OPT_PROMISC; } if (s->flags & DEV_OPT_RPFILTER & apply_mask) { - char buf[2]; - snprintf(buf, sizeof(buf), "%d", s->rpfilter); system_set_rpfilter(dev, buf); } if (s->flags & DEV_OPT_ACCEPTLOCAL & apply_mask) system_set_acceptlocal(dev, s->acceptlocal ? "1" : "0"); if (s->flags & DEV_OPT_IGMPVERSION & apply_mask) { - char buf[2]; - snprintf(buf, sizeof(buf), "%d", s->igmpversion); system_set_igmpversion(dev, buf); } if (s->flags & DEV_OPT_MLDVERSION & apply_mask) { - char buf[2]; - snprintf(buf, sizeof(buf), "%d", s->mldversion); system_set_mldversion(dev, buf); } + if (s->flags & DEV_OPT_NEIGHREACHABLETIME & apply_mask) { + snprintf(buf, sizeof(buf), "%d", s->neigh4reachabletime); + system_set_neigh4reachabletime(dev, buf); + snprintf(buf, sizeof(buf), "%d", s->neigh6reachabletime); + system_set_neigh6reachabletime(dev, buf); + } + if (s->flags & DEV_OPT_DADTRANSMITS & apply_mask) { + snprintf(buf, sizeof(buf), "%d", s->dadtransmits); + system_set_dadtransmits(dev, buf); + } + + system_if_apply_rps_xps(dev, s); } int system_if_up(struct device *dev) @@ -1394,6 +1518,9 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd) } nla_put(msg, IFA_CACHEINFO, sizeof(cinfo), &cinfo); + + if (cmd == RTM_NEWADDR && (addr->flags & DEVADDR_OFFLINK)) + nla_put_u32(msg, IFA_FLAGS, IFA_F_NOPREFIXROUTE); } return system_rtnl_call(msg); @@ -1566,6 +1693,8 @@ bool system_resolve_rt_table(const char *name, unsigned int *id) table = RT_TABLE_MAIN; else if (!strcmp(name, "local")) table = RT_TABLE_LOCAL; + else if (!strcmp(name, "prelocal")) + table = RT_TABLE_PRELOCAL; /* try to look up name in /etc/iproute2/rt_tables */ else if ((f = fopen("/etc/iproute2/rt_tables", "r")) != NULL) @@ -1727,6 +1856,10 @@ int system_flush_iprules(void) rule.flags = IPRULE_INET4 | IPRULE_PRIORITY | IPRULE_LOOKUP; rule.priority = 0; + rule.lookup = RT_TABLE_PRELOCAL; + rv |= system_iprule(&rule, RTM_NEWRULE); + + rule.priority = 1; rule.lookup = RT_TABLE_LOCAL; rv |= system_iprule(&rule, RTM_NEWRULE); @@ -1742,6 +1875,10 @@ int system_flush_iprules(void) rule.flags = IPRULE_INET6 | IPRULE_PRIORITY | IPRULE_LOOKUP; rule.priority = 0; + rule.lookup = RT_TABLE_PRELOCAL; + rv |= system_iprule(&rule, RTM_NEWRULE); + + rule.priority = 1; rule.lookup = RT_TABLE_LOCAL; rv |= system_iprule(&rule, RTM_NEWRULE); @@ -2060,19 +2197,18 @@ int system_update_ipv6_mtu(struct device *dev, int 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; + if (!mtu) { + ssize_t len = read(fd, buf, sizeof(buf) - 1); + if (len < 0) + goto out; - lseek(fd, 0, SEEK_SET); - if (write(fd, buf, snprintf(buf, sizeof(buf), "%i", mtu)) <= 0) - ret = -1; + buf[len] = 0; + ret = atoi(buf); + } else { + if (write(fd, buf, snprintf(buf, sizeof(buf), "%i", mtu)) > 0) + ret = mtu; + } out: close(fd);