* netifd - network interface daemon
* Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
* Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013 Steven Barth <steven@midlink.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
#include <linux/if_vlan.h>
#include <linux/if_bridge.h>
#include <linux/if_tunnel.h>
+#include <linux/ip6_tunnel.h>
#include <linux/ethtool.h>
#include <linux/fib_rules.h>
+#ifndef RTN_FAILED_POLICY
+#define RTN_FAILED_POLICY 12
+#endif
+
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_snooping",
bridge->ifname, cfg->igmp_snoop ? "1" : "0");
+ args[0] = BRCTL_SET_BRIDGE_PRIORITY;
+ args[1] = cfg->priority;
+ system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+
if (cfg->flags & BRIDGE_OPT_AGEING_TIME) {
args[0] = BRCTL_SET_AGEING_TIME;
args[1] = sec_to_jiffies(cfg->ageing_time);
struct ifa_cacheinfo cinfo = {0xffffffffU, 0xffffffffU, 0, 0};
if (addr->preferred_until) {
- int preferred = addr->preferred_until - now;
+ int64_t preferred = addr->preferred_until - now;
if (preferred < 0)
preferred = 0;
+ else if (preferred > UINT32_MAX)
+ preferred = UINT32_MAX;
cinfo.ifa_prefered = preferred;
}
if (addr->valid_until) {
- int valid = addr->valid_until - now;
+ int64_t valid = addr->valid_until - now;
if (valid <= 0)
return -1;
+ else if (valid > UINT32_MAX)
+ valid = UINT32_MAX;
cinfo.ifa_valid = valid;
}
unsigned char scope = (cmd == RTM_DELROUTE) ? RT_SCOPE_NOWHERE :
(have_gw) ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK;
- unsigned int table = (route->flags & DEVROUTE_TABLE) ? route->table : RT_TABLE_MAIN;
+ unsigned int table = (route->flags & (DEVROUTE_TABLE | DEVROUTE_SRCTABLE))
+ ? route->table : RT_TABLE_MAIN;
struct rtmsg rtm = {
.rtm_family = (alen == 4) ? AF_INET : AF_INET6,
if (rule->flags & IPRULE_PRIORITY)
nla_put_u32(msg, FRA_PRIORITY, rule->priority);
+ else if (cmd == RTM_NEWRULE)
+ nla_put_u32(msg, FRA_PRIORITY, rule->order);
if (rule->flags & IPRULE_FWMARK)
nla_put_u32(msg, FRA_FWMARK, rule->fwmark);
n = RTN_UNICAST;
else if (!strcmp(action, "throw"))
n = RTN_THROW;
+ else if (!strcmp(action, "failed_policy"))
+ n = RTN_FAILED_POLICY;
else {
n = strtoul(action, &e, 0);
if (!e || *e || e == action || n > 255)
#define IP_DF 0x4000
#endif
-static void tunnel_parm_init(struct ip_tunnel_parm *p)
-{
- memset(p, 0, sizeof(*p));
- p->iph.version = 4;
- p->iph.ihl = 5;
- p->iph.frag_off = htons(IP_DF);
-}
-
static int tunnel_ioctl(const char *name, int cmd, void *p)
{
struct ifreq ifr;
int system_del_ip_tunnel(const char *name)
{
- struct ip_tunnel_parm p;
-
- tunnel_parm_init(&p);
- return tunnel_ioctl(name, SIOCDELTUNNEL, &p);
+ return tunnel_ioctl(name, SIOCDELTUNNEL, NULL);
}
int system_update_ipv6_mtu(struct device *dev, int mtu)
return ret;
}
-static int parse_ipaddr(struct blob_attr *attr, __be32 *addr)
-{
- if (!attr)
- return 1;
-
- return inet_pton(AF_INET, blobmsg_data(attr), (void *) addr);
-}
-
int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
{
struct blob_attr *tb[__TUNNEL_ATTR_MAX];
struct blob_attr *cur;
- struct ip_tunnel_parm p;
- const char *base, *str;
- bool is_sit;
+ const char *str;
system_del_ip_tunnel(name);
- tunnel_parm_init(&p);
-
blobmsg_parse(tunnel_attr_list.params, __TUNNEL_ATTR_MAX, tb,
blob_data(attr), blob_len(attr));
if (!(cur = tb[TUNNEL_ATTR_TYPE]))
return -EINVAL;
str = blobmsg_data(cur);
- is_sit = !strcmp(str, "sit");
- if (is_sit) {
- p.iph.protocol = IPPROTO_IPV6;
- base = "sit0";
- } else
+ unsigned int ttl = 0;
+ if ((cur = tb[TUNNEL_ATTR_TTL]) && (ttl = blobmsg_get_u32(cur)) > 255)
return -EINVAL;
- if (!parse_ipaddr(tb[TUNNEL_ATTR_LOCAL], &p.iph.saddr))
- return -EINVAL;
+ unsigned int link = 0;
+ if ((cur = tb[TUNNEL_ATTR_LINK])) {
+ struct interface *iface = vlist_find(&interfaces, blobmsg_data(cur), iface, node);
+ if (!iface)
+ return -EINVAL;
- if (!parse_ipaddr(tb[TUNNEL_ATTR_REMOTE], &p.iph.daddr))
- return -EINVAL;
+ if (iface->l3_dev.dev)
+ link = iface->l3_dev.dev->ifindex;
+ }
- if ((cur = tb[TUNNEL_ATTR_TTL])) {
- unsigned int val = blobmsg_get_u32(cur);
- if (val > 255)
+ if (!strcmp(str, "sit")) {
+ struct ip_tunnel_parm p = {
+ .link = link,
+ .iph = {
+ .version = 4,
+ .ihl = 5,
+ .frag_off = htons(IP_DF),
+ .protocol = IPPROTO_IPV6,
+ .ttl = ttl
+ }
+ };
+
+ if ((cur = tb[TUNNEL_ATTR_LOCAL]) &&
+ inet_pton(AF_INET, blobmsg_data(cur), &p.iph.saddr) < 1)
return -EINVAL;
- p.iph.ttl = val;
- }
+ if ((cur = tb[TUNNEL_ATTR_REMOTE]) &&
+ inet_pton(AF_INET, blobmsg_data(cur), &p.iph.daddr) < 1)
+ return -EINVAL;
- strncpy(p.name, name, sizeof(p.name));
- if (tunnel_ioctl(base, SIOCADDTUNNEL, &p) < 0)
- return -1;
+ strncpy(p.name, name, sizeof(p.name));
+ if (tunnel_ioctl("sit0", 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 ((cur = tb[TUNNEL_ATTR_6RD_PREFIX])) {
+ unsigned int mask;
+ struct ip_tunnel_6rd p6;
- if (!parse_ip_and_netmask(AF_INET6, blobmsg_data(cur),
- &p6.prefix, &mask) || mask > 128)
- return -EINVAL;
- p6.prefixlen = mask;
+ memset(&p6, 0, sizeof(p6));
- if ((cur = tb[TUNNEL_ATTR_6RD_RELAY_PREFIX])) {
- if (!parse_ip_and_netmask(AF_INET, blobmsg_data(cur),
- &p6.relay_prefix, &mask) || mask > 32)
+ if (!parse_ip_and_netmask(AF_INET6, blobmsg_data(cur),
+ &p6.prefix, &mask) || mask > 128)
return -EINVAL;
- p6.relay_prefixlen = mask;
- }
+ p6.prefixlen = mask;
- if (tunnel_ioctl(name, SIOCADD6RD, &p6) < 0) {
- system_del_ip_tunnel(name);
- return -1;
+ 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
+ } else if (!strcmp(str, "ipip6")) {
+ struct ip6_tnl_parm p = {
+ .link = link,
+ .proto = IPPROTO_IPIP,
+ .hop_limit = (ttl) ? ttl : 64,
+ .encap_limit = 4,
+ };
+
+ if ((cur = tb[TUNNEL_ATTR_LOCAL]) &&
+ inet_pton(AF_INET6, blobmsg_data(cur), &p.laddr) < 1)
+ return -EINVAL;
+
+ if ((cur = tb[TUNNEL_ATTR_REMOTE]) &&
+ inet_pton(AF_INET6, blobmsg_data(cur), &p.raddr) < 1)
+ return -EINVAL;
+
+ strncpy(p.name, name, sizeof(p.name));
+ if (tunnel_ioctl("ip6tnl0", SIOCADDTUNNEL, &p) < 0)
+ return -1;
+ } else
+ return -EINVAL;
return 0;
}