fix 101-netfilter_layer7_pktmatch.patch for 2.6.26.8

[openwrt/openwrt.git] / target / linux / generic-2.6 / patches-2.6.26 / 101-netfilter_layer7_pktmatch.patch

diff --git a/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch
index dff6d188aaf7d0eeea1f9075833f1c42e1d9d315..81ca6cee71d697605e4f838493bcba5b199d3da1 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch
@@ -10,7 +10,7 @@
  #endif /* _XT_LAYER7_H */
 --- a/net/netfilter/xt_layer7.c
 +++ b/net/netfilter/xt_layer7.c
-@@ -297,34 +297,36 @@
+@@ -314,34 +314,36 @@
  }
  
  /* add the new app data to the conntrack.  Return number of bytes added. */
@@ -21,12 +21,12 @@
        int length = 0, i;
 -      int oldlength = master_conntrack->layer7.app_data_len;
  
--      /* This is a fix for a race condition by Deti Fliegl. However, I'm not
--         clear on whether the race condition exists or whether this really
--         fixes it.  I might just be being dense... Anyway, if it's not really
+-      /* This is a fix for a race condition by Deti Fliegl. However, I'm not 
+-         clear on whether the race condition exists or whether this really 
+-         fixes it.  I might just be being dense... Anyway, if it's not really 
 -         a fix, all it does is waste a very small amount of time. */
 -      if(!master_conntrack->layer7.app_data) return 0;
-+      if (!target) return 0;
++      if(!target) return 0;
  
        /* Strip nulls. Make everything lower case (our regex lib doesn't
        do case insensitivity).  Add it to the end of the current data. */
@@ -37,31 +37,31 @@
                        /* the kernel version of tolower mungs 'upper ascii' */
 -                      master_conntrack->layer7.app_data[length+oldlength] =
 +                      target[length+offset] =
-                               isascii(app_data[i])?
+                               isascii(app_data[i])? 
                                        tolower(app_data[i]) : app_data[i];
                        length++;
                }
        }
 +      target[length+offset] = '\0';
-+
-+      return length;
-+}
  
 -      master_conntrack->layer7.app_data[length+oldlength] = '\0';
 -      master_conntrack->layer7.app_data_len = length + oldlength;
++      return length;
++}
+ 
 +/* add the new app data to the conntrack.  Return number of bytes added. */
 +static int add_data(struct nf_conn * master_conntrack,
 +                    char * app_data, int appdatalen)
 +{
 +      int length;
- 
++ 
 +      length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
 +      master_conntrack->layer7.app_data_len += length;
        return length;
  }
  
-@@ -411,7 +413,7 @@
-       const struct xt_layer7_info * info = matchinfo;
+@@ -438,7 +440,7 @@
+ 
        enum ip_conntrack_info master_ctinfo, ctinfo;
        struct nf_conn *master_conntrack, *conntrack;
 -      unsigned char * app_data;
@@ -69,18 +69,18 @@
        unsigned int pattern_result, appdatalen;
        regexp * comppattern;
  
-@@ -439,8 +441,8 @@
+@@ -466,8 +468,8 @@
                master_conntrack = master_ct(master_conntrack);
  
        /* if we've classified it or seen too many packets */
--      if(TOTAL_PACKETS > num_packets ||
+-      if(total_acct_packets(master_conntrack) > num_packets ||
 -         master_conntrack->layer7.app_proto) {
-+      if(!info->pkt && (TOTAL_PACKETS > num_packets ||
++      if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
 +         master_conntrack->layer7.app_proto)) {
  
-               pattern_result = match_no_append(conntrack, master_conntrack,
+               pattern_result = match_no_append(conntrack, master_conntrack, 
                                                 ctinfo, master_ctinfo, info);
-@@ -473,6 +475,25 @@
+@@ -500,6 +502,25 @@
        /* the return value gets checked later, when we're ready to use it */
        comppattern = compile_and_cache(info->pattern, info->protocol);
  
@@ -104,5 +104,5 @@
 +      }
 +
        /* On the first packet of a connection, allocate space for app data */
-       if(TOTAL_PACKETS == 1 && !skb->cb[0] &&
+       if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
           !master_conntrack->layer7.app_data){