|
|
|
@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
|
|
|
case RTN_THROW:
|
|
|
|
|
case RTN_UNREACHABLE:
|
|
|
|
|
default:
|
|
|
|
|
@@ -4389,6 +4408,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
|
|
|
@@ -4414,6 +4433,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
|
|
|
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
|
|
|
/*
|
|
|
|
|
* Allocate a dst for local (unicast / anycast) address.
|
|
|
|
|
*/
|
|
|
|
|
@@ -4869,7 +4899,8 @@ static int rtm_to_fib6_config(struct sk_
|
|
|
|
|
@@ -4894,7 +4924,8 @@ static int rtm_to_fib6_config(struct sk_
|
|
|
|
|
if (rtm->rtm_type == RTN_UNREACHABLE ||
|
|
|
|
|
rtm->rtm_type == RTN_BLACKHOLE ||
|
|
|
|
|
rtm->rtm_type == RTN_PROHIBIT ||
|
|
|
|
@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
|
|
|
cfg->fc_flags |= RTF_REJECT;
|
|
|
|
|
|
|
|
|
|
if (rtm->rtm_type == RTN_LOCAL)
|
|
|
|
|
@@ -5989,6 +6020,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
@@ -6014,6 +6045,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
|
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
|
|
|
|
|
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
|
|
|
|
@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
|
|
|
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
|
|
|
|
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
|
|
|
|
#endif
|
|
|
|
|
@@ -6000,6 +6033,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
@@ -6025,6 +6058,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
|
|
|
@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
@@ -6192,6 +6226,8 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
@@ -6217,6 +6251,8 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
|
net->ipv6.fib6_has_custom_rules = false;
|
|
|
|
@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
|
|
|
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
|
|
|
|
|
sizeof(*net->ipv6.ip6_prohibit_entry),
|
|
|
|
|
GFP_KERNEL);
|
|
|
|
|
@@ -6202,11 +6238,21 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
@@ -6227,11 +6263,21 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
ip6_template_metrics, true);
|
|
|
|
|
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
|
|
|
|
|
|
|
|
|
@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
|
|
|
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
|
|
|
|
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
|
|
|
|
ip6_template_metrics, true);
|
|
|
|
|
@@ -6230,6 +6276,8 @@ out:
|
|
|
|
|
@@ -6255,6 +6301,8 @@ out:
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
|
|
|
out_ip6_prohibit_entry:
|
|
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
|
|
out_ip6_null_entry:
|
|
|
|
|
@@ -6249,6 +6297,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
|
|
@@ -6274,6 +6322,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
|
|
kfree(net->ipv6.ip6_null_entry);
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
|
@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
|
|
|
kfree(net->ipv6.ip6_blk_hole_entry);
|
|
|
|
|
#endif
|
|
|
|
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
|
|
|
@@ -6326,6 +6375,9 @@ void __init ip6_route_init_special_entri
|
|
|
|
|
@@ -6351,6 +6400,9 @@ void __init ip6_route_init_special_entri
|
|
|
|
|
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
|
|
|
|
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
|
|
|
|
|
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
|
|
|
|