diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2009-04-30 01:31:37 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-04-30 01:31:37 +0000 |
commit | f6f3c4111af5653d426c9fd09d968a7ace3fa53d (patch) | |
tree | f2482d20f57164d670e2f5d00f5e4eebc5f55e5b /target/linux/generic-2.6/patches-2.6.29/101-netfilter_layer7_pktmatch.patch | |
parent | 25153928702222f82c9bb0404d33d13c91947a75 (diff) | |
download | master-31e0f0ae-f6f3c4111af5653d426c9fd09d968a7ace3fa53d.tar.gz master-31e0f0ae-f6f3c4111af5653d426c9fd09d968a7ace3fa53d.tar.bz2 master-31e0f0ae-f6f3c4111af5653d426c9fd09d968a7ace3fa53d.zip |
refreshed layer7 patches for 2.6.26.8, 2.6.27.21, 2.6.28.9 and 2.6.29.1
SVN-Revision: 15502
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29/101-netfilter_layer7_pktmatch.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/101-netfilter_layer7_pktmatch.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.29/101-netfilter_layer7_pktmatch.patch index 9e499248cf..4931b1bdb7 100644 --- a/target/linux/generic-2.6/patches-2.6.29/101-netfilter_layer7_pktmatch.patch +++ b/target/linux/generic-2.6/patches-2.6.29/101-netfilter_layer7_pktmatch.patch @@ -1,6 +1,6 @@ --- a/include/linux/netfilter/xt_layer7.h +++ b/include/linux/netfilter/xt_layer7.h -@@ -8,6 +8,7 @@ struct xt_layer7_info { +@@ -8,6 +8,7 @@ char protocol[MAX_PROTOCOL_LEN]; char pattern[MAX_PATTERN_LEN]; u_int8_t invert; @@ -10,7 +10,7 @@ #endif /* _XT_LAYER7_H */ --- a/net/netfilter/xt_layer7.c +++ b/net/netfilter/xt_layer7.c -@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con +@@ -314,33 +314,35 @@ } /* add the new app data to the conntrack. Return number of bytes added. */ @@ -60,8 +60,8 @@ return length; } -@@ -428,7 +430,7 @@ match(const struct sk_buff *skbin, - 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,7 +69,7 @@ unsigned int pattern_result, appdatalen; regexp * comppattern; -@@ -456,8 +458,8 @@ match(const struct sk_buff *skbin, +@@ -466,8 +468,8 @@ master_conntrack = master_ct(master_conntrack); /* if we've classified it or seen too many packets */ @@ -80,7 +80,7 @@ pattern_result = match_no_append(conntrack, master_conntrack, ctinfo, master_ctinfo, info); -@@ -490,6 +492,25 @@ match(const struct sk_buff *skbin, +@@ -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); |