netfilter: xtables: move extension arguments into compound structure (3/6)

[deliverable/linux.git] / net / netfilter / xt_string.c

diff --git a/net/netfilter/xt_string.c b/net/netfilter/xt_string.c
index 72f694d947f462802a929cb026984d5888beee1c..b4d7741113115330bc4ae6d5a6df35d6ae14f4cd 100644 (file)
--- a/net/netfilter/xt_string.c
+++ b/net/netfilter/xt_string.c
@@ -22,30 +22,29 @@ MODULE_ALIAS("ipt_string");
 MODULE_ALIAS("ip6t_string");
 
 static bool
-string_mt(const struct sk_buff *skb, const struct net_device *in,
-          const struct net_device *out, const struct xt_match *match,
-          const void *matchinfo, int offset, unsigned int protoff,
-          bool *hotdrop)
+string_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       const struct xt_string_info *conf = matchinfo;
+       const struct xt_string_info *conf = par->matchinfo;
        struct ts_state state;
+       int invert;
 
        memset(&state, 0, sizeof(struct ts_state));
 
+       invert = (par->match->revision == 0 ? conf->u.v0.invert :
+                                   conf->u.v1.flags & XT_STRING_FLAG_INVERT);
+
        return (skb_find_text((struct sk_buff *)skb, conf->from_offset,
                             conf->to_offset, conf->config, &state)
-                            != UINT_MAX) ^ conf->invert;
+                            != UINT_MAX) ^ invert;
 }
 
 #define STRING_TEXT_PRIV(m) ((struct xt_string_info *)(m))
 
-static bool
-string_mt_check(const char *tablename, const void *ip,
-                const struct xt_match *match, void *matchinfo,
-                unsigned int hook_mask)
+static bool string_mt_check(const struct xt_mtchk_param *par)
 {
-       struct xt_string_info *conf = matchinfo;
+       struct xt_string_info *conf = par->matchinfo;
        struct ts_config *ts_conf;
+       int flags = TS_AUTOLOAD;
 
        /* Damn, can't handle this case properly with iptables... */
        if (conf->from_offset > conf->to_offset)
@@ -54,8 +53,15 @@ string_mt_check(const char *tablename, const void *ip,
                return false;
        if (conf->patlen > XT_STRING_MAX_PATTERN_SIZE)
                return false;
+       if (par->match->revision == 1) {
+               if (conf->u.v1.flags &
+                   ~(XT_STRING_FLAG_IGNORECASE | XT_STRING_FLAG_INVERT))
+                       return false;
+               if (conf->u.v1.flags & XT_STRING_FLAG_IGNORECASE)
+                       flags |= TS_IGNORECASE;
+       }
        ts_conf = textsearch_prepare(conf->algo, conf->pattern, conf->patlen,
-                                    GFP_KERNEL, TS_AUTOLOAD);
+                                    GFP_KERNEL, flags);
        if (IS_ERR(ts_conf))
                return false;
 
@@ -64,15 +70,16 @@ string_mt_check(const char *tablename, const void *ip,
        return true;
 }
 
-static void string_mt_destroy(const struct xt_match *match, void *matchinfo)
+static void string_mt_destroy(const struct xt_mtdtor_param *par)
 {
-       textsearch_destroy(STRING_TEXT_PRIV(matchinfo)->config);
+       textsearch_destroy(STRING_TEXT_PRIV(par->matchinfo)->config);
 }
 
-static struct xt_match string_mt_reg[] __read_mostly = {
+static struct xt_match xt_string_mt_reg[] __read_mostly = {
        {
                .name           = "string",
-               .family         = AF_INET,
+               .revision       = 0,
+               .family         = NFPROTO_UNSPEC,
                .checkentry     = string_mt_check,
                .match          = string_mt,
                .destroy        = string_mt_destroy,
@@ -81,7 +88,8 @@ static struct xt_match string_mt_reg[] __read_mostly = {
        },
        {
                .name           = "string",
-               .family         = AF_INET6,
+               .revision       = 1,
+               .family         = NFPROTO_UNSPEC,
                .checkentry     = string_mt_check,
                .match          = string_mt,
                .destroy        = string_mt_destroy,
@@ -92,12 +100,13 @@ static struct xt_match string_mt_reg[] __read_mostly = {
 
 static int __init string_mt_init(void)
 {
-       return xt_register_matches(string_mt_reg, ARRAY_SIZE(string_mt_reg));
+       return xt_register_matches(xt_string_mt_reg,
+                                  ARRAY_SIZE(xt_string_mt_reg));
 }
 
 static void __exit string_mt_exit(void)
 {
-       xt_unregister_matches(string_mt_reg, ARRAY_SIZE(string_mt_reg));
+       xt_unregister_matches(xt_string_mt_reg, ARRAY_SIZE(xt_string_mt_reg));
 }
 
 module_init(string_mt_init);