X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=e45fc6978f5da0eedf21f6ab3ac4d1571ea835d4;hp=bb7ccf90d1c8bd0193fd37adf6727c4e7b5139dc;hb=94bfecc312f8bcecb857d6b070d1c22869226ce4;hpb=f6f065d3997ccc8d42805529e4aad59b789579ad diff --git a/system-linux.c b/system-linux.c index bb7ccf9..e45fc69 100644 --- a/system-linux.c +++ b/system-linux.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -270,6 +271,31 @@ static void system_set_rpfilter(struct device *dev, const char *val) system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/rp_filter", dev->ifname, val); } +static void system_set_acceptlocal(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/accept_local", dev->ifname, val); +} + +static void system_set_igmpversion(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/force_igmp_version", dev->ifname, val); +} + +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 int system_get_sysctl(const char *path, char *buf, const size_t buf_sz) { int fd = -1, ret = -1; @@ -310,6 +336,36 @@ static int system_get_rpfilter(struct device *dev, char *buf, const size_t buf_s dev->ifname, buf, buf_sz); } +static int system_get_acceptlocal(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/accept_local", + dev->ifname, buf, buf_sz); +} + +static int system_get_igmpversion(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/force_igmp_version", + dev->ifname, buf, buf_sz); +} + +static int system_get_mldversion(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv6/conf/%s/force_mld_version", + 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); +} + // Evaluate netlink messages static int cb_rtnl_event(struct nl_msg *msg, void *arg) { @@ -739,7 +795,7 @@ 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"); args[0] = BRCTL_SET_BRIDGE_PRIORITY; args[1] = cfg->priority; @@ -969,6 +1025,63 @@ system_if_get_settings(struct device *dev, struct device_settings *s) s->rpfilter = strtoul(buf, NULL, 0); s->flags |= DEV_OPT_RPFILTER; } + + if (!system_get_acceptlocal(dev, buf, sizeof(buf))) { + s->acceptlocal = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_ACCEPTLOCAL; + } + + if (!system_get_igmpversion(dev, buf, sizeof(buf))) { + s->igmpversion = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_IGMPVERSION; + } + + if (!system_get_mldversion(dev, buf, sizeof(buf))) { + 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; + } +} + +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 @@ -976,9 +1089,6 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned { struct ifreq ifr; - if (!apply_mask) - return; - memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name)); if (s->flags & DEV_OPT_MTU & apply_mask) { @@ -1010,11 +1120,37 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned 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) { + char buf[12]; + + snprintf(buf, sizeof(buf), "%d", s->neigh4reachabletime); + system_set_neigh4reachabletime(dev, buf); + snprintf(buf, sizeof(buf), "%d", s->neigh6reachabletime); + system_set_neigh6reachabletime(dev, buf); + } + + system_if_apply_rps_xps(dev, s); } int system_if_up(struct device *dev) { system_if_get_settings(dev, &dev->orig_settings); + /* Only keep orig settings based on what needs to be set */ + dev->orig_settings.flags &= dev->settings.flags; system_if_apply_settings(dev, &dev->settings, dev->settings.flags); return system_if_flags(dev->ifname, IFF_UP, 0); } @@ -1022,7 +1158,6 @@ int system_if_up(struct device *dev) int system_if_down(struct device *dev) { int ret = system_if_flags(dev->ifname, 0, IFF_UP); - dev->orig_settings.flags &= dev->settings.flags; system_if_apply_settings(dev, &dev->orig_settings, dev->orig_settings.flags); return ret; } @@ -1394,11 +1529,16 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd) rtm.rtm_table = RT_TABLE_LOCAL; } - if (rtm.rtm_type == RTN_LOCAL || rtm.rtm_type == RTN_NAT) + if (rtm.rtm_type == RTN_LOCAL || rtm.rtm_type == RTN_NAT) { rtm.rtm_scope = RT_SCOPE_HOST; - else if (rtm.rtm_type == RTN_BROADCAST || rtm.rtm_type == RTN_MULTICAST || - rtm.rtm_type == RTN_ANYCAST) + } else if (rtm.rtm_type == RTN_BROADCAST || rtm.rtm_type == RTN_MULTICAST || + rtm.rtm_type == RTN_ANYCAST) { rtm.rtm_scope = RT_SCOPE_LINK; + } else if (rtm.rtm_type == RTN_BLACKHOLE || rtm.rtm_type == RTN_UNREACHABLE || + rtm.rtm_type == RTN_PROHIBIT || rtm.rtm_type == RTN_FAILED_POLICY) { + rtm.rtm_scope = RT_SCOPE_UNIVERSE; + dev = NULL; + } } msg = nlmsg_alloc_simple(cmd, flags); @@ -1410,8 +1550,12 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd) if (route->mask) nla_put(msg, RTA_DST, alen, &route->addr); - if (route->sourcemask) - nla_put(msg, RTA_SRC, alen, &route->source); + if (route->sourcemask) { + if (rtm.rtm_family == AF_INET) + nla_put(msg, RTA_PREFSRC, alen, &route->source); + else + nla_put(msg, RTA_SRC, alen, &route->source); + } if (route->metric > 0) nla_put_u32(msg, RTA_PRIORITY, route->metric); @@ -1654,7 +1798,7 @@ int system_flush_iprules(void) rule.flags = IPRULE_INET4 | IPRULE_PRIORITY | IPRULE_LOOKUP; - rule.priority = 0; + rule.priority = 128; rule.lookup = RT_TABLE_LOCAL; rv |= system_iprule(&rule, RTM_NEWRULE); @@ -1669,7 +1813,7 @@ int system_flush_iprules(void) rule.flags = IPRULE_INET6 | IPRULE_PRIORITY | IPRULE_LOOKUP; - rule.priority = 0; + rule.priority = 128; rule.lookup = RT_TABLE_LOCAL; rv |= system_iprule(&rule, RTM_NEWRULE);