|
|
|
@ -141,7 +141,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
static const struct rt6_info ip6_blk_hole_entry_template = {
|
|
|
|
|
.dst = {
|
|
|
|
|
.__refcnt = ATOMIC_INIT(1),
|
|
|
|
|
@@ -2041,6 +2058,11 @@ static struct rt6_info *ip6_route_info_c
|
|
|
|
|
@@ -2046,6 +2063,11 @@ static struct rt6_info *ip6_route_info_c
|
|
|
|
|
rt->dst.output = ip6_pkt_prohibit_out;
|
|
|
|
|
rt->dst.input = ip6_pkt_prohibit;
|
|
|
|
|
break;
|
|
|
|
@ -153,7 +153,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
case RTN_THROW:
|
|
|
|
|
case RTN_UNREACHABLE:
|
|
|
|
|
default:
|
|
|
|
|
@@ -2766,6 +2788,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
|
|
|
@@ -2771,6 +2793,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
|
|
|
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -171,7 +171,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
/*
|
|
|
|
|
* Allocate a dst for local (unicast / anycast) address.
|
|
|
|
|
*/
|
|
|
|
|
@@ -3002,7 +3035,8 @@ static int rtm_to_fib6_config(struct sk_
|
|
|
|
|
@@ -3007,7 +3040,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 ||
|
|
|
|
@ -181,7 +181,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
cfg->fc_flags |= RTF_REJECT;
|
|
|
|
|
|
|
|
|
|
if (rtm->rtm_type == RTN_LOCAL)
|
|
|
|
|
@@ -3492,6 +3526,9 @@ static int rt6_fill_node(struct net *net
|
|
|
|
|
@@ -3497,6 +3531,9 @@ static int rt6_fill_node(struct net *net
|
|
|
|
|
case -EACCES:
|
|
|
|
|
rtm->rtm_type = RTN_PROHIBIT;
|
|
|
|
|
break;
|
|
|
|
@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
case -EAGAIN:
|
|
|
|
|
rtm->rtm_type = RTN_THROW;
|
|
|
|
|
break;
|
|
|
|
|
@@ -3810,6 +3847,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
@@ -3815,6 +3852,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);
|
|
|
|
@ -200,7 +200,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
|
|
|
|
|
@@ -3821,6 +3860,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
|
@@ -3826,6 +3865,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);
|
|
|
|
@ -208,7 +208,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
@@ -4037,6 +4077,17 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
@@ -4042,6 +4082,17 @@ static int __net_init ip6_route_net_init
|
|
|
|
|
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);
|
|
|
|
@ -226,7 +226,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
net->ipv6.sysctl.flush_delay = 0;
|
|
|
|
|
@@ -4055,6 +4106,8 @@ out:
|
|
|
|
|
@@ -4060,6 +4111,8 @@ out:
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
out_ip6_prohibit_entry:
|
|
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
|
|
out_ip6_null_entry:
|
|
|
|
|
@@ -4072,6 +4125,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
|
|
@@ -4077,6 +4130,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
|
|
kfree(net->ipv6.ip6_blk_hole_entry);
|
|
|
|
@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
|
#endif
|
|
|
|
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
|
|
|
}
|
|
|
|
|
@@ -4145,6 +4199,9 @@ void __init ip6_route_init_special_entri
|
|
|
|
|
@@ -4150,6 +4204,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);
|
|
|
|
|