Skip to contentSkip to conversation

netfilter: xt_hashlimit: use proto_ports_offset() to support AH message

PATCH Applied Changli Gao 2 participants 2 messages Aug 18, 2010 – Aug 20, 2010

Subsystems (3)
Networking Network drivers netfilter
lore
Share & tools
lore

Changli Gao

author
#0 lore raw

PATCH 7/8 netfilter: xt_hashlimit: use proto_ports_offset() to support AH message

Signed-off-by Changli Gao <[email protected]>
---
 net/netfilter/xt_hashlimit.c |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
net/netfilter/xt_hashlimit.c +5 -10
index b46a839..9228ee0 100644
@@ -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;