compat_xtables: move to 2.6.35 xt_action_param (1/3)

diff --git a/extensions/ACCOUNT/xt_ACCOUNT.c b/extensions/ACCOUNT/xt_ACCOUNT.c
index 2e0263de6733037cf1018a5e3db4a0d70b2fc20a..7517d860f8f208d2d97a9a8e58d624b92e9abd6f 100644 (file)
--- a/extensions/ACCOUNT/xt_ACCOUNT.c
+++ b/extensions/ACCOUNT/xt_ACCOUNT.c
@@ -478,7 +478,7 @@ static void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8,
        }
 }
 
-static unsigned int ipt_acc_target(struct sk_buff **pskb, const struct xt_target_param *par)
+static unsigned int ipt_acc_target(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct ipt_acc_info *info =
                par->targinfo;

diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c
index 908e64ec1ea40f549839ea9867cc26c8e3562848..69fd60775f3bd4ce96727b52f12d0b8b98bb7007 100644 (file)
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -1,6 +1,6 @@
 /*
  *     API compat layer
- *     written by Jan Engelhardt <jengelh [at] medozas de>, 2008
+ *     written by Jan Engelhardt <jengelh [at] medozas de>, 2008 - 2010
  *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License, either
@@ -35,16 +35,15 @@ static bool xtnu_match_run(const struct sk_buff *skb,
 {
        struct xtnu_match *nm = xtcompat_numatch(cm);
        bool lo_drop = false, lo_ret;
-       struct xt_match_param local_par = {
-               .in        = in,
-               .out       = out,
-               .match     = cm,
-               .matchinfo = matchinfo,
-               .fragoff   = offset,
-               .thoff     = protoff,
-               .hotdrop   = &lo_drop,
-               .family    = NFPROTO_UNSPEC, /* don't have that info */
-       };
+       struct xt_action_param local_par;
+       local_par.in        = in;
+       local_par.out       = out;
+       local_par.match     = cm;
+       local_par.matchinfo = matchinfo;
+       local_par.fragoff   = offset;
+       local_par.thoff     = protoff;
+       local_par.hotdrop   = &lo_drop;
+       local_par.family    = NFPROTO_UNSPEC; /* don't have that info */
 
        if (nm == NULL || nm->match == NULL)
                return false;
