|
|
|
@ -287,9 +287,9 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
int err;
|
|
|
|
|
+ struct __ip6_tnl_fmr *fmr;
|
|
|
|
|
|
|
|
|
|
if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) ||
|
|
|
|
|
!ip6_tnl_xmit_ctl(t))
|
|
|
|
|
@@ -1108,6 +1246,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
|
|
/* ensure we can access the full inner ip header */
|
|
|
|
|
if (!pskb_may_pull(skb, sizeof(struct iphdr)))
|
|
|
|
|
@@ -1114,6 +1252,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
|
|
|
|
|
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
|
|
|
|
|
fl6.flowi6_mark = skb->mark;
|
|
|
|
|
|
|
|
|
@ -308,7 +308,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
|
|
|
|
|
if (err != 0) {
|
|
|
|
|
/* XXX: send ICMP error even if DF is not set. */
|
|
|
|
|
@@ -1276,6 +1426,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
|
|
|
|
|
@@ -1286,6 +1436,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
|
|
|
|
|
t->parms.flowinfo = p->flowinfo;
|
|
|
|
|
t->parms.link = p->link;
|
|
|
|
|
t->parms.proto = p->proto;
|
|
|
|
@ -323,7 +323,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
ip6_tnl_dst_reset(t);
|
|
|
|
|
ip6_tnl_link_config(t);
|
|
|
|
|
return 0;
|
|
|
|
|
@@ -1306,6 +1464,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
|
|
|
|
|
@@ -1316,6 +1474,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
|
|
|
|
|
p->flowinfo = u->flowinfo;
|
|
|
|
|
p->link = u->link;
|
|
|
|
|
p->proto = u->proto;
|
|
|
|
@ -331,7 +331,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
memcpy(p->name, u->name, sizeof(u->name));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -1581,6 +1740,15 @@ static int ip6_tnl_validate(struct nlatt
|
|
|
|
|
@@ -1591,6 +1750,15 @@ static int ip6_tnl_validate(struct nlatt
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -347,7 +347,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
static void ip6_tnl_netlink_parms(struct nlattr *data[],
|
|
|
|
|
struct __ip6_tnl_parm *parms)
|
|
|
|
|
{
|
|
|
|
|
@@ -1614,6 +1782,46 @@ static void ip6_tnl_netlink_parms(struct
|
|
|
|
|
@@ -1624,6 +1792,46 @@ static void ip6_tnl_netlink_parms(struct
|
|
|
|
|
|
|
|
|
|
if (data[IFLA_IPTUN_PROTO])
|
|
|
|
|
parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
|
|
|
|
@ -394,7 +394,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
|
|
|
|
|
@@ -1666,6 +1874,12 @@ static void ip6_tnl_dellink(struct net_d
|
|
|
|
|
@@ -1676,6 +1884,12 @@ static void ip6_tnl_dellink(struct net_d
|
|
|
|
|
|
|
|
|
|
static size_t ip6_tnl_get_size(const struct net_device *dev)
|
|
|
|
|
{
|
|
|
|
@ -407,7 +407,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
return
|
|
|
|
|
/* IFLA_IPTUN_LINK */
|
|
|
|
|
nla_total_size(4) +
|
|
|
|
|
@@ -1683,6 +1897,24 @@ static size_t ip6_tnl_get_size(const str
|
|
|
|
|
@@ -1693,6 +1907,24 @@ static size_t ip6_tnl_get_size(const str
|
|
|
|
|
nla_total_size(4) +
|
|
|
|
|
/* IFLA_IPTUN_PROTO */
|
|
|
|
|
nla_total_size(1) +
|
|
|
|
@ -432,7 +432,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -1690,6 +1922,9 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
|
|
@@ -1700,6 +1932,9 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
|
|
{
|
|
|
|
|
struct ip6_tnl *tunnel = netdev_priv(dev);
|
|
|
|
|
struct __ip6_tnl_parm *parm = &tunnel->parms;
|
|
|
|
@ -442,7 +442,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
|
|
|
|
|
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
|
|
|
|
|
nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr),
|
|
|
|
|
@@ -1700,8 +1935,27 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
|
|
@@ -1710,8 +1945,27 @@ static int ip6_tnl_fill_info(struct sk_b
|
|
|
|
|
nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
|
|
|
|
|
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
|
|
|
|
|
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
|
|
|
|
@ -471,7 +471,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> |
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
|
@@ -1717,6 +1971,7 @@ static const struct nla_policy ip6_tnl_p
|
|
|
|
|
@@ -1727,6 +1981,7 @@ static const struct nla_policy ip6_tnl_p
|
|
|
|
|
[IFLA_IPTUN_FLOWINFO] = { .type = NLA_U32 },
|
|
|
|
|
[IFLA_IPTUN_FLAGS] = { .type = NLA_U32 },
|
|
|
|
|
[IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
|
|
|
|
|