diff options
| author | Julian Anastasov <ja@ssi.bg> | 2010-10-17 16:46:17 +0300 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2010-10-21 11:04:43 +0200 |
| commit | 0d79641a96d612aaa6d57a4d4f521d7ed9c9ccdd (patch) | |
| tree | 9783497ace4f8ff8eeac24524ecb93012166c60d /net/netfilter/ipvs/ip_vs_proto.c | |
| parent | 3233759be7eeca9998c514b8f49e8cf2b85e64d3 (diff) | |
| download | kernel_samsung_smdk4412-0d79641a96d612aaa6d57a4d4f521d7ed9c9ccdd.zip kernel_samsung_smdk4412-0d79641a96d612aaa6d57a4d4f521d7ed9c9ccdd.tar.gz kernel_samsung_smdk4412-0d79641a96d612aaa6d57a4d4f521d7ed9c9ccdd.tar.bz2 | |
ipvs: provide address family for debugging
As skb->protocol is not valid in LOCAL_OUT add
parameter for address family in packet debugging functions.
Even if ports are not present in AH and ESP change them to
use ip_vs_tcpudp_debug_packet to show at least valid addresses
as before. This patch removes the last user of skb->protocol
in IPVS.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_proto.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_proto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c index 027f654..c539983 100644 --- a/net/netfilter/ipvs/ip_vs_proto.c +++ b/net/netfilter/ipvs/ip_vs_proto.c @@ -172,8 +172,8 @@ ip_vs_tcpudp_debug_packet_v4(struct ip_vs_protocol *pp, else if (ih->frag_off & htons(IP_OFFSET)) sprintf(buf, "%pI4->%pI4 frag", &ih->saddr, &ih->daddr); else { - __be16 _ports[2], *pptr -; + __be16 _ports[2], *pptr; + pptr = skb_header_pointer(skb, offset + ih->ihl*4, sizeof(_ports), _ports); if (pptr == NULL) @@ -223,13 +223,13 @@ ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp, void -ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp, +ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp, const struct sk_buff *skb, int offset, const char *msg) { #ifdef CONFIG_IP_VS_IPV6 - if (skb->protocol == htons(ETH_P_IPV6)) + if (af == AF_INET6) ip_vs_tcpudp_debug_packet_v6(pp, skb, offset, msg); else #endif |