diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-07-26 19:17:07 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-07-26 19:17:07 +0000 |
commit | 21d378afc77e1912305cc56348776de59ed0ba8b (patch) | |
tree | 5b29dc1f9243a76366169b0d367a09348d736375 /target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch | |
parent | 11d0acf4507ce4695db6bc95d8687e2179da8842 (diff) | |
download | master-187ad058-21d378afc77e1912305cc56348776de59ed0ba8b.tar.gz master-187ad058-21d378afc77e1912305cc56348776de59ed0ba8b.tar.bz2 master-187ad058-21d378afc77e1912305cc56348776de59ed0ba8b.zip |
[kernel] cleanup trailing whitespaces in 2.6.26 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11945 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch index 167d578cf1..dff6d188aa 100644 --- a/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch +++ b/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch @@ -20,13 +20,12 @@ { 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 + +- /* 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 @@ -38,13 +37,13 @@ /* the kernel version of tolower mungs 'upper ascii' */ - master_conntrack->layer7.app_data[length+oldlength] = + target[length+offset] = - isascii(app_data[i])? + isascii(app_data[i])? tolower(app_data[i]) : app_data[i]; length++; } } + target[length+offset] = '\0'; -+ ++ + return length; +} @@ -79,7 +78,7 @@ + if(!info->pkt && (TOTAL_PACKETS > num_packets || + master_conntrack->layer7.app_proto)) { - pattern_result = match_no_append(conntrack, master_conntrack, + pattern_result = match_no_append(conntrack, master_conntrack, ctinfo, master_ctinfo, info); @@ -473,6 +475,25 @@ /* the return value gets checked later, when we're ready to use it */ @@ -105,5 +104,5 @@ + } + /* On the first packet of a connection, allocate space for app data */ - if(TOTAL_PACKETS == 1 && !skb->cb[0] && + if(TOTAL_PACKETS == 1 && !skb->cb[0] && !master_conntrack->layer7.app_data){ |