|
|
|
@ -1,3 +1,5 @@ |
|
|
|
|
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 {
|
|
|
|
@ -8,9 +10,11 @@ |
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#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
|
|
|
|
|
@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
|
|
|
|
|
@@ -314,33 +314,35 @@ static int match_no_append(struct nf_conn * conntrack,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* add the new app data to the conntrack. Return number of bytes added. */
|
|
|
|
@ -20,7 +24,7 @@ |
|
|
|
|
{
|
|
|
|
|
int length = 0, i;
|
|
|
|
|
- int oldlength = master_conntrack->layer7.app_data_len;
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- /* This is a fix for a race condition by Deti Fliegl. However, I'm not
|
|
|
|
|
- clear on whether the race condition exists or whether this really
|
|
|
|
|
- fixes it. I might just be being dense... Anyway, if it's not really
|
|
|
|
@ -46,21 +50,21 @@ |
|
|
|
|
+
|
|
|
|
|
+ return length;
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
- master_conntrack->layer7.app_data[length+oldlength] = '\0';
|
|
|
|
|
- master_conntrack->layer7.app_data_len = length + oldlength;
|
|
|
|
|
+
|
|
|
|
|
+/* add the new app data to the conntrack. Return number of bytes added. */
|
|
|
|
|
+static int add_data(struct nf_conn * master_conntrack,
|
|
|
|
|
+ char * app_data, int appdatalen)
|
|
|
|
|
+{
|
|
|
|
|
+ int length;
|
|
|
|
|
|
|
|
|
|
- master_conntrack->layer7.app_data[length+oldlength] = '\0';
|
|
|
|
|
- master_conntrack->layer7.app_data_len = length + oldlength;
|
|
|
|
|
+ length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
|
|
|
|
|
+ master_conntrack->layer7.app_data_len += length;
|
|
|
|
|
|
|
|
|
|
return length;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -411,7 +413,7 @@ match(const struct sk_buff *skbin,
|
|
|
|
|
@@ -428,7 +430,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,18 +73,18 @@ |
|
|
|
|
unsigned int pattern_result, appdatalen;
|
|
|
|
|
regexp * comppattern;
|
|
|
|
|
|
|
|
|
|
@@ -439,8 +441,8 @@ match(const struct sk_buff *skbin,
|
|
|
|
|
@@ -456,8 +458,8 @@ match(const struct sk_buff *skbin,
|
|
|
|
|
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) {
|
|
|
|
|
+ if(!info->pkt && (TOTAL_PACKETS > num_packets ||
|
|
|
|
|
+ if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
|
|
|
|
|
+ master_conntrack->layer7.app_proto)) {
|
|
|
|
|
|
|
|
|
|
pattern_result = match_no_append(conntrack, master_conntrack,
|
|
|
|
|
ctinfo, master_ctinfo, info);
|
|
|
|
|
@@ -473,6 +475,25 @@ match(const struct sk_buff *skbin,
|
|
|
|
|
@@ -490,6 +492,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);
|
|
|
|
|
|
|
|
|
@ -104,5 +108,5 @@ |
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
/* 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){
|
|
|
|
|