diff options
author | pavlov <pavlov@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-08 15:52:26 +0000 |
---|---|---|
committer | pavlov <pavlov@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-08 15:52:26 +0000 |
commit | 92526421f15ccc9a62e264f4afd528bd87c8b175 (patch) | |
tree | 4e1cb0e9188ff57cf55813b909c01810e44756fe /target/linux/generic-2.6/patches-2.6.23/101-netfilter_layer7_pktmatch.patch | |
parent | cf536445de64d5ed6a2e949483533a638c1a642f (diff) |
updated layer7 to 2.15.. current is 2.16.1, i might bump again, this has been uncommitted for a bit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9674 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23/101-netfilter_layer7_pktmatch.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.23/101-netfilter_layer7_pktmatch.patch | 109 |
1 files changed, 0 insertions, 109 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.23/101-netfilter_layer7_pktmatch.patch deleted file mode 100644 index 8e8395cb5..000000000 --- a/target/linux/generic-2.6/patches-2.6.23/101-netfilter_layer7_pktmatch.patch +++ /dev/null @@ -1,109 +0,0 @@ -Index: linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_layer7.h -=================================================================== ---- linux-2.6.23-rc6.orig/include/linux/netfilter_ipv4/ipt_layer7.h 2007-09-21 16:23:59.000000000 +0800 -+++ linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_layer7.h 2007-09-21 16:24:00.000000000 +0800 -@@ -21,6 +21,7 @@ - char protocol[MAX_PROTOCOL_LEN]; - char invert:1; - char pattern[MAX_PATTERN_LEN]; -+ char pkt; - }; - - #endif /* _IPT_LAYER7_H */ -Index: linux-2.6.23-rc6/net/ipv4/netfilter/ipt_layer7.c -=================================================================== ---- linux-2.6.23-rc6.orig/net/ipv4/netfilter/ipt_layer7.c 2007-09-21 16:23:59.000000000 +0800 -+++ linux-2.6.23-rc6/net/ipv4/netfilter/ipt_layer7.c 2007-09-21 16:24:00.000000000 +0800 -@@ -300,33 +300,34 @@ - } - - /* 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) -+static int add_datastr(char *target, int offset, char *app_data, int len) - { - 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 -- // a fix, all it does is waste a very small amount of time. -- if(!master_conntrack->layer7.app_data) return 0; -+ if(!target) return 0; - - /* Strip nulls. Make everything lower case (our regex lib doesn't - do case insensitivity). Add it to the end of the current data. */ -- for(i = 0; i < maxdatalen-oldlength-1 && -- i < appdatalen; i++) { -+ for(i = 0; i < maxdatalen-offset-1 && i < len; i++) { - if(app_data[i] != '\0') { -- master_conntrack->layer7.app_data[length+oldlength] = -+ target[length+offset] = - /* the kernel version of tolower mungs 'upper ascii' */ - isascii(app_data[i])? tolower(app_data[i]) : app_data[i]; - length++; - } - } -+ target[length+offset] = '\0'; -+ -+ 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; - -+ 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; - } - -@@ -343,7 +344,7 @@ - enum ip_conntrack_info master_ctinfo, ctinfo; - struct nf_conn *master_conntrack; - struct nf_conn *conntrack; -- unsigned char * app_data; -+ unsigned char *app_data, *tmp_data; - unsigned int pattern_result, appdatalen; - regexp * comppattern; - -@@ -365,8 +366,8 @@ - master_conntrack = master_ct(master_conntrack); - - /* if we've classified it or seen too many packets */ -- if(TOTAL_PACKETS > num_packets || -- master_conntrack->layer7.app_proto) { -+ if(!info->pkt && (TOTAL_PACKETS > num_packets || -+ master_conntrack->layer7.app_proto)) { - - pattern_result = match_no_append(conntrack, master_conntrack, ctinfo, master_ctinfo, info); - -@@ -396,6 +397,23 @@ - comppattern = compile_and_cache(info->pattern, info->protocol); - spin_unlock_bh(&list_lock); - -+ if (info->pkt) { -+ tmp_data = kmalloc(maxdatalen, GFP_ATOMIC); -+ if(!tmp_data){ -+ if (net_ratelimit()) -+ printk(KERN_ERR "layer7: out of memory in match, bailing.\n"); -+ return info->invert; -+ } -+ -+ tmp_data[0] = '\0'; -+ add_datastr(tmp_data, 0, app_data, appdatalen); -+ pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0); -+ kfree(tmp_data); -+ tmp_data = NULL; -+ -+ return (pattern_result ^ info->invert); -+ } -+ - /* On the first packet of a connection, allocate space for app data */ - write_lock(&ct_lock); - if(TOTAL_PACKETS == 1 && !skb->cb[0] && !master_conntrack->layer7.app_data) { |