system_set_dev_sysctl("/sys/class/net/%s/brport/hairpin_mode", dev->ifname, val);
}
+static void system_bridge_set_isolate_mode(struct device *dev, const char *val)
+{
+ system_set_dev_sysctl("/sys/class/net/%s/brport/isolate_mode", dev->ifname, val);
+}
+
static void system_bridge_set_multicast_router(struct device *dev, const char *val, bool bridge)
{
system_set_dev_sysctl(bridge ? "/sys/class/net/%s/bridge/multicast_router" :
static void
handle_hotplug_msg(char *data, int size)
{
- const char *subsystem = NULL, *interface = NULL;
+ const char *subsystem = NULL, *interface = NULL, *interface_old = NULL;
char *cur, *end, *sep;
struct device *dev;
int skip;
- bool add;
+ bool add, move = false;
if (!strncmp(data, "add@", 4))
add = true;
else if (!strncmp(data, "remove@", 7))
add = false;
+ else if (!strncmp(data, "move@", 5)) {
+ add = true;
+ move = true;
+ }
else
return;
subsystem = sep + 1;
if (strcmp(subsystem, "net") != 0)
return;
+ } else if (!strcmp(cur, "DEVPATH_OLD")) {
+ interface_old = strrchr(sep + 1, '/');
+ if (interface_old)
+ interface_old++;
}
- if (subsystem && interface)
+ }
+
+ if (subsystem && interface) {
+ if (move && interface_old)
+ goto move;
+ else
goto found;
}
+
return;
+move:
+ dev = device_find(interface_old);
+ if (!dev)
+ goto found;
+
+ if (dev->type != &simple_device_type)
+ goto found;
+
+ device_set_present(dev, false);
+
found:
dev = device_find(interface);
if (!dev)
ifr.ifr_ifindex = dev->ifindex;
else
ifr.ifr_data = data;
- strncpy(ifr.ifr_name, bridge, sizeof(ifr.ifr_name));
+ strncpy(ifr.ifr_name, bridge, sizeof(ifr.ifr_name) - 1);
return ioctl(sock_ioctl, cmd, &ifr);
}
!dev->settings.unicast_flood)
system_bridge_set_unicast_flood(dev, "0");
+ if (dev->settings.flags & DEV_OPT_ISOLATE &&
+ dev->settings.isolate)
+ system_bridge_set_isolate_mode(dev, "1");
+
return ret;
}
int system_if_resolve(struct device *dev)
{
struct ifreq ifr;
- strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+ strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
if (!ioctl(sock_ioctl, SIOCGIFINDEX, &ifr))
return ifr.ifr_ifindex;
else
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr);
+ strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
+ if (ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr) < 0)
+ return -1;
+
ifr.ifr_flags |= add;
ifr.ifr_flags &= ~rem;
return ioctl(sock_ioctl, SIOCSIFFLAGS, &ifr);
.u.name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD,
};
- ioctl(sock_ioctl, SIOCSIFVLAN, &ifr);
+ if (ioctl(sock_ioctl, SIOCSIFVLAN, &ifr) < 0)
+ return -1;
if (id < 0) {
ifr.cmd = DEL_VLAN_CMD;
char buf[10];
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+ strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
if (ioctl(sock_ioctl, SIOCGIFMTU, &ifr) == 0) {
s->mtu = ifr.ifr_mtu;
}
}
-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);
-
- globfree(&gl);
-}
-
-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)
{
char buf[12];
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
+ strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
if (s->flags & DEV_OPT_MTU & apply_mask) {
ifr.ifr_mtu = s->mtu;
if (ioctl(sock_ioctl, SIOCSIFMTU, &ifr) < 0)
}
if (s->flags & DEV_OPT_SENDREDIRECTS & apply_mask)
system_set_sendredirects(dev, s->sendredirects ? "1" : "0");
-
- system_if_apply_rps_xps(dev, s);
}
int system_if_up(struct device *dev)
};
int ret = 1;
+ if (!cb)
+ return ret;
+
msg = nlmsg_alloc_simple(RTM_GETLINK, 0);
if (!msg)
goto out;
{
struct ethtool_cmd ecmd;
struct ifreq ifr;
- char buf[64], *s;
+ char *s;
void *c;
- int dir_fd;
-
- snprintf(buf, sizeof(buf), "/sys/class/net/%s", dev->ifname);
- dir_fd = open(buf, O_DIRECTORY);
memset(&ecmd, 0, sizeof(ecmd));
memset(&ifr, 0, sizeof(ifr));
- strcpy(ifr.ifr_name, dev->ifname);
+ strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name) - 1);
ifr.ifr_data = (caddr_t) &ecmd;
ecmd.cmd = ETHTOOL_GSET;
blobmsg_add_string_buffer(b);
}
- close(dir_fd);
return 0;
}
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+ strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name) - 1);
ifr.ifr_ifru.ifru_data = p;
return ioctl(sock_ioctl, cmd, &ifr);
}
}
#ifdef IFLA_IPTUN_FMR_MAX
- if ((cur = tb[TUNNEL_ATTR_FMRS])) {
+ if ((cur = tb[TUNNEL_ATTR_DATA])) {
+ struct blob_attr *dcur;
+ unsigned drem, fmrcnt = 0;
struct nlattr *fmrs = nla_nest_start(nlm, IFLA_IPTUN_FMRS);
- struct blob_attr *fmr;
- unsigned rem, fmrcnt = 0;
- blobmsg_for_each_attr(fmr, cur, rem) {
- if (blobmsg_type(fmr) != BLOBMSG_TYPE_STRING)
+ if (!fmrs) {
+ ret = -ENOMEM;
+ goto failure;
+ }
+
+ blobmsg_for_each_attr(dcur, cur, drem) {
+ if (blobmsg_type(dcur) != BLOBMSG_TYPE_ARRAY ||
+ strcmp(blobmsg_name(dcur), "fmrs") ||
+ blobmsg_check_array(dcur, BLOBMSG_TYPE_UNSPEC) <= 0)
continue;
- unsigned ip4len, ip6len, ealen, offset = 6;
- char ip6buf[48];
- char ip4buf[16];
+ struct blob_attr *rcur;
+ unsigned rrem;
+ blobmsg_for_each_attr(rcur, dcur, rrem) {
+ struct blob_attr *tb_fmr[__FMR_DATA_ATTR_MAX], *tb_cur;
+ struct in6_addr ip6prefix;
+ struct in_addr ip4prefix;
+ unsigned ip4len, ip6len, ealen, offset;
+
+ blobmsg_parse(fmr_data_attr_list.params, __FMR_DATA_ATTR_MAX, tb_fmr,
+ blobmsg_data(rcur), blobmsg_len(rcur));
+
+ if (!(tb_cur = tb_fmr[FMR_DATA_PREFIX6]) ||
+ !parse_ip_and_netmask(AF_INET6,
+ blobmsg_data(tb_cur), &ip6prefix,
+ &ip6len)) {
+ ret = -EINVAL;
+ goto failure;
+ }
- if (sscanf(blobmsg_get_string(fmr), "%47[^/]/%u,%15[^/]/%u,%u,%u",
- ip6buf, &ip6len, ip4buf, &ip4len, &ealen, &offset) < 5) {
- ret = -EINVAL;
- goto failure;
- }
+ if (!(tb_cur = tb_fmr[FMR_DATA_PREFIX4]) ||
+ !parse_ip_and_netmask(AF_INET,
+ blobmsg_data(tb_cur), &ip4prefix,
+ &ip4len)) {
+ ret = -EINVAL;
+ goto failure;
+ }
- struct in6_addr ip6prefix;
- struct in_addr ip4prefix;
- if (inet_pton(AF_INET6, ip6buf, &ip6prefix) != 1 ||
- inet_pton(AF_INET, ip4buf, &ip4prefix) != 1) {
- ret = -EINVAL;
- goto failure;
- }
+ if (!(tb_cur = tb_fmr[FMR_DATA_EALEN])) {
+ ret = -EINVAL;
+ goto failure;
+ }
+ ealen = blobmsg_get_u32(tb_cur);
- struct nlattr *rule = nla_nest_start(nlm, ++fmrcnt);
+ if (!(tb_cur = tb_fmr[FMR_DATA_OFFSET])) {
+ ret = -EINVAL;
+ goto failure;
+ }
+ offset = blobmsg_get_u32(tb_cur);
- nla_put(nlm, IFLA_IPTUN_FMR_IP6_PREFIX, sizeof(ip6prefix), &ip6prefix);
- nla_put(nlm, IFLA_IPTUN_FMR_IP4_PREFIX, sizeof(ip4prefix), &ip4prefix);
- nla_put_u8(nlm, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, ip6len);
- nla_put_u8(nlm, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, ip4len);
- nla_put_u8(nlm, IFLA_IPTUN_FMR_EA_LEN, ealen);
- nla_put_u8(nlm, IFLA_IPTUN_FMR_OFFSET, offset);
+ struct nlattr *rule = nla_nest_start(nlm, ++fmrcnt);
+ if (!rule) {
+ ret = -ENOMEM;
+ goto failure;
+ }
- nla_nest_end(nlm, rule);
- }
+ nla_put(nlm, IFLA_IPTUN_FMR_IP6_PREFIX, sizeof(ip6prefix), &ip6prefix);
+ nla_put(nlm, IFLA_IPTUN_FMR_IP4_PREFIX, sizeof(ip4prefix), &ip4prefix);
+ nla_put_u8(nlm, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, ip6len);
+ nla_put_u8(nlm, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, ip4len);
+ nla_put_u8(nlm, IFLA_IPTUN_FMR_EA_LEN, ealen);
+ nla_put_u8(nlm, IFLA_IPTUN_FMR_OFFSET, offset);
+ nla_nest_end(nlm, rule);
+ }
+ }
nla_nest_end(nlm, fmrs);
}
#endif
}
nla_put_u16(msg, IFLA_VXLAN_PORT, htons(port));
+ if ((cur = tb_data[VXLAN_DATA_ATTR_RXCSUM])) {
+ bool rxcsum = blobmsg_get_bool(cur);
+ nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, !rxcsum);
+ }
+
+ if ((cur = tb_data[VXLAN_DATA_ATTR_TXCSUM])) {
+ bool txcsum = blobmsg_get_bool(cur);
+ nla_put_u8(msg, IFLA_VXLAN_UDP_CSUM, txcsum);
+ nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, !txcsum);
+ }
+
if ((cur = tb[TUNNEL_ATTR_TOS])) {
char *str = blobmsg_get_string(cur);
unsigned tos = 1;
if (strcmp(str, "inherit")) {
- if (!system_tos_aton(str, &tos))
- return -EINVAL;
+ if (!system_tos_aton(str, &tos)) {
+ ret = -EINVAL;
+ goto failure;
+ }
}
nla_put_u8(msg, IFLA_VXLAN_TOS, tos);
if (p.iph.ttl && p.iph.frag_off == 0)
return -EINVAL;
- strncpy(p.name, name, sizeof(p.name));
+ strncpy(p.name, name, sizeof(p.name) - 1);
switch (p.iph.protocol) {
case IPPROTO_IPIP:
projects / project / netifd.git / blobdiff