netfilter: move Ebtables to use Xtables

[safe/jmp/linux-2.6] / net / netfilter / nf_conntrack_amanda.c

diff --git a/net/netfilter/nf_conntrack_amanda.c b/net/netfilter/nf_conntrack_amanda.c
index e42ab23..38aedee 100644 (file)
--- a/net/netfilter/nf_conntrack_amanda.c
+++ b/net/netfilter/nf_conntrack_amanda.c
@@ -36,7 +36,7 @@ MODULE_PARM_DESC(master_timeout, "timeout for the master connection");
 module_param(ts_algo, charp, 0400);
 MODULE_PARM_DESC(ts_algo, "textsearch algorithm to use (default kmp)");
 
-unsigned int (*nf_nat_amanda_hook)(struct sk_buff **pskb,
+unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb,
                                   enum ip_conntrack_info ctinfo,
                                   unsigned int matchoff,
                                   unsigned int matchlen,
@@ -53,7 +53,7 @@ enum amanda_strings {
 };
 
 static struct {
-       char                    *string;
+       const char              *string;
        size_t                  len;
        struct ts_config        *ts;
 } search[] __read_mostly = {
@@ -79,7 +79,7 @@ static struct {
        },
 };
 
-static int amanda_help(struct sk_buff **pskb,
+static int amanda_help(struct sk_buff *skb,
                       unsigned int protoff,
                       struct nf_conn *ct,
                       enum ip_conntrack_info ctinfo)
@@ -91,7 +91,6 @@ static int amanda_help(struct sk_buff **pskb,
        char pbuf[sizeof("65535")], *tmp;
        u_int16_t len;
        __be16 port;
-       int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
        int ret = NF_ACCEPT;
        typeof(nf_nat_amanda_hook) nf_nat_amanda;
 
@@ -101,25 +100,25 @@ static int amanda_help(struct sk_buff **pskb,
 
        /* increase the UDP timeout of the master connection as replies from
         * Amanda clients to the server can be quite delayed */
-       nf_ct_refresh(ct, *pskb, master_timeout * HZ);
+       nf_ct_refresh(ct, skb, master_timeout * HZ);
 
        /* No data? */
        dataoff = protoff + sizeof(struct udphdr);
-       if (dataoff >= (*pskb)->len) {
+       if (dataoff >= skb->len) {
                if (net_ratelimit())
-                       printk("amanda_help: skblen = %u\n", (*pskb)->len);
+                       printk("amanda_help: skblen = %u\n", skb->len);
                return NF_ACCEPT;
        }
 
        memset(&ts, 0, sizeof(ts));
-       start = skb_find_text(*pskb, dataoff, (*pskb)->len,
+       start = skb_find_text(skb, dataoff, skb->len,
                              search[SEARCH_CONNECT].ts, &ts);
        if (start == UINT_MAX)
                goto out;
        start += dataoff + search[SEARCH_CONNECT].len;
 
        memset(&ts, 0, sizeof(ts));
-       stop = skb_find_text(*pskb, start, (*pskb)->len,
+       stop = skb_find_text(skb, start, skb->len,
                             search[SEARCH_NEWLINE].ts, &ts);
        if (stop == UINT_MAX)
                goto out;
@@ -127,13 +126,13 @@ static int amanda_help(struct sk_buff **pskb,
 
        for (i = SEARCH_DATA; i <= SEARCH_INDEX; i++) {
                memset(&ts, 0, sizeof(ts));
-               off = skb_find_text(*pskb, start, stop, search[i].ts, &ts);
+               off = skb_find_text(skb, start, stop, search[i].ts, &ts);
                if (off == UINT_MAX)
                        continue;
                off += start + search[i].len;
 
                len = min_t(unsigned int, sizeof(pbuf) - 1, stop - off);
-               if (skb_copy_bits(*pskb, off, pbuf, len))
+               if (skb_copy_bits(skb, off, pbuf, len))
                        break;
                pbuf[len] = '\0';
 
@@ -148,12 +147,14 @@ static int amanda_help(struct sk_buff **pskb,
                        goto out;
                }
                tuple = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
-               nf_ct_expect_init(exp, family, &tuple->src.u3, &tuple->dst.u3,
+               nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
+                                 nf_ct_l3num(ct),
+                                 &tuple->src.u3, &tuple->dst.u3,
                                  IPPROTO_TCP, NULL, &port);
 
                nf_nat_amanda = rcu_dereference(nf_nat_amanda_hook);
                if (nf_nat_amanda && ct->status & IPS_NAT_MASK)
-                       ret = nf_nat_amanda(pskb, ctinfo, off - dataoff,
+                       ret = nf_nat_amanda(skb, ctinfo, off - dataoff,
                                            len, exp);
                else if (nf_ct_expect_related(exp) != 0)
                        ret = NF_DROP;
@@ -164,26 +165,29 @@ out:
        return ret;
 }
 
+static const struct nf_conntrack_expect_policy amanda_exp_policy = {
+       .max_expected           = 3,
+       .timeout                = 180,
+};
+
 static struct nf_conntrack_helper amanda_helper[2] __read_mostly = {
        {
                .name                   = "amanda",
-               .max_expected           = 3,
-               .timeout                = 180,
                .me                     = THIS_MODULE,
                .help                   = amanda_help,
                .tuple.src.l3num        = AF_INET,
                .tuple.src.u.udp.port   = __constant_htons(10080),
                .tuple.dst.protonum     = IPPROTO_UDP,
+               .expect_policy          = &amanda_exp_policy,
        },
        {
                .name                   = "amanda",
-               .max_expected           = 3,
-               .timeout                = 180,
                .me                     = THIS_MODULE,
                .help                   = amanda_help,
                .tuple.src.l3num        = AF_INET6,
                .tuple.src.u.udp.port   = __constant_htons(10080),
                .tuple.dst.protonum     = IPPROTO_UDP,
+               .expect_policy          = &amanda_exp_policy,
        },
 };