[NETFILTER]: ip6table_mangle: reroute when nfmark changes in NF_IP6_LOCAL_OUT

Now that IPv6 supports policy routing we need to reroute in NF_IP6_LOCAL_OUT
when the mark value changes.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index 52a7b9e76428c8a9ee359685b9b99dfd0c8809f1..d97e268cdfe50474b746da08390c95da89a213bf 100644 (file)
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -73,6 +73,7 @@ enum nf_ip6_hook_priorities {
 };
 
 #ifdef CONFIG_NETFILTER
+extern int ip6_route_me_harder(struct sk_buff *skb);
 extern unsigned int nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
                                    unsigned int dataoff, u_int8_t protocol);
 

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 297909570041930a2eb329a1925d1f0217e7c467..6ca6b71dfe0f07406f9222092da64559358df696 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -57,8 +57,6 @@ extern void                   ip6_route_input(struct sk_buff *skb);
 extern struct dst_entry *      ip6_route_output(struct sock *sk,
                                                 struct flowi *fl);
 
-extern int                     ip6_route_me_harder(struct sk_buff *skb);
-
 extern void                    ip6_route_init(void);
 extern void                    ip6_route_cleanup(void);
 

diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c
index 32db04fd831012ab8561ededc38bdd489840fb04..386ea260e76785f34f2a4a940653bce3939019f6 100644 (file)
--- a/net/ipv6/netfilter/ip6table_mangle.c
+++ b/net/ipv6/netfilter/ip6table_mangle.c
@@ -180,12 +180,8 @@ ip6t_local_hook(unsigned int hook,
                && (memcmp(&(*pskb)->nh.ipv6h->saddr, &saddr, sizeof(saddr))
                    || memcmp(&(*pskb)->nh.ipv6h->daddr, &daddr, sizeof(daddr))
                    || (*pskb)->nfmark != nfmark
-                   || (*pskb)->nh.ipv6h->hop_limit != hop_limit)) {
-
-               /* something which could affect routing has changed */
-
-               DEBUGP("ip6table_mangle: we'd need to re-route a packet\n");
-       }
+                   || (*pskb)->nh.ipv6h->hop_limit != hop_limit))
+               return ip6_route_me_harder(*pskb) == 0 ? ret : NF_DROP;
 
        return ret;
 }