projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generic: more missing symbols for 2.6.35
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
patches-2.6.25
/
101-netfilter_layer7_pktmatch.patch
diff --git
a/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
b/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
index
167d578
..
7b0dd43
100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
+++ b/
target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
@@
-1,6
+1,6
@@
--- a/include/linux/netfilter/xt_layer7.h
+++ b/include/linux/netfilter/xt_layer7.h
--- 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;
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
#endif /* _XT_LAYER7_H */
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
-@@ -
297,34 +297,36 @@
+@@ -
314,34 +314,36 @@ static int match_no_append(struct nf_con
}
/* add the new app data to the conntrack. Return number of bytes added. */
}
/* add the new app data to the conntrack. Return number of bytes added. */
@@
-61,8
+61,8
@@
return length;
}
return length;
}
-@@ -4
11,7 +413,7 @@
- const struct xt_layer7_info * info = matchinfo;
+@@ -4
38,7 +440,7 @@ match(const struct sk_buff *skbin,
+
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
- unsigned char * app_data;
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
- unsigned char * app_data;
@@
-70,18
+70,19
@@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
unsigned int pattern_result, appdatalen;
regexp * comppattern;
-@@ -4
39,8 +441,8 @@
+@@ -4
66,9 +468,8 @@ match(const struct sk_buff *skbin,
master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */
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) {
- 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)) {
+ master_conntrack->layer7.app_proto)) {
-
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
-@@ -473,6 +475,25 @@
+
+@@ -500,6 +501,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);
/* the return value gets checked later, when we're ready to use it */
comppattern = compile_and_cache(info->pattern, info->protocol);
@@
-105,5
+106,5
@@
+ }
+
/* On the first packet of a connection, allocate space for app data */
+ }
+
/* 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){
!master_conntrack->layer7.app_data){
This page took
0.02234 seconds
and
4
git commands to generate.