|
|
@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
case RTN_THROW:
|
|
|
|
case RTN_THROW:
|
|
|
|
case RTN_UNREACHABLE:
|
|
|
|
case RTN_UNREACHABLE:
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
@@ -3765,6 +3784,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
|
|
@@ -3769,6 +3788,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
|
|
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
|
|
|
|
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.
|
|
|
|
* Allocate a dst for local (unicast / anycast) address.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@@ -4212,7 +4242,8 @@ static int rtm_to_fib6_config(struct sk_
|
|
|
|
@@ -4216,7 +4246,8 @@ static int rtm_to_fib6_config(struct sk_
|
|
|
|
if (rtm->rtm_type == RTN_UNREACHABLE ||
|
|
|
|
if (rtm->rtm_type == RTN_UNREACHABLE ||
|
|
|
|
rtm->rtm_type == RTN_BLACKHOLE ||
|
|
|
|
rtm->rtm_type == RTN_BLACKHOLE ||
|
|
|
|
rtm->rtm_type == RTN_PROHIBIT ||
|
|
|
|
rtm->rtm_type == RTN_PROHIBIT ||
|
|
|
@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
cfg->fc_flags |= RTF_REJECT;
|
|
|
|
cfg->fc_flags |= RTF_REJECT;
|
|
|
|
|
|
|
|
|
|
|
|
if (rtm->rtm_type == RTN_LOCAL)
|
|
|
|
if (rtm->rtm_type == RTN_LOCAL)
|
|
|
|
@@ -5056,6 +5087,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
@@ -5060,6 +5091,8 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
|
|
|
|
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
|
|
|
|
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(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->dst.dev = dev;
|
|
|
|
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
|
|
|
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
@@ -5067,6 +5100,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
@@ -5071,6 +5104,7 @@ static int ip6_route_dev_notify(struct n
|
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
|
|
|
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);
|
|
|
|
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -5261,6 +5295,15 @@ static int __net_init ip6_route_net_init
|
|
|
|
@@ -5265,6 +5299,15 @@ static int __net_init ip6_route_net_init
|
|
|
|
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
|
|
|
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
|
|
|
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
|
|
|
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
|
|
|
ip6_template_metrics, true);
|
|
|
|
ip6_template_metrics, true);
|
|
|
@ -218,7 +218,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
net->ipv6.sysctl.flush_delay = 0;
|
|
|
|
net->ipv6.sysctl.flush_delay = 0;
|
|
|
|
@@ -5279,6 +5322,8 @@ out:
|
|
|
|
@@ -5283,6 +5326,8 @@ out:
|
|
|
|
return ret;
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
@ -227,7 +227,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
out_ip6_prohibit_entry:
|
|
|
|
out_ip6_prohibit_entry:
|
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
|
out_ip6_null_entry:
|
|
|
|
out_ip6_null_entry:
|
|
|
|
@@ -5299,6 +5344,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
|
@@ -5303,6 +5348,7 @@ static void __net_exit ip6_route_net_exi
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
|
kfree(net->ipv6.ip6_prohibit_entry);
|
|
|
|
kfree(net->ipv6.ip6_blk_hole_entry);
|
|
|
|
kfree(net->ipv6.ip6_blk_hole_entry);
|
|
|
@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> |
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
|
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -5375,6 +5421,9 @@ void __init ip6_route_init_special_entri
|
|
|
|
@@ -5379,6 +5425,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_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->dst.dev = init_net.loopback_dev;
|
|
|
|
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
|
|
|
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
|
|
|