diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2010-08-17 19:06:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-19 17:16:25 -0700 |
| commit | aca071c1c1c07bcc0b100b7c58e59790d6be6a69 (patch) | |
| tree | 838cc780da30b1b06365f5feedac96ec164b1902 | |
| parent | 3d04ebb6ab2ac9a3bea7644f0d13cdf65002b870 (diff) | |
| download | linux-3.10-aca071c1c1c07bcc0b100b7c58e59790d6be6a69.tar.gz linux-3.10-aca071c1c1c07bcc0b100b7c58e59790d6be6a69.tar.bz2 linux-3.10-aca071c1c1c07bcc0b100b7c58e59790d6be6a69.zip | |
netfilter: xt_hashlimit: use proto_ports_offset() to support AH message
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netfilter/xt_hashlimit.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index b46a8390896..9228ee0dc11 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c @@ -448,6 +448,7 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo, { __be16 _ports[2], *ports; u8 nexthdr; + int poff; memset(dst, 0, sizeof(*dst)); @@ -492,19 +493,13 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo, return 0; } - switch (nexthdr) { - case IPPROTO_TCP: - case IPPROTO_UDP: - case IPPROTO_UDPLITE: - case IPPROTO_SCTP: - case IPPROTO_DCCP: - ports = skb_header_pointer(skb, protoff, sizeof(_ports), + poff = proto_ports_offset(nexthdr); + if (poff >= 0) { + ports = skb_header_pointer(skb, protoff + poff, sizeof(_ports), &_ports); - break; - default: + } else { _ports[0] = _ports[1] = 0; ports = _ports; - break; } if (!ports) return -1; |