Changeset 17284


Ignore:
Timestamp:
2009-08-16T09:45:34+02:00 (8 years ago)
Author:
juhosg
Message:

[kernel] 2.6.30: update layer7 patch

Location:
trunk/target/linux/generic-2.6/patches-2.6.30
Files:
1 deleted
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic-2.6/patches-2.6.30/100-netfilter_layer7_2.21.patch

    r17283 r17284  
    1717--- a/include/net/netfilter/nf_conntrack.h 
    1818+++ b/include/net/netfilter/nf_conntrack.h 
    19 @@ -118,6 +118,22 @@ struct nf_conn 
     19@@ -117,6 +117,22 @@ struct nf_conn { 
    2020        u_int32_t secmark; 
    2121 #endif 
     
    4242--- a/net/netfilter/Kconfig 
    4343+++ b/net/netfilter/Kconfig 
    44 @@ -795,6 +795,27 @@ config NETFILTER_XT_MATCH_STATE 
     44@@ -858,6 +858,27 @@ config NETFILTER_XT_MATCH_STATE 
    4545  
    4646          To compile it as a module, choose M here.  If unsure, say N. 
     
    7272--- a/net/netfilter/Makefile 
    7373+++ b/net/netfilter/Makefile 
    74 @@ -84,6 +84,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)  
     74@@ -88,6 +88,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)  
    7575 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o 
    7676 obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o 
     
    8282--- a/net/netfilter/nf_conntrack_core.c 
    8383+++ b/net/netfilter/nf_conntrack_core.c 
    84 @@ -201,6 +201,14 @@ destroy_conntrack(struct nf_conntrack *n 
     84@@ -203,6 +203,14 @@ destroy_conntrack(struct nf_conntrack *n 
    8585         * too. */ 
    8686        nf_ct_remove_expectations(ct); 
     
    9696        /* We overload first tuple to link into unconfirmed list. */ 
    9797        if (!nf_ct_is_confirmed(ct)) { 
    98                 BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode)); 
     98                BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode)); 
    9999--- a/net/netfilter/nf_conntrack_standalone.c 
    100100+++ b/net/netfilter/nf_conntrack_standalone.c 
    101 @@ -165,6 +165,12 @@ static int ct_seq_show(struct seq_file * 
    102                 return -ENOSPC; 
     101@@ -171,6 +171,12 @@ static int ct_seq_show(struct seq_file * 
     102                goto release; 
    103103 #endif 
    104104  
     
    110110+ 
    111111        if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use))) 
    112                 return -ENOSPC; 
     112                goto release; 
    113113  
    114114--- /dev/null 
  • trunk/target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch

    r15251 r17284  
    6161        return length; 
    6262 } 
    63 @@ -428,7 +430,7 @@ match(const struct sk_buff *skbin, 
    64         const struct xt_layer7_info * info = matchinfo; 
     63@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin, 
     64  
    6565        enum ip_conntrack_info master_ctinfo, ctinfo; 
    6666        struct nf_conn *master_conntrack, *conntrack; 
     
    7070        regexp * comppattern; 
    7171  
    72 @@ -456,8 +458,8 @@ match(const struct sk_buff *skbin, 
     72@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin, 
    7373                master_conntrack = master_ct(master_conntrack); 
    7474  
     
    8181                pattern_result = match_no_append(conntrack, master_conntrack,  
    8282                                                 ctinfo, master_ctinfo, info); 
    83 @@ -490,6 +492,25 @@ match(const struct sk_buff *skbin, 
     83@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin, 
    8484        /* the return value gets checked later, when we're ready to use it */ 
    8585        comppattern = compile_and_cache(info->pattern, info->protocol); 
Note: See TracChangeset for help on using the changeset viewer.