projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[cavium-octeon] update to 2.6.30-rc5
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
patches-2.6.27
/
101-netfilter_layer7_pktmatch.patch
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
0152957
..
f65e301
100644
(file)
--- 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,5
+1,3
@@
-diff --git a/include/linux/netfilter/xt_layer7.h b/include/linux/netfilter/xt_layer7.h
-index 147cd64..c38d3c4 100644
--- a/include/linux/netfilter/xt_layer7.h
+++ b/include/linux/netfilter/xt_layer7.h
@@ -8,6 +8,7 @@ struct xt_layer7_info {
--- a/include/linux/netfilter/xt_layer7.h
+++ b/include/linux/netfilter/xt_layer7.h
@@ -8,6 +8,7 @@ struct xt_layer7_info {
@@
-10,11
+8,9
@@
index 147cd64..c38d3c4 100644
};
#endif /* _XT_LAYER7_H */
};
#endif /* _XT_LAYER7_H */
-diff --git a/net/netfilter/xt_layer7.c b/net/netfilter/xt_layer7.c
-index a9b88d3..e0e962d 100644
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
n * conntrack,
+@@ -314,33 +314,35 @@ 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. */
@@
-64,8
+60,8
@@
index a9b88d3..e0e962d 100644
return length;
}
return length;
}
-@@ -4
28,7 +43
0,7 @@ match(const struct sk_buff *skbin,
- const struct xt_layer7_info * info = matchinfo;
+@@ -4
38,7 +44
0,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;
@@
-73,7
+69,7
@@
index a9b88d3..e0e962d 100644
unsigned int pattern_result, appdatalen;
regexp * comppattern;
unsigned int pattern_result, appdatalen;
regexp * comppattern;
-@@ -4
56,8 +45
8,8 @@ match(const struct sk_buff *skbin,
+@@ -4
66,8 +46
8,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 */
@@
-84,7
+80,7
@@
index a9b88d3..e0e962d 100644
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
-@@ -
490,6 +49
2,25 @@ match(const struct sk_buff *skbin,
+@@ -
500,6 +50
2,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);
This page took
0.027529 seconds
and
4
git commands to generate.