* [PATCH 7/8] netfilter: xt_hashlimit: use proto_ports_offset() to support AH message
@ 2010-08-18 5:06 Changli Gao
2010-08-20 0:17 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Changli Gao @ 2010-08-18 5:06 UTC (permalink / raw)
To: Patrick McHardy; +Cc: David S. Miller, netfilter-devel, netdev, Changli Gao
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
---
net/netfilter/xt_hashlimit.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index b46a839..9228ee0 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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 7/8] netfilter: xt_hashlimit: use proto_ports_offset() to support AH message
2010-08-18 5:06 [PATCH 7/8] netfilter: xt_hashlimit: use proto_ports_offset() to support AH message Changli Gao
@ 2010-08-20 0:17 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-08-20 0:17 UTC (permalink / raw)
To: xiaosuo; +Cc: kaber, netfilter-devel, netdev
From: Changli Gao <xiaosuo@gmail.com>
Date: Wed, 18 Aug 2010 13:06:39 +0800
> Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-20 0:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-18 5:06 [PATCH 7/8] netfilter: xt_hashlimit: use proto_ports_offset() to support AH message Changli Gao
2010-08-20 0:17 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).