Skip to contentSkip to conversation

: introduce skb_header_pointer() to ipv6header match

PATCH In review Patrick McHardy 1 participant 1 message Nov 15, 2004 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 2/9 : introduce skb_header_pointer() to ipv6header match

Convert ipt_ipv6header match to skb_header_pointer.

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/11/04 03:14:26+01:00 [email protected]
# [NETFILTER]: introduce skb_header_pointer() to ipv6header match
#
# Signed-off-by: Yasuyuki KOZAKAI <[email protected]>
# Signed-off-by: Patrick McHardy <[email protected]>
#

# net/ipv6/netfilter/ip6t_ipv6header.c
#   2004/11/04 03:14:19+01:00 [email protected] +6 -5
#   [NETFILTER]: introduce skb_header_pointer() to ipv6header match
#   
#   Signed-off-by: Yasuyuki KOZAKAI <[email protected]>
#   Signed-off-by: Patrick McHardy <[email protected]>
# 
diff -Nru a/net/ipv6/netfilter/ip6t_ipv6header.c b/net/ipv6/netfilter/ip6t_ipv6header.c
--- a/net/ipv6/netfilter/ip6t_ipv6header.c	2004-11-15 22:06:19 +01:00
+++ b/net/ipv6/netfilter/ip6t_ipv6header.c	2004-11-15 22:06:19 +01:00
@@ -51,7 +51,7 @@
 	temp = 0;
         while (ip6t_ext_hdr(nexthdr)) {
-        	struct ipv6_opt_hdr *hdr;
+		struct ipv6_opt_hdr _hdr, *hp;
         	int hdrlen;

/* Is there enough space for the next ext header? */
@@ -68,15 +68,16 @@
break;
}

- hdr=(struct ipv6_opt_hdr *)(skb->data+ptr);
+ hp = skb_header_pointer(skb, ptr, sizeof(_hdr), &_hdr);
+ BUG_ON(hp == NULL);

/* Calculate the header length */

                 if (nexthdr == NEXTHDR_FRAGMENT) {
                         hdrlen = 8;
                 } else if (nexthdr == NEXTHDR_AUTH)

- hdrlen = (hdr->hdrlen+2)<<2;
+ hdrlen = (hp->hdrlen+2)<<2;
else
- hdrlen = ipv6_optlen(hdr);
+ hdrlen = ipv6_optlen(hp);

/* set the flag */
switch (nexthdr){
@@ -100,7 +101,7 @@
break;
}

- nexthdr = hdr->nexthdr;

+                nexthdr = hp->nexthdr;
                 len -= hdrlen;
                 ptr += hdrlen;

if (ptr > skb->len)