patch-2.4.22 linux-2.4.22/net/ipv6/netfilter/ip6t_ipv6header.c
Next file: linux-2.4.22/net/ipv6/netfilter/ip6t_rt.c
Previous file: linux-2.4.22/net/ipv6/netfilter/ip6t_frag.c
Back to the patch index
Back to the overall index
- Lines: 112
- Date:
2003-08-25 04:44:44.000000000 -0700
- Orig file:
linux-2.4.21/net/ipv6/netfilter/ip6t_ipv6header.c
- Orig date:
2003-06-13 07:51:39.000000000 -0700
diff -urN linux-2.4.21/net/ipv6/netfilter/ip6t_ipv6header.c linux-2.4.22/net/ipv6/netfilter/ip6t_ipv6header.c
@@ -19,12 +19,6 @@
MODULE_DESCRIPTION("IPv6 headers match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
static int
ipv6header_match(const struct sk_buff *skb,
const struct net_device *in,
@@ -40,10 +34,8 @@
int len;
u8 nexthdr;
unsigned int ptr;
- struct inet6_skb_parm *opt = (struct inet6_skb_parm *)skb->cb;
/* Make sure this isn't an evil packet */
- DEBUGP("ipv6_header entered \n");
/* type of the 1st exthdr */
nexthdr = skb->nh.ipv6h->nexthdr;
@@ -53,44 +45,10 @@
len = skb->len - ptr;
temp = 0;
- DEBUGP("ipv6_header nexthdr %02X \n",nexthdr);
- DEBUGP("ipv6_header ptr %08X \n",ptr);
- DEBUGP("ipv6_header skblen %04X \n",skb->len);
- DEBUGP("ipv6_header skbdatalen %04X \n",skb->data_len);
- DEBUGP("ipv6_header len %04X \n",len);
-#if 0
- for (temp=0;temp<skb->len;temp++){
- if (!(temp % 16 )) DEBUGP("\nipv6_header data ");
- DEBUGP("%02X ",skb->data[temp]);
- }
-#endif
- DEBUGP("\nipv6_header h.raw %02X %02X %02X %02X \n",
- skb->h.raw[0],
- skb->h.raw[1],
- skb->h.raw[2],
- skb->h.raw[3]);
- DEBUGP("ipv6_header nh.raw %02X %02X %02X %02X \n",
- skb->nh.raw[0],
- skb->nh.raw[1],
- skb->nh.raw[2],
- skb->nh.raw[3]);
- DEBUGP("ipv6_header CB %02X %02X %02X %02X %02X %02X %02X \n",
- opt->iif,
- opt->ra,
- opt->hop,
- opt->auth,
- opt->dst0,
- opt->srcrt,
- opt->dst1);
-
- temp = 0;
-
while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
int hdrlen;
- DEBUGP("ipv6_header header iteration \n");
-
/* Is there enough space for the next ext header? */
if (len < (int)sizeof(struct ipv6_opt_hdr))
return 0;
@@ -115,8 +73,6 @@
else
hdrlen = ipv6_optlen(hdr);
- DEBUGP("ipv6_header hdrlen %04X \n",hdrlen);
-
/* set the flag */
switch (nexthdr){
case NEXTHDR_HOP:
@@ -135,7 +91,6 @@
temp |= MASK_DSTOPTS;
break;
default:
- DEBUGP("IPV6HEADER match: unknown nextheader %u\n",nexthdr);
return 0;
break;
}
@@ -144,7 +99,6 @@
len -= hdrlen;
ptr += hdrlen;
if ( ptr > skb->len ) {
- DEBUGP("ipv6_header new ptr %04X \n",ptr);
break;
}
}
@@ -152,8 +106,6 @@
if ( (nexthdr != NEXTHDR_NONE ) && (nexthdr != NEXTHDR_ESP) )
temp |= MASK_PROTO;
- DEBUGP ("ipv6header: %02X %02X \n", temp, info->matchflags);
-
if (info->modeflag)
return (!( (temp & info->matchflags)
^ info->matchflags) ^ info->invflags);
@@ -171,8 +123,6 @@
/* Check for obvious errors */
/* This match is valid in all hooks! */
if (matchsize != IP6T_ALIGN(sizeof(struct ip6t_ipv6header_info))) {
- DEBUGP("ip6t_ipv6header: matchsize != %u\n",
- IP6T_ALIGN(sizeof(struct ip6t_ipv6header_info)));
return 0;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)