projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ppc40x] cleanup magicbox patches
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
patches-2.6.21
/
101-netfilter_layer7_pktmatch.patch
diff --git
a/target/linux/generic-2.6/patches-2.6.21/101-netfilter_layer7_pktmatch.patch
b/target/linux/generic-2.6/patches-2.6.21/101-netfilter_layer7_pktmatch.patch
index
be2dff8
..
d3129ee
100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.21/101-netfilter_layer7_pktmatch.patch
+++ b/
target/linux/generic-2.6/patches-2.6.21/101-netfilter_layer7_pktmatch.patch
@@
-2,15
+2,15
@@
+++ b/include/linux/netfilter/xt_layer7.h
@@ -8,6 +8,7 @@ struct xt_layer7_info {
char protocol[MAX_PROTOCOL_LEN];
+++ b/include/linux/netfilter/xt_layer7.h
@@ -8,6 +8,7 @@ struct xt_layer7_info {
char protocol[MAX_PROTOCOL_LEN];
+ char invert:1;
char pattern[MAX_PATTERN_LEN];
char pattern[MAX_PATTERN_LEN];
- u_int8_t invert;
+ u_int8_t pkt;
};
#endif /* _XT_LAYER7_H */
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
+ u_int8_t pkt;
};
#endif /* _XT_LAYER7_H */
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
-@@ -29
7,34 +297
,36 @@ static int match_no_append(struct nf_con
+@@ -29
6,34 +296
,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;
}
-@@ -41
1,7 +413
,7 @@ match(const struct sk_buff *skbin,
-
const struct xt_layer7_info * info =
matchinfo;
+@@ -41
0,7 +412
,7 @@ match(const struct sk_buff *skbin,
+
struct xt_layer7_info * info = (struct xt_layer7_info *)
matchinfo;
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,7
+70,7
@@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
unsigned int pattern_result, appdatalen;
regexp * comppattern;
-@@ -43
9,8 +441
,8 @@ match(const struct sk_buff *skbin,
+@@ -43
8,8 +440
,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 */
@@
-81,7
+81,7
@@
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
-@@ -47
3,6 +475
,25 @@ match(const struct sk_buff *skbin,
+@@ -47
2,6 +474
,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.022881 seconds
and
4
git commands to generate.