upgrade layer7 to the latest version and add fixes for 2.6.21 and 2.6.22-rc - compile...

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.22 / 101-netfilter_layer7_pktmatch.patch

diff --git a/target/linux/generic-2.6/patches-2.6.22/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.22/101-netfilter_layer7_pktmatch.patch
index 2d7f058cab23c43fbd9cf081c947ebdb1303dd6e..5ac30a7c2e7da305f6bcf2952cf78fd813598695 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.22/101-netfilter_layer7_pktmatch.patch
+++ b/target/linux/generic-2.6/patches-2.6.22/101-netfilter_layer7_pktmatch.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_layer7.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_layer7.h
---- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_layer7.h       2007-05-26 20:17:47.624408296 +0200
-+++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_layer7.h       2007-05-26 20:17:48.729240336 +0200
+Index: linux-2.6.22-rc6/include/linux/netfilter_ipv4/ipt_layer7.h
+===================================================================
+--- linux-2.6.22-rc6.orig/include/linux/netfilter_ipv4/ipt_layer7.h    2007-07-02 03:23:28.597194750 +0200
++++ linux-2.6.22-rc6/include/linux/netfilter_ipv4/ipt_layer7.h 2007-07-02 03:23:44.730203000 +0200
 @@ -21,6 +21,7 @@
      char protocol[MAX_PROTOCOL_LEN];
      char invert:1;
@@ -9,24 +10,24 @@ diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_layer7.h linux-2.6
  };
  
  #endif /* _IPT_LAYER7_H */
-diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_layer7.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_layer7.c
---- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_layer7.c 2007-05-26 20:17:47.626407992 +0200
-+++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_layer7.c 2007-05-26 20:17:48.729240336 +0200
-@@ -296,33 +296,34 @@
-       }
+Index: linux-2.6.22-rc6/net/ipv4/netfilter/ipt_layer7.c
+===================================================================
+--- linux-2.6.22-rc6.orig/net/ipv4/netfilter/ipt_layer7.c      2007-07-02 03:23:28.609195500 +0200
++++ linux-2.6.22-rc6/net/ipv4/netfilter/ipt_layer7.c   2007-07-02 03:23:54.234797000 +0200
+@@ -300,33 +300,34 @@
  }
  
--/* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct ip_conntrack * master_conntrack,
+ /* 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)
 +static int add_datastr(char *target, int offset, char *app_data, int len)
  {
        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;
@@ -45,33 +46,33 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_layer7.c linux-2.6.21.1.dev/
                }
        }
 +      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 ip_conntrack * master_conntrack,
++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;
  }
-@@ -339,7 +340,7 @@
-       struct ipt_layer7_info * info = (struct ipt_layer7_info *)matchinfo;
+ 
+@@ -343,7 +344,7 @@
        enum ip_conntrack_info master_ctinfo, ctinfo;
-       struct ip_conntrack *master_conntrack, *conntrack;
+       struct nf_conn *master_conntrack;
+       struct nf_conn *conntrack;
 -      unsigned char * app_data;
 +      unsigned char *app_data, *tmp_data;
        unsigned int pattern_result, appdatalen;
        regexp * comppattern;
  
-@@ -362,8 +363,8 @@
+@@ -365,8 +366,8 @@
                master_conntrack = master_ct(master_conntrack);
  
        /* if we've classified it or seen too many packets */
@@ -82,7 +83,7 @@ diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_layer7.c linux-2.6.21.1.dev/
  
                pattern_result = match_no_append(conntrack, master_conntrack, ctinfo, master_ctinfo, info);
  
-@@ -394,6 +395,23 @@
+@@ -396,6 +397,23 @@
        comppattern = compile_and_cache(info->pattern, info->protocol);
        spin_unlock_bh(&list_lock);