diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
commit | 19b0e56ba7d5a1c93075cac3d662486917a9ef35 (patch) | |
tree | 030ca3ec5a74f7bf1a96580ad73d6e22956198b1 /target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch | |
parent | 3b90e01db8852a89a0925e0b44faec6119d6c5c9 (diff) | |
download | upstream-19b0e56ba7d5a1c93075cac3d662486917a9ef35.tar.gz upstream-19b0e56ba7d5a1c93075cac3d662486917a9ef35.tar.bz2 upstream-19b0e56ba7d5a1c93075cac3d662486917a9ef35.zip |
refresh patches against 2.6.27 final
SVN-Revision: 12987
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch index dff6d188aa..ad0fdb823f 100644 --- a/target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch +++ b/target/linux/generic-2.6/patches-2.6.27/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 @@ +@@ -8,6 +8,7 @@ struct xt_layer7_info { 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 -@@ -297,34 +297,36 @@ +@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con } /* add the new app data to the conntrack. Return number of bytes added. */ @@ -60,7 +60,7 @@ return length; } -@@ -411,7 +413,7 @@ +@@ -411,7 +413,7 @@ match(const struct sk_buff *skbin, const struct xt_layer7_info * info = matchinfo; enum ip_conntrack_info master_ctinfo, ctinfo; struct nf_conn *master_conntrack, *conntrack; @@ -69,7 +69,7 @@ unsigned int pattern_result, appdatalen; regexp * comppattern; -@@ -439,8 +441,8 @@ +@@ -439,8 +441,8 @@ match(const struct sk_buff *skbin, 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); -@@ -473,6 +475,25 @@ +@@ -473,6 +475,25 @@ match(const struct sk_buff *skbin, /* the return value gets checked later, when we're ready to use it */ comppattern = compile_and_cache(info->pattern, info->protocol); |