@@ -53,6 +52,28 @@ static bool xtnu_match_run(const struct sk_buff *skb,
        return lo_ret;
 }
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) && \
+    LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
+static bool xtnu_match_run(const struct sk_buff *skb,
+    const struct xt_match_param *par)
+{
+       struct xtnu_match *nm = xtcompat_numatch(par->match);
+       struct xt_action_param local_par;
+
+       local_par.in        = par->in;
+       local_par.out       = par->out;
+       local_par.match     = par->match;
+       local_par.matchinfo = par->matchinfo;
+       local_par.fragoff   = par->fragoff;
+       local_par.thoff     = par->thoff;
+       local_par.hotdrop   = par->hotdrop;
+       local_par.family    = par->family;
+
+       if (nm == NULL || nm->match == NULL)
+               return false;
+       return nm->match(skb, &local_par);
+}
+#endif
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
 static int xtnu_match_check(const char *table, const void *entry,
@@ -144,6 +165,10 @@ int xtnu_register_match(struct xtnu_match *nt)
        ct->match      = xtnu_match_run;
        ct->checkentry = xtnu_match_check;
        ct->destroy    = xtnu_match_destroy;
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
+       ct->match      = xtnu_match_run;
+       ct->checkentry = xtnu_match_check;
+       ct->destroy    = nt->destroy;
 #else
        ct->match      = nt->match;
        ct->checkentry = xtnu_match_check;
@@ -211,14 +236,14 @@ static unsigned int xtnu_target_run(struct sk_buff *skb,
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
 {
        struct xtnu_target *nt = xtcompat_nutarget(ct);
-       struct xt_target_param local_par = {
-               .in       = in,
-               .out      = out,
-               .hooknum  = hooknum,
-               .target   = ct,
-               .targinfo = targinfo,
-               .family   = NFPROTO_UNSPEC,
-       };
+       struct xt_action_param local_par;
+
+       local_par.in       = in;
+       local_par.out      = out;
+       local_par.hooknum  = hooknum;
+       local_par.target   = ct;
+       local_par.targinfo = targinfo;
+       local_par.family   = NFPROTO_UNSPEC;
 
        if (nt != NULL && nt->target != NULL)
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
@@ -235,7 +260,16 @@ static unsigned int
 xtnu_target_run(struct sk_buff *skb, const struct xt_target_param *par)
 {
        struct xtnu_target *nt = xtcompat_nutarget(par->target);
-       return nt->target(&skb, par);
+       struct xt_action_param local_par;
+
+       local_par.in       = par->in;
+       local_par.out      = par->out;
+       local_par.hooknum  = par->hooknum;
+       local_par.target   = par->target;
+       local_par.targinfo = par->targinfo;
+       local_par.family   = par->family;
+
+       return nt->target(&skb, &local_par);
 }
 #endif
 

diff --git a/extensions/compat_xtnu.h b/extensions/compat_xtnu.h
index bcc2ac878db47df3aa8014ce823fc4bf311953eb..5af3958a11d03b7f6963effdb6f1c176f2b0b388 100644 (file)
--- a/extensions/compat_xtnu.h
+++ b/extensions/compat_xtnu.h
@@ -32,16 +32,6 @@ enum {
        NFPROTO_NUMPROTO,
 };
 
-struct xt_match_param {
-       const struct net_device *in, *out;
-       const struct xt_match *match;
-       const void *matchinfo;
-       int fragoff;
-       unsigned int thoff;
-       bool *hotdrop;
-       u_int8_t family;
-};
-
 struct xt_mtchk_param {
        const char *table;
        const void *entryinfo;
@@ -81,6 +71,23 @@ struct xt_tgdtor_param {
 };
 #endif
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
+struct xt_action_param {
+       union {
+               const struct xt_match *match;
+               const struct xt_target *target;
+       };
+       union {
+               const void *matchinfo, *targinfo;
+       };
+       const struct net_device *in, *out;
+       int fragoff;
+       unsigned int thoff, hooknum;
+       u_int8_t family;
+       bool *hotdrop;
+};
+#endif
+
 struct xtnu_match {
        /*
         * Making it smaller by sizeof(void *) on purpose to catch
@@ -88,7 +95,7 @@ struct xtnu_match {
         */
        char name[sizeof(((struct xt_match *)NULL)->name) - 1 - sizeof(void *)];
        uint8_t revision;
-       bool (*match)(const struct sk_buff *, const struct xt_match_param *);
+       bool (*match)(const struct sk_buff *, const struct xt_action_param *);
        int (*checkentry)(const struct xt_mtchk_param *);
        void (*destroy)(const struct xt_mtdtor_param *);
        struct module *me;
@@ -103,7 +110,7 @@ struct xtnu_target {
        char name[sizeof(((struct xt_target *)NULL)->name) - 1 - sizeof(void *)];
        uint8_t revision;
        unsigned int (*target)(struct sk_buff **,
-               const struct xt_target_param *);
+               const struct xt_action_param *);
        int (*checkentry)(const struct xt_tgchk_param *);
        void (*destroy)(const struct xt_tgdtor_param *);
        struct module *me;

diff --git a/extensions/ipset/ipt_SET.c b/extensions/ipset/ipt_SET.c
index 9dfe3c9a56f7df1ff2468bb3aa3899e9d3767207..46b5138e95ad6a1d02f95c76b50a6dac67613426 100644 (file)
--- a/extensions/ipset/ipt_SET.c
+++ b/extensions/ipset/ipt_SET.c
@@ -29,7 +29,7 @@
 #include "../compat_xtables.h"
 
 static unsigned int
-target(struct sk_buff **pskb, const struct xt_target_param *par)
+target(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct ipt_set_info_target *info = par->targinfo;
 

diff --git a/extensions/ipset/ipt_set.c b/extensions/ipset/ipt_set.c
index ec1a40f2012bf5aad5dc382a2e27646bf6cf7d60..30cc2649710ba9390e0191955dcc53e2cd51f71f 100644 (file)
--- a/extensions/ipset/ipt_set.c
+++ b/extensions/ipset/ipt_set.c
@@ -38,7 +38,7 @@ match_set(const struct ipt_set_info *info,
 }
 
 static bool
-match(const struct sk_buff *skb, const struct xt_match_param *par)
+match(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct ipt_set_info_match *info = par->matchinfo;
                

diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c
index a700041d054b15c2b38e5978a91882f72bd24a35..8ddbd5ac71ae5e75cdb764e78aca2b4f465c8a7a 100644 (file)
--- a/extensions/pknock/xt_pknock.c
+++ b/extensions/pknock/xt_pknock.c
@@ -958,7 +958,7 @@ is_close_knock(const struct peer *peer, const struct xt_pknock_mtinfo *info,
 }
 
 static bool pknock_mt(const struct sk_buff *skb,
-    const struct xt_match_param *par)
+    const struct xt_action_param *par)
 {
        const struct xt_pknock_mtinfo *info = par->matchinfo;
        struct xt_pknock_rule *rule;

diff --git a/extensions/xt_CHAOS.c b/extensions/xt_CHAOS.c
index 63e54822bc65b9aba1dcdd8cc78f65b3fced0d95..44492df946baecd58d933b12cebb1f5560766125 100644 (file)
--- a/extensions/xt_CHAOS.c
+++ b/extensions/xt_CHAOS.c
@@ -45,7 +45,7 @@ static const struct xt_tcp tcp_params = {
 
 /* CHAOS functions */
 static void
-xt_chaos_total(struct sk_buff *skb, const struct xt_target_param *par)
+xt_chaos_total(struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_chaos_tginfo *info = par->targinfo;
        const struct iphdr *iph = ip_hdr(skb);
@@ -88,15 +88,21 @@ xt_chaos_total(struct sk_buff *skb, const struct xt_target_param *par)
        destiny->target(skb, par->in, par->out, par->hooknum, destiny, NULL);
 #else
        {
-               struct xt_target_param local_par = *par;
-               local_par.target = destiny;
+               struct xt_target_param local_par = {
+                       .in       = par->in,
+                       .out      = par->out,
+                       .hooknum  = par->hooknum,
+                       .target   = destiny,
+                       .targinfo = par->targinfo,
+                       .family   = par->family,
+               };
                destiny->target(skb, &local_par);
        }
 #endif
 }
 
 static unsigned int
-chaos_tg(struct sk_buff **pskb, const struct xt_target_param *par)
+chaos_tg(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        /*
         * Equivalent to:

diff --git a/extensions/xt_DELUDE.c b/extensions/xt_DELUDE.c
index 43df0d2d9b1940b7d1d03036a9290d1ef3c37725..b0f2de237fba89367024ca6a57d025dfe822ea1e 100644 (file)
--- a/extensions/xt_DELUDE.c
+++ b/extensions/xt_DELUDE.c
@@ -143,7 +143,7 @@ static void delude_send_reset(struct sk_buff *oldskb, unsigned int hook)
 }
 
 static unsigned int
-delude_tg(struct sk_buff **pskb, const struct xt_target_param *par)
+delude_tg(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        /* WARNING: This code causes reentry within iptables.
           This means that the iptables jump stack is now crap.  We

diff --git a/extensions/xt_DHCPMAC.c b/extensions/xt_DHCPMAC.c
index 33ba1fed731eb144a643b571c50387a46b631799..42b91978071b4c8417d3d0854d2d6e3ee32a659f 100644 (file)
--- a/extensions/xt_DHCPMAC.c
+++ b/extensions/xt_DHCPMAC.c
@@ -69,7 +69,7 @@ static bool ether_cmp(const unsigned char *lh, const unsigned char *rh,
 }
 
 static bool
-dhcpmac_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+dhcpmac_mt(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct dhcpmac_info *info = par->matchinfo;
        const struct dhcp_message *dh;
@@ -89,7 +89,7 @@ dhcpmac_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 }
 
 static unsigned int
-dhcpmac_tg(struct sk_buff **pskb, const struct xt_target_param *par)
+dhcpmac_tg(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct dhcpmac_info *info = par->targinfo;
        struct dhcp_message dhcpbuf, *dh;

diff --git a/extensions/xt_ECHO.c b/extensions/xt_ECHO.c
index 56a7fa4b6ca2731dad0b7f1046383e3e0d464fe4..a09311a532a91612695ab7281571e3960881437a 100644 (file)
--- a/extensions/xt_ECHO.c
+++ b/extensions/xt_ECHO.c
@@ -21,7 +21,7 @@
 #include "compat_xtables.h"
 
 static unsigned int
-echo_tg4(struct sk_buff **poldskb, const struct xt_target_param *par)
+echo_tg4(struct sk_buff **poldskb, const struct xt_action_param *par)
 {
        const struct sk_buff *oldskb = *poldskb;
        const struct udphdr *oldudp;

diff --git a/extensions/xt_IPMARK.c b/extensions/xt_IPMARK.c
index a5f93772b17ac312c46f15fa77c3faaa6f1e1a4c..a296945a640ca636b71b74b0259dd82f1c2acef8 100644 (file)
--- a/extensions/xt_IPMARK.c
+++ b/extensions/xt_IPMARK.c
@@ -25,7 +25,7 @@ MODULE_ALIAS("ipt_IPMARK");
 MODULE_ALIAS("ip6t_IPMARK");
 
 static unsigned int
-ipmark_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
+ipmark_tg4(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct xt_ipmark_tginfo *ipmarkinfo = par->targinfo;
        const struct sk_buff *skb = *pskb;
@@ -61,7 +61,7 @@ static __u32 ipmark_from_ip6(const struct in6_addr *a, unsigned int s)
 }
 
 static unsigned int
-ipmark_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
+ipmark_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct xt_ipmark_tginfo *info = par->targinfo;
        const struct sk_buff *skb = *pskb;

diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c
index 5fadf09b654bec920ef51a5ff5bf2b33c9dd05c5..fce8669898aafdab9a6726c7771e0d55c645737c 100644 (file)
--- a/extensions/xt_LOGMARK.c
+++ b/extensions/xt_LOGMARK.c
@@ -30,7 +30,7 @@ static const char *const dir_names[] = {
 };
 
 static unsigned int
-logmark_tg(struct sk_buff **pskb, const struct xt_target_param *par)
+logmark_tg(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct sk_buff *skb = *pskb;
        const struct xt_logmark_tginfo *info = par->targinfo;

diff --git a/extensions/xt_RAWNAT.c b/extensions/xt_RAWNAT.c
index 4bb44eee654e174f36a2f316231fa2d1e5a73d00..f256e4c12759762095afead66fe52ee0ab19d06f 100644 (file)
--- a/extensions/xt_RAWNAT.c
+++ b/extensions/xt_RAWNAT.c
@@ -125,7 +125,7 @@ static unsigned int rawnat4_writable_part(const struct iphdr *iph)
 }
 
 static unsigned int
-rawsnat_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
+rawsnat_tg4(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct xt_rawnat_tginfo *info = par->targinfo;
        struct iphdr *iph;
@@ -147,7 +147,7 @@ rawsnat_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
 }
 
 static unsigned int
-rawdnat_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
+rawdnat_tg4(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct xt_rawnat_tginfo *info = par->targinfo;
        struct iphdr *iph;
@@ -241,7 +241,7 @@ static void rawnat6_update_l4(struct sk_buff *skb, unsigned int l4proto,
 }
 
 static unsigned int
-rawsnat_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
+rawsnat_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct xt_rawnat_tginfo *info = par->targinfo;
        unsigned int l4offset, l4proto;
@@ -262,7 +262,7 @@ rawsnat_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
 }
 
 static unsigned int
-rawdnat_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
+rawdnat_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct xt_rawnat_tginfo *info = par->targinfo;
        unsigned int l4offset, l4proto;

diff --git a/extensions/xt_STEAL.c b/extensions/xt_STEAL.c
index b06d0fbb249aa4ec5de66239e979d12716b0ca2e..e8d3e4cff3f13e3ae15821960b0d52898e2946de 100644 (file)
--- a/extensions/xt_STEAL.c
+++ b/extensions/xt_STEAL.c
@@ -8,7 +8,7 @@
 #include "compat_xtables.h"
 
 static unsigned int
-steal_tg(struct sk_buff **pskb, const struct xt_target_param *par)
+steal_tg(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        kfree_skb(*pskb);
        return NF_STOLEN;

diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c
index 8152132c4d7a71ced79a846aa0b708fa5dfd1fd2..e0b6aa03b885b103357cd4ab9f6bc9ba10c6d63f 100644 (file)
--- a/extensions/xt_SYSRQ.c
+++ b/extensions/xt_SYSRQ.c
@@ -197,7 +197,7 @@ static unsigned int sysrq_tg(const void *pdata, uint16_t len)
 #endif
 
 static unsigned int
-sysrq_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
+sysrq_tg4(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        struct sk_buff *skb = *pskb;
        const struct iphdr *iph;
@@ -224,7 +224,7 @@ sysrq_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
 
 #ifdef WITH_IPV6
 static unsigned int
-sysrq_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
+sysrq_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        struct sk_buff *skb = *pskb;
        const struct ipv6hdr *iph;

diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c
index ed052e4fdb84f39a7d69550efa5d75100d720e22..92bea2cf49a530eadb7c79dbc81f87e5405e482f 100644 (file)
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -188,7 +188,7 @@ static void tarpit_tcp(struct sk_buff *oldskb, unsigned int hook)
 }
 
 static unsigned int
-tarpit_tg(struct sk_buff **pskb, const struct xt_target_param *par)
+tarpit_tg(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct sk_buff *skb = *pskb;
        const struct iphdr *iph = ip_hdr(skb);

diff --git a/extensions/xt_TEE.c b/extensions/xt_TEE.c
index 8be6173435663e7431f01854d7594c6ace814fb3..e98333bb70b954126117d361a1d5efe69d3b2692 100644 (file)
--- a/extensions/xt_TEE.c
+++ b/extensions/xt_TEE.c
@@ -103,7 +103,7 @@ static void tee_tg_send(struct sk_buff *skb)
 }
 
 static unsigned int
-tee_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
+tee_tg4(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct xt_tee_tginfo *info = par->targinfo;
        struct sk_buff *skb = *pskb;
@@ -205,7 +205,7 @@ tee_tg_route6(struct sk_buff *skb, const struct xt_tee_tginfo *info)
 }
 
 static unsigned int
-tee_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
+tee_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
 {
        const struct xt_tee_tginfo *info = par->targinfo;
        struct sk_buff *skb = *pskb;

diff --git a/extensions/xt_condition.c b/extensions/xt_condition.c
index c4a54b946607b6052ac7496804c5670f78f85af6..c1f082d2b118a10f333029135fc8abe99df3b24a 100644 (file)
--- a/extensions/xt_condition.c
+++ b/extensions/xt_condition.c
@@ -96,7 +96,7 @@ static int condition_proc_write(struct file *file, const char __user *buffer,
 }
 
 static bool
-condition_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+condition_mt(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_condition_mtinfo *info = par->matchinfo;
        const struct condition_variable *var   = info->condvar;

diff --git a/extensions/xt_fuzzy.c b/extensions/xt_fuzzy.c
index 83903b291a2a9e1a35663fa23b039454b881da6d..4d066bfc101b01b1a58979bbe52fd207a2ca8d6e 100644 (file)
--- a/extensions/xt_fuzzy.c
+++ b/extensions/xt_fuzzy.c
@@ -60,7 +60,7 @@ static uint8_t mf_low(uint32_t tx, uint32_t mini, uint32_t maxi)
 }
 
 static bool
-fuzzy_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+fuzzy_mt(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        struct xt_fuzzy_mtinfo *info = (void *)par->matchinfo;
        unsigned long amount;

diff --git a/extensions/xt_geoip.c b/extensions/xt_geoip.c
index 76c643c557d7532df6d3a7f8cfda3587585a3c48..92d2915adfa9ba59597099fe2cde49c9d71a0c85 100644 (file)
--- a/extensions/xt_geoip.c
+++ b/extensions/xt_geoip.c
@@ -141,7 +141,7 @@ static bool geoip_bsearch(const struct geoip_subnet *range,
 }
 
 static bool
-xt_geoip_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+xt_geoip_mt(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_geoip_match_info *info = par->matchinfo;
        const struct geoip_country_kernel *node;

diff --git a/extensions/xt_iface.c b/extensions/xt_iface.c
index 5847e6b01cc45d54359b4db74dae0448f950816a..e61dc9d7a58198634dfa79af6c398d4293ce7b64 100644 (file)
--- a/extensions/xt_iface.c
+++ b/extensions/xt_iface.c
@@ -41,7 +41,7 @@ static const struct xt_iface_flag_pairs xt_iface_lookup[] =
 };
 
 static bool xt_iface_mt(const struct sk_buff *skb,
-    const struct xt_match_param *par)
+    const struct xt_action_param *par)
 {
        const struct xt_iface_mtinfo *info = par->matchinfo;
        struct net_device *dev;

diff --git a/extensions/xt_ipp2p.c b/extensions/xt_ipp2p.c
index a94c2d2955a588aa540fb07a8eb0ef601b4f7b9d..0886fb1e666552b8d8767baef21963003048bafb 100644 (file)
--- a/extensions/xt_ipp2p.c
+++ b/extensions/xt_ipp2p.c
@@ -808,7 +808,7 @@ static const struct {
 };
 
 static bool
-ipp2p_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+ipp2p_mt(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct ipt_p2p_info *info = par->matchinfo;
        const unsigned char  *haystack;

diff --git a/extensions/xt_ipv4options.c b/extensions/xt_ipv4options.c
index b136003e62bc2d06831a9e36a0550db175a28e15..a887821f30646c6797beaefda3202ed6a6874e11 100644 (file)
--- a/extensions/xt_ipv4options.c
+++ b/extensions/xt_ipv4options.c
@@ -29,7 +29,7 @@ static uint32_t ipv4options_rd(const uint8_t *data, int len)
 }
 
 static bool ipv4options_mt(const struct sk_buff *skb,
-    const struct xt_match_param *par)
+    const struct xt_action_param *par)
 {
        const struct xt_ipv4options_mtinfo1 *info = par->matchinfo;
        const struct iphdr *iph = ip_hdr(skb);

diff --git a/extensions/xt_length2.c b/extensions/xt_length2.c
index 8de6ca50babfd10637567a1b981c98bc925b3431..ca495df6205af548b3ce03b77682941768fab171 100644 (file)
--- a/extensions/xt_length2.c
+++ b/extensions/xt_length2.c
@@ -137,7 +137,7 @@ static bool xtlength_layer7(unsigned int *length, const struct sk_buff *skb,
 }
 
 static bool
-length2_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+length2_mt(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_length_mtinfo2 *info = par->matchinfo;
        const struct iphdr *iph = ip_hdr(skb);
@@ -198,7 +198,7 @@ llayer4_proto(const struct sk_buff *skb, unsigned int *offset, bool *hotdrop)
 }
 
 static bool
-length2_mt6(const struct sk_buff *skb, const struct xt_match_param *par)
+length2_mt6(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_length_mtinfo2 *info = par->matchinfo;
        const struct ipv6hdr *iph = ipv6_hdr(skb);

diff --git a/extensions/xt_lscan.c b/extensions/xt_lscan.c
index 1f51f82f58b1c949590781f54fc259b97e22436e..3af86214f442dbe4a6ac0065060cbf4b817203f8 100644 (file)
--- a/extensions/xt_lscan.c
+++ b/extensions/xt_lscan.c
@@ -171,7 +171,7 @@ static inline unsigned int lscan_mt_full(int mark,
 }
 
 static bool
-lscan_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+lscan_mt(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_lscan_mtinfo *info = par->matchinfo;
        enum ip_conntrack_info ctstate;

diff --git a/extensions/xt_psd.c b/extensions/xt_psd.c
index a86a73c607172ca8639e02dfa364cfebc8090023..4be8b4e73c1a335d9e722156762ef103e293c076 100644 (file)
--- a/extensions/xt_psd.c
+++ b/extensions/xt_psd.c
@@ -100,7 +100,7 @@ static inline int hashfunc(struct in_addr addr)
 }
 
 static bool
-xt_psd_match(const struct sk_buff *pskb, const struct xt_match_param *match)
+xt_psd_match(const struct sk_buff *pskb, const struct xt_action_param *match)
 {
        const struct iphdr *iph;
        const struct tcphdr *tcph;

diff --git a/extensions/xt_quota2.c b/extensions/xt_quota2.c
index 73531d83d8eeb0d3c7d6018a12cb8acc2a08f97e..62f1274f9b8fe9cbf310cab72ff4325192fef38f 100644 (file)
--- a/extensions/xt_quota2.c
+++ b/extensions/xt_quota2.c
@@ -189,7 +189,7 @@ static void quota_mt2_destroy(const struct xt_mtdtor_param *par)
 }
 
 static bool
-quota_mt2(const struct sk_buff *skb, const struct xt_match_param *par)
+quota_mt2(const struct sk_buff *skb, const struct xt_action_param *par)
 {
        struct xt_quota_mtinfo2 *q = (void *)par->matchinfo;
        struct xt_quota_counter *e = q->master;