From: Massimiliano Hofer <max@nucleus.it>
To: netfilter-devel@lists.netfilter.org
Cc: Patrick McHardy <kaber@trash.net>
Subject: [PATCH 1/4][data-condition]: instance data support in matches' prototypes and structures
Date: Tue, 5 Dec 2006 23:15:02 +0100 [thread overview]
Message-ID: <200612052315.03166.max@nucleus.it> (raw)
In-Reply-To: <200612052312.28824.max@nucleus.it>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 68077 bytes --]
From 5cd5ac8bf04d15de1a3b370eedac4d7d3b7946d3 Mon Sep 17 00:00:00 2001
From: Massimiliano Hofer <max@nucleus.it>
Date: Tue, 5 Dec 2006 22:48:10 +0100
Subject: [PATCH] [NETFILTER]: instance data support in matches' prototypes and structures
This patch adds support for instance specific data in matches.
Only prototype and structure changes are included here.
The real code will come in a separate patch.
Signed-off-by: Massimiliano Hofer <max@nucleus.it>
---
include/linux/netfilter/x_tables.h | 23 +++++++++-----
net/ipv4/netfilter/ip_tables.c | 50 +++++++++++++++++--------------
net/ipv4/netfilter/ipt_addrtype.c | 2 +-
net/ipv4/netfilter/ipt_ah.c | 14 +++++----
net/ipv4/netfilter/ipt_ecn.c | 10 +++---
net/ipv4/netfilter/ipt_iprange.c | 1 +
net/ipv4/netfilter/ipt_owner.c | 14 +++++----
net/ipv4/netfilter/ipt_recent.c | 21 +++++++------
net/ipv4/netfilter/ipt_tos.c | 1 +
net/ipv4/netfilter/ipt_ttl.c | 2 +-
net/ipv6/netfilter/ip6_tables.c | 23 +++++++++-----
net/ipv6/netfilter/ip6t_ah.c | 14 +++++----
net/ipv6/netfilter/ip6t_eui64.c | 1 +
net/ipv6/netfilter/ip6t_frag.c | 14 +++++----
net/ipv6/netfilter/ip6t_hbh.c | 16 +++++----
net/ipv6/netfilter/ip6t_hl.c | 2 +-
| 22 +++++++------
net/ipv6/netfilter/ip6t_owner.c | 14 +++++----
net/ipv6/netfilter/ip6t_rt.c | 14 +++++----
net/netfilter/x_tables.c | 8 ++--
| 1 +
net/netfilter/xt_connbytes.c | 16 +++++----
net/netfilter/xt_connmark.c | 18 ++++++-----
net/netfilter/xt_conntrack.c | 18 +++++++----
net/netfilter/xt_dccp.c | 16 +++++----
net/netfilter/xt_dscp.c | 17 ++++++----
net/netfilter/xt_esp.c | 16 +++++----
net/netfilter/xt_hashlimit.c | 18 ++++++-----
net/netfilter/xt_helper.c | 19 +++++++-----
net/netfilter/xt_length.c | 2 +
net/netfilter/xt_limit.c | 20 +++++++-----
net/netfilter/xt_mac.c | 1 +
net/netfilter/xt_mark.c | 16 +++++----
net/netfilter/xt_multiport.c | 54 +++++++++++++++++++---------------
net/netfilter/xt_physdev.c | 16 +++++----
net/netfilter/xt_pkttype.c | 1 +
net/netfilter/xt_policy.c | 19 ++++++-----
net/netfilter/xt_quota.c | 12 ++++----
net/netfilter/xt_realm.c | 1 +
net/netfilter/xt_sctp.c | 16 +++++----
net/netfilter/xt_state.c | 18 ++++++-----
net/netfilter/xt_statistic.c | 12 ++++----
net/netfilter/xt_string.c | 21 +++++++-----
net/netfilter/xt_tcpmss.c | 1 +
net/netfilter/xt_tcpudp.c | 44 +++++++++++++++------------
45 files changed, 373 insertions(+), 286 deletions(-)
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 022edfa..73147b4 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -20,6 +20,7 @@ struct xt_entry_match
/* Used inside the kernel */
struct xt_match *match;
+ void *data;
} kernel;
/* Total length */
@@ -138,20 +139,23 @@ struct xt_match
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop);
/* Called when user tries to insert an entry of this type. */
/* Should return true or false. */
- int (*checkentry)(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask);
+ int (*init)(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask);
/* Called when entry of this type deleted. */
- void (*destroy)(const struct xt_match *match, void *matchinfo);
+ void (*destroy)(const struct xt_match *match, void *matchinfo,
+ void *data);
/* Called when userspace align differs from kernel space one */
void (*compat_from_user)(void *dst, void *src);
@@ -164,6 +168,7 @@ struct xt_match
unsigned long data;
char *table;
+ unsigned int datasize;
unsigned int matchsize;
unsigned int compatsize;
unsigned int hooks;
@@ -274,9 +279,9 @@ extern void xt_unregister_match(struct x
extern int xt_register_matches(struct xt_match *match, unsigned int n);
extern void xt_unregister_matches(struct xt_match *match, unsigned int n);
-extern int xt_check_match(const struct xt_match *match, unsigned short family,
- unsigned int size, const char *table, unsigned int hook,
- unsigned short proto, int inv_proto);
+extern int xt_init_match(const struct xt_match *match, unsigned short family,
+ unsigned int size, const char *table, unsigned int hook,
+ unsigned short proto, int inv_proto);
extern int xt_check_target(const struct xt_target *target, unsigned short family,
unsigned int size, const char *table, unsigned int hook,
unsigned short proto, int inv_proto);
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 8a45543..75fae96 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -198,7 +198,8 @@ int do_match(struct ipt_entry_match *m,
{
/* Stop iteration if it doesn't match */
if (!m->u.kernel.match->match(skb, in, out, m->u.kernel.match, m->data,
- offset, skb->nh.iph->ihl*4, hotdrop))
+ m->u.kernel.data, offset,
+ skb->nh.iph->ihl*4, hotdrop))
return 1;
else
return 0;
@@ -464,7 +465,8 @@ cleanup_match(struct ipt_entry_match *m,
return 1;
if (m->u.kernel.match->destroy)
- m->u.kernel.match->destroy(m->u.kernel.match, m->data);
+ m->u.kernel.match->destroy(m->u.kernel.match, m->data,
+ m->u.kernel.data);
module_put(m->u.kernel.match->me);
return 0;
}
@@ -491,7 +493,7 @@ standard_check(const struct ipt_entry_ta
}
static inline int
-check_match(struct ipt_entry_match *m,
+init_match(struct ipt_entry_match *m,
const char *name,
const struct ipt_ip *ip,
unsigned int hookmask,
@@ -509,15 +511,16 @@ check_match(struct ipt_entry_match *m,
}
m->u.kernel.match = match;
- ret = xt_check_match(match, AF_INET, m->u.match_size - sizeof(*m),
- name, hookmask, ip->proto,
- ip->invflags & IPT_INV_PROTO);
+ ret = xt_init_match(match, AF_INET, m->u.match_size - sizeof(*m),
+ name, hookmask, ip->proto,
+ ip->invflags & IPT_INV_PROTO);
if (ret)
goto err;
- if (m->u.kernel.match->checkentry
- && !m->u.kernel.match->checkentry(name, ip, match, m->data,
- hookmask)) {
+ m->u.kernel.data = NULL;
+ if (m->u.kernel.match->init
+ && !m->u.kernel.match->init(name, ip, match, m->data,
+ m->u.kernel.data, hookmask)) {
duprintf("ip_tables: check failed for `%s'.\n",
m->u.kernel.match->name);
ret = -EINVAL;
@@ -551,7 +554,7 @@ check_entry(struct ipt_entry *e, const c
return -EINVAL;
j = 0;
- ret = IPT_MATCH_ITERATE(e, check_match, name, &e->ip, e->comefrom, &j);
+ ret = IPT_MATCH_ITERATE(e, init_match, name, &e->ip, e->comefrom, &j);
if (ret != 0)
goto cleanup_matches;
@@ -1537,12 +1540,13 @@ static inline int compat_copy_match_from
match = m->u.kernel.match;
xt_compat_match_from_user(m, dstptr, size);
- ret = xt_check_match(match, AF_INET, dm->u.match_size - sizeof(*dm),
- name, hookmask, ip->proto,
- ip->invflags & IPT_INV_PROTO);
- if (!ret && m->u.kernel.match->checkentry
- && !m->u.kernel.match->checkentry(name, ip, match, dm->data,
- hookmask)) {
+ ret = xt_init_match(match, AF_INET, dm->u.match_size - sizeof(*dm),
+ name, hookmask, ip->proto,
+ ip->invflags & IPT_INV_PROTO);
+ m->u.kernel.data = NULL;
+ if (!ret && m->u.kernel.match->init
+ && !m->u.kernel.match->init(name, ip, match, dm->data,
+ m->u.kernel.data, hookmask)) {
duprintf("ip_tables: check failed for `%s'.\n",
m->u.kernel.match->name);
ret = -EINVAL;
@@ -2092,6 +2096,7 @@ icmp_match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -2122,11 +2127,12 @@ icmp_match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-icmp_checkentry(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+icmp_init(const char *tablename,
+ const void *info,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ipt_icmp *icmpinfo = matchinfo;
@@ -2175,7 +2181,7 @@ static struct ipt_match icmp_matchstruct
.matchsize = sizeof(struct ipt_icmp),
.proto = IPPROTO_ICMP,
.family = AF_INET,
- .checkentry = icmp_checkentry,
+ .init = icmp_init,
};
static int __init ip_tables_init(void)
diff --git a/net/ipv4/netfilter/ipt_addrtype.c b/net/ipv4/netfilter/ipt_addrtype.c
index 7b60eb7..de3c961 100644
--- a/net/ipv4/netfilter/ipt_addrtype.c
+++ b/net/ipv4/netfilter/ipt_addrtype.c
@@ -30,7 +30,7 @@ static inline int match_type(__be32 addr
static int match(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, int *hotdrop)
+ void *data, int offset, unsigned int protoff, int *hotdrop)
{
const struct ipt_addrtype_info *info = matchinfo;
const struct iphdr *iph = skb->nh.iph;
diff --git a/net/ipv4/netfilter/ipt_ah.c b/net/ipv4/netfilter/ipt_ah.c
index 1798f86..0cee597 100644
--- a/net/ipv4/netfilter/ipt_ah.c
+++ b/net/ipv4/netfilter/ipt_ah.c
@@ -41,6 +41,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -70,11 +71,12 @@ match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-checkentry(const char *tablename,
- const void *ip_void,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *ip_void,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ipt_ah *ahinfo = matchinfo;
@@ -91,7 +93,7 @@ static struct ipt_match ah_match = {
.match = match,
.matchsize = sizeof(struct ipt_ah),
.proto = IPPROTO_AH,
- .checkentry = checkentry,
+ .init = init,
.me = THIS_MODULE,
};
diff --git a/net/ipv4/netfilter/ipt_ecn.c b/net/ipv4/netfilter/ipt_ecn.c
index dafbdec..e9e7241 100644
--- a/net/ipv4/netfilter/ipt_ecn.c
+++ b/net/ipv4/netfilter/ipt_ecn.c
@@ -68,7 +68,7 @@ static inline int match_tcp(const struct
static int match(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, int *hotdrop)
+ void *data, int offset, unsigned int protoff, int *hotdrop)
{
const struct ipt_ecn_info *info = matchinfo;
@@ -86,9 +86,9 @@ static int match(const struct sk_buff *s
return 1;
}
-static int checkentry(const char *tablename, const void *ip_void,
- const struct xt_match *match,
- void *matchinfo, unsigned int hook_mask)
+static int init(const char *tablename, const void *ip_void,
+ const struct xt_match *match,
+ void *matchinfo, void *data, unsigned int hook_mask)
{
const struct ipt_ecn_info *info = matchinfo;
const struct ipt_ip *ip = ip_void;
@@ -113,7 +113,7 @@ static struct ipt_match ecn_match = {
.name = "ecn",
.match = match,
.matchsize = sizeof(struct ipt_ecn_info),
- .checkentry = checkentry,
+ .init = init,
.me = THIS_MODULE,
};
diff --git a/net/ipv4/netfilter/ipt_iprange.c b/net/ipv4/netfilter/ipt_iprange.c
index 5202edd..2b2439b 100644
--- a/net/ipv4/netfilter/ipt_iprange.c
+++ b/net/ipv4/netfilter/ipt_iprange.c
@@ -29,6 +29,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset, unsigned int protoff, int *hotdrop)
{
const struct ipt_iprange_info *info = matchinfo;
diff --git a/net/ipv4/netfilter/ipt_owner.c b/net/ipv4/netfilter/ipt_owner.c
index 78c336f..c154360 100644
--- a/net/ipv4/netfilter/ipt_owner.c
+++ b/net/ipv4/netfilter/ipt_owner.c
@@ -27,6 +27,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -52,11 +53,12 @@ match(const struct sk_buff *skb,
}
static int
-checkentry(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ipt_owner_info *info = matchinfo;
@@ -73,7 +75,7 @@ static struct ipt_match owner_match = {
.match = match,
.matchsize = sizeof(struct ipt_owner_info),
.hooks = (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_POST_ROUTING),
- .checkentry = checkentry,
+ .init = init,
.me = THIS_MODULE,
};
diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
index 126db44..278bdb3 100644
--- a/net/ipv4/netfilter/ipt_recent.c
+++ b/net/ipv4/netfilter/ipt_recent.c
@@ -172,7 +172,7 @@ static int
ipt_recent_match(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, int *hotdrop)
+ void *data, int offset, unsigned int protoff, int *hotdrop)
{
const struct ipt_recent_info *info = matchinfo;
struct recent_table *t;
@@ -235,9 +235,9 @@ out:
}
static int
-ipt_recent_checkentry(const char *tablename, const void *ip,
- const struct xt_match *match, void *matchinfo,
- unsigned int hook_mask)
+ipt_recent_init(const char *tablename, const void *ip,
+ const struct xt_match *match, void *matchinfo,
+ void *data, unsigned int hook_mask)
{
const struct ipt_recent_info *info = matchinfo;
struct recent_table *t;
@@ -293,7 +293,8 @@ out:
}
static void
-ipt_recent_destroy(const struct xt_match *match, void *matchinfo)
+ipt_recent_destroy(const struct xt_match *match, void *matchinfo,
+ void *data)
{
const struct ipt_recent_info *info = matchinfo;
struct recent_table *t;
@@ -466,12 +467,12 @@ static struct ipt_match recent_match = {
.name = "recent",
.match = ipt_recent_match,
.matchsize = sizeof(struct ipt_recent_info),
- .checkentry = ipt_recent_checkentry,
+ .init = ipt_recent_init,
.destroy = ipt_recent_destroy,
.me = THIS_MODULE,
};
-static int __init ipt_recent_init(void)
+static int __init ipt_recent_module_init(void)
{
int err;
@@ -492,7 +493,7 @@ static int __init ipt_recent_init(void)
return err;
}
-static void __exit ipt_recent_exit(void)
+static void __exit ipt_recent_module_exit(void)
{
BUG_ON(!list_empty(&tables));
ipt_unregister_match(&recent_match);
@@ -501,5 +502,5 @@ static void __exit ipt_recent_exit(void)
#endif
}
-module_init(ipt_recent_init);
-module_exit(ipt_recent_exit);
+module_init(ipt_recent_module_init);
+module_exit(ipt_recent_module_exit);
diff --git a/net/ipv4/netfilter/ipt_tos.c b/net/ipv4/netfilter/ipt_tos.c
index 5549c39..f3433cd 100644
--- a/net/ipv4/netfilter/ipt_tos.c
+++ b/net/ipv4/netfilter/ipt_tos.c
@@ -23,6 +23,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
diff --git a/net/ipv4/netfilter/ipt_ttl.c b/net/ipv4/netfilter/ipt_ttl.c
index a5243bd..de69ea6 100644
--- a/net/ipv4/netfilter/ipt_ttl.c
+++ b/net/ipv4/netfilter/ipt_ttl.c
@@ -22,7 +22,7 @@ MODULE_LICENSE("GPL");
static int match(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, int *hotdrop)
+ void *data, int offset, unsigned int protoff, int *hotdrop)
{
const struct ipt_ttl_info *info = matchinfo;
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index f63fb86..dc5e1ad 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -238,6 +238,7 @@ int do_match(struct ip6t_entry_match *m,
{
/* Stop iteration if it doesn't match */
if (!m->u.kernel.match->match(skb, in, out, m->u.kernel.match, m->data,
+ m->u.kernel.data,
offset, protoff, hotdrop))
return 1;
else
@@ -503,7 +504,8 @@ cleanup_match(struct ip6t_entry_match *m
return 1;
if (m->u.kernel.match->destroy)
- m->u.kernel.match->destroy(m->u.kernel.match, m->data);
+ m->u.kernel.match->destroy(m->u.kernel.match, m->data,
+ m->u.kernel.data);
module_put(m->u.kernel.match->me);
return 0;
}
@@ -548,15 +550,16 @@ check_match(struct ip6t_entry_match *m,
}
m->u.kernel.match = match;
- ret = xt_check_match(match, AF_INET6, m->u.match_size - sizeof(*m),
- name, hookmask, ipv6->proto,
- ipv6->invflags & IP6T_INV_PROTO);
+ ret = xt_init_match(match, AF_INET6, m->u.match_size - sizeof(*m),
+ name, hookmask, ipv6->proto,
+ ipv6->invflags & IP6T_INV_PROTO);
if (ret)
goto err;
- if (m->u.kernel.match->checkentry
- && !m->u.kernel.match->checkentry(name, ipv6, match, m->data,
- hookmask)) {
+ m->u.kernel.data=NULL;
+ if (m->u.kernel.match->init
+ && !m->u.kernel.match->init(name, ipv6, match, m->data,
+ m->u.kernel.data, hookmask)) {
duprintf("ip_tables: check failed for `%s'.\n",
m->u.kernel.match->name);
ret = -EINVAL;
@@ -1318,6 +1321,7 @@ icmp6_match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -1347,10 +1351,11 @@ icmp6_match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-icmp6_checkentry(const char *tablename,
+icmp6_init(const char *tablename,
const void *entry,
const struct xt_match *match,
void *matchinfo,
+ void *data,
unsigned int hook_mask)
{
const struct ip6t_icmp *icmpinfo = matchinfo;
@@ -1387,7 +1392,7 @@ static struct ip6t_match icmp6_matchstru
.name = "icmp6",
.match = &icmp6_match,
.matchsize = sizeof(struct ip6t_icmp),
- .checkentry = icmp6_checkentry,
+ .init = icmp6_init,
.proto = IPPROTO_ICMPV6,
.family = AF_INET6,
};
diff --git a/net/ipv6/netfilter/ip6t_ah.c b/net/ipv6/netfilter/ip6t_ah.c
index 4648664..616d250 100644
--- a/net/ipv6/netfilter/ip6t_ah.c
+++ b/net/ipv6/netfilter/ip6t_ah.c
@@ -46,6 +46,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -103,11 +104,12 @@ match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-checkentry(const char *tablename,
- const void *entry,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *entry,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ip6t_ah *ahinfo = matchinfo;
@@ -122,7 +124,7 @@ static struct ip6t_match ah_match = {
.name = "ah",
.match = match,
.matchsize = sizeof(struct ip6t_ah),
- .checkentry = checkentry,
+ .init = init,
.me = THIS_MODULE,
};
diff --git a/net/ipv6/netfilter/ip6t_eui64.c b/net/ipv6/netfilter/ip6t_eui64.c
index 4f6b84c..c4842e3 100644
--- a/net/ipv6/netfilter/ip6t_eui64.c
+++ b/net/ipv6/netfilter/ip6t_eui64.c
@@ -24,6 +24,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
diff --git a/net/ipv6/netfilter/ip6t_frag.c b/net/ipv6/netfilter/ip6t_frag.c
index cd22eaa..d272157 100644
--- a/net/ipv6/netfilter/ip6t_frag.c
+++ b/net/ipv6/netfilter/ip6t_frag.c
@@ -45,6 +45,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -120,11 +121,12 @@ match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-checkentry(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ip6t_frag *fraginfo = matchinfo;
@@ -139,7 +141,7 @@ static struct ip6t_match frag_match = {
.name = "frag",
.match = match,
.matchsize = sizeof(struct ip6t_frag),
- .checkentry = checkentry,
+ .init = init,
.me = THIS_MODULE,
};
diff --git a/net/ipv6/netfilter/ip6t_hbh.c b/net/ipv6/netfilter/ip6t_hbh.c
index 3f25bab..0402cdc 100644
--- a/net/ipv6/netfilter/ip6t_hbh.c
+++ b/net/ipv6/netfilter/ip6t_hbh.c
@@ -52,6 +52,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -174,11 +175,12 @@ match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-checkentry(const char *tablename,
- const void *entry,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *entry,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ip6t_opts *optsinfo = matchinfo;
@@ -195,7 +197,7 @@ static struct xt_match opts_match[] = {
.family = AF_INET6,
.match = match,
.matchsize = sizeof(struct ip6t_opts),
- .checkentry = checkentry,
+ .init = init,
.me = THIS_MODULE,
.data = NEXTHDR_HOP,
},
@@ -204,7 +206,7 @@ static struct xt_match opts_match[] = {
.family = AF_INET6,
.match = match,
.matchsize = sizeof(struct ip6t_opts),
- .checkentry = checkentry,
+ .init = init,
.me = THIS_MODULE,
.data = NEXTHDR_DEST,
},
diff --git a/net/ipv6/netfilter/ip6t_hl.c b/net/ipv6/netfilter/ip6t_hl.c
index 44a729e..e4a0a5f 100644
--- a/net/ipv6/netfilter/ip6t_hl.c
+++ b/net/ipv6/netfilter/ip6t_hl.c
@@ -21,7 +21,7 @@ MODULE_LICENSE("GPL");
static int match(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, int *hotdrop)
+ void *data, int offset, unsigned int protoff, int *hotdrop)
{
const struct ip6t_hl_info *info = matchinfo;
const struct ipv6hdr *ip6h = skb->nh.ipv6h;
--git a/net/ipv6/netfilter/ip6t_ipv6header.c b/net/ipv6/netfilter/ip6t_ipv6header.c
index 3093c39..cadf1dc 100644
--- a/net/ipv6/netfilter/ip6t_ipv6header.c
+++ b/net/ipv6/netfilter/ip6t_ipv6header.c
@@ -31,6 +31,7 @@ ipv6header_match(const struct sk_buff *s
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -124,11 +125,12 @@ ipv6header_match(const struct sk_buff *s
}
static int
-ipv6header_checkentry(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+ipv6header_init(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ip6t_ipv6header_info *info = matchinfo;
@@ -144,20 +146,20 @@ static struct ip6t_match ip6t_ipv6header
.name = "ipv6header",
.match = &ipv6header_match,
.matchsize = sizeof(struct ip6t_ipv6header_info),
- .checkentry = &ipv6header_checkentry,
+ .init = &ipv6header_init,
.destroy = NULL,
.me = THIS_MODULE,
};
-static int __init ipv6header_init(void)
+static int __init ipv6header_module_init(void)
{
return ip6t_register_match(&ip6t_ipv6header_match);
}
-static void __exit ipv6header_exit(void)
+static void __exit ipv6header_module_exit(void)
{
ip6t_unregister_match(&ip6t_ipv6header_match);
}
-module_init(ipv6header_init);
-module_exit(ipv6header_exit);
+module_init(ipv6header_module_init);
+module_exit(ipv6header_module_exit);
diff --git a/net/ipv6/netfilter/ip6t_owner.c b/net/ipv6/netfilter/ip6t_owner.c
index 4eb9bbc..2e86bfe 100644
--- a/net/ipv6/netfilter/ip6t_owner.c
+++ b/net/ipv6/netfilter/ip6t_owner.c
@@ -28,6 +28,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -53,11 +54,12 @@ match(const struct sk_buff *skb,
}
static int
-checkentry(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ip6t_owner_info *info = matchinfo;
@@ -74,7 +76,7 @@ static struct ip6t_match owner_match = {
.match = match,
.matchsize = sizeof(struct ip6t_owner_info),
.hooks = (1 << NF_IP6_LOCAL_OUT) | (1 << NF_IP6_POST_ROUTING),
- .checkentry = checkentry,
+ .init = init,
.me = THIS_MODULE,
};
diff --git a/net/ipv6/netfilter/ip6t_rt.c b/net/ipv6/netfilter/ip6t_rt.c
index 54d7d14..53dc9f0 100644
--- a/net/ipv6/netfilter/ip6t_rt.c
+++ b/net/ipv6/netfilter/ip6t_rt.c
@@ -47,6 +47,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -198,11 +199,12 @@ match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-checkentry(const char *tablename,
- const void *entry,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *entry,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ip6t_rt *rtinfo = matchinfo;
@@ -225,7 +227,7 @@ static struct ip6t_match rt_match = {
.name = "rt",
.match = match,
.matchsize = sizeof(struct ip6t_rt),
- .checkentry = checkentry,
+ .init = init,
.me = THIS_MODULE,
};
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 8996584..d2ffe98 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -304,9 +304,9 @@ int xt_find_revision(int af, const char
}
EXPORT_SYMBOL_GPL(xt_find_revision);
-int xt_check_match(const struct xt_match *match, unsigned short family,
- unsigned int size, const char *table, unsigned int hook_mask,
- unsigned short proto, int inv_proto)
+int xt_init_match(const struct xt_match *match, unsigned short family,
+ unsigned int size, const char *table, unsigned int hook_mask,
+ unsigned short proto, int inv_proto)
{
if (XT_ALIGN(match->matchsize) != size) {
printk("%s_tables: %s match: invalid size %Zu != %u\n",
@@ -331,7 +331,7 @@ int xt_check_match(const struct xt_match
}
return 0;
}
-EXPORT_SYMBOL_GPL(xt_check_match);
+EXPORT_SYMBOL_GPL(xt_init_match);
#ifdef CONFIG_COMPAT
int xt_compat_match_offset(struct xt_match *match)
--git a/net/netfilter/xt_comment.c b/net/netfilter/xt_comment.c
index 7db492d..047f499 100644
--- a/net/netfilter/xt_comment.c
+++ b/net/netfilter/xt_comment.c
@@ -21,6 +21,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protooff,
int *hotdrop)
diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index dcc497e..759d8f3 100644
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -46,6 +46,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -121,11 +122,12 @@ match(const struct sk_buff *skb,
return (what >= sinfo->count.from);
}
-static int check(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static int init(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct xt_connbytes_info *sinfo = matchinfo;
@@ -146,7 +148,7 @@ static struct xt_match xt_connbytes_matc
{
.name = "connbytes",
.family = AF_INET,
- .checkentry = check,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_connbytes_info),
.me = THIS_MODULE
@@ -154,7 +156,7 @@ static struct xt_match xt_connbytes_matc
{
.name = "connbytes",
.family = AF_INET6,
- .checkentry = check,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_connbytes_info),
.me = THIS_MODULE
diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index a8f0305..5cd94a3 100644
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -37,6 +37,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -51,11 +52,12 @@ match(const struct sk_buff *skb,
}
static int
-checkentry(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
struct xt_connmark_info *cm = matchinfo;
@@ -74,7 +76,7 @@ checkentry(const char *tablename,
}
static void
-destroy(const struct xt_match *match, void *matchinfo)
+destroy(const struct xt_match *match, void *matchinfo, void *data)
{
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
nf_ct_l3proto_module_put(match->family);
@@ -116,7 +118,7 @@ static struct xt_match xt_connmark_match
{
.name = "connmark",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.destroy = destroy,
.matchsize = sizeof(struct xt_connmark_info),
@@ -130,7 +132,7 @@ static struct xt_match xt_connmark_match
{
.name = "connmark",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.destroy = destroy,
.matchsize = sizeof(struct xt_connmark_info),
diff --git a/net/netfilter/xt_conntrack.c b/net/netfilter/xt_conntrack.c
index 0ea501a..d06ce02 100644
--- a/net/netfilter/xt_conntrack.c
+++ b/net/netfilter/xt_conntrack.c
@@ -34,6 +34,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -130,6 +131,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -222,11 +224,12 @@ match(const struct sk_buff *skb,
#endif /* CONFIG_NF_IP_CONNTRACK */
static int
-checkentry(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
if (nf_ct_l3proto_try_module_get(match->family) < 0) {
@@ -238,7 +241,8 @@ checkentry(const char *tablename,
return 1;
}
-static void destroy(const struct xt_match *match, void *matchinfo)
+static void destroy(const struct xt_match *match, void *matchinfo,
+ void *data)
{
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
nf_ct_l3proto_module_put(match->family);
@@ -248,7 +252,7 @@ static void destroy(const struct xt_matc
static struct xt_match conntrack_match = {
.name = "conntrack",
.match = match,
- .checkentry = checkentry,
+ .init = init,
.destroy = destroy,
.matchsize = sizeof(struct xt_conntrack_info),
.family = AF_INET,
diff --git a/net/netfilter/xt_dccp.c b/net/netfilter/xt_dccp.c
index 3e6cf43..27e0a2f 100644
--- a/net/netfilter/xt_dccp.c
+++ b/net/netfilter/xt_dccp.c
@@ -97,6 +97,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -127,11 +128,12 @@ match(const struct sk_buff *skb,
}
static int
-checkentry(const char *tablename,
- const void *inf,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *inf,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct xt_dccp_info *info = matchinfo;
@@ -144,7 +146,7 @@ static struct xt_match xt_dccp_match[] =
{
.name = "dccp",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_dccp_info),
.proto = IPPROTO_DCCP,
@@ -153,7 +155,7 @@ static struct xt_match xt_dccp_match[] =
{
.name = "dccp",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_dccp_info),
.proto = IPPROTO_DCCP,
diff --git a/net/netfilter/xt_dscp.c b/net/netfilter/xt_dscp.c
index 26c7f4a..9a43d98 100644
--- a/net/netfilter/xt_dscp.c
+++ b/net/netfilter/xt_dscp.c
@@ -29,6 +29,7 @@ static int match(const struct sk_buff *s
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -44,6 +45,7 @@ static int match6(const struct sk_buff *
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -54,11 +56,12 @@ static int match6(const struct sk_buff *
return (dscp == info->dscp) ^ !!info->invert;
}
-static int checkentry(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static int init(const char *tablename,
+ const void *info,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const u_int8_t dscp = ((struct xt_dscp_info *)matchinfo)->dscp;
@@ -74,7 +77,7 @@ static struct xt_match xt_dscp_match[] =
{
.name = "dscp",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_dscp_info),
.me = THIS_MODULE,
@@ -82,7 +85,7 @@ static struct xt_match xt_dscp_match[] =
{
.name = "dscp",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match6,
.matchsize = sizeof(struct xt_dscp_info),
.me = THIS_MODULE,
diff --git a/net/netfilter/xt_esp.c b/net/netfilter/xt_esp.c
index 7c95f14..dd3ebc8 100644
--- a/net/netfilter/xt_esp.c
+++ b/net/netfilter/xt_esp.c
@@ -48,6 +48,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -75,11 +76,12 @@ match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-checkentry(const char *tablename,
- const void *ip_void,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *ip_void,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct xt_esp *espinfo = matchinfo;
@@ -95,7 +97,7 @@ static struct xt_match xt_esp_match[] =
{
.name = "esp",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_esp),
.proto = IPPROTO_ESP,
@@ -104,7 +106,7 @@ static struct xt_match xt_esp_match[] =
{
.name = "esp",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_esp),
.proto = IPPROTO_ESP,
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index a98de0b..100808e 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -439,6 +439,7 @@ hashlimit_match(const struct sk_buff *sk
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -493,11 +494,12 @@ hotdrop:
}
static int
-hashlimit_checkentry(const char *tablename,
- const void *inf,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+hashlimit_init(const char *tablename,
+ const void *inf,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
struct xt_hashlimit_info *r = matchinfo;
@@ -541,7 +543,7 @@ hashlimit_checkentry(const char *tablena
}
static void
-hashlimit_destroy(const struct xt_match *match, void *matchinfo)
+hashlimit_destroy(const struct xt_match *match, void *matchinfo, void *data)
{
struct xt_hashlimit_info *r = matchinfo;
@@ -583,7 +585,7 @@ static struct xt_match xt_hashlimit[] =
.compat_from_user = compat_from_user,
.compat_to_user = compat_to_user,
#endif
- .checkentry = hashlimit_checkentry,
+ .init = hashlimit_init,
.destroy = hashlimit_destroy,
.me = THIS_MODULE
},
@@ -597,7 +599,7 @@ static struct xt_match xt_hashlimit[] =
.compat_from_user = compat_from_user,
.compat_to_user = compat_to_user,
#endif
- .checkentry = hashlimit_checkentry,
+ .init = hashlimit_init,
.destroy = hashlimit_destroy,
.me = THIS_MODULE
},
diff --git a/net/netfilter/xt_helper.c b/net/netfilter/xt_helper.c
index 5d7818b..de437e5 100644
--- a/net/netfilter/xt_helper.c
+++ b/net/netfilter/xt_helper.c
@@ -44,6 +44,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -92,6 +93,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -135,11 +137,12 @@ out_unlock:
}
#endif
-static int check(const char *tablename,
- const void *inf,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static int init(const char *tablename,
+ const void *inf,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
struct xt_helper_info *info = matchinfo;
@@ -155,7 +158,7 @@ static int check(const char *tablename,
}
static void
-destroy(const struct xt_match *match, void *matchinfo)
+destroy(const struct xt_match *match, void *matchinfo, void *data)
{
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
nf_ct_l3proto_module_put(match->family);
@@ -166,7 +169,7 @@ static struct xt_match xt_helper_match[]
{
.name = "helper",
.family = AF_INET,
- .checkentry = check,
+ .init = init,
.match = match,
.destroy = destroy,
.matchsize = sizeof(struct xt_helper_info),
@@ -175,7 +178,7 @@ static struct xt_match xt_helper_match[]
{
.name = "helper",
.family = AF_INET6,
- .checkentry = check,
+ .init = init,
.match = match,
.destroy = destroy,
.matchsize = sizeof(struct xt_helper_info),
diff --git a/net/netfilter/xt_length.c b/net/netfilter/xt_length.c
index 67fd30d..74053bc 100644
--- a/net/netfilter/xt_length.c
+++ b/net/netfilter/xt_length.c
@@ -26,6 +26,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -42,6 +43,7 @@ match6(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c
index fda7b7d..a073df7 100644
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
@@ -5,8 +5,8 @@
* Alexey is a fucking genius?
* Rusty Russell (rusty@rustcorp.com.au). */
-/* (C) 1999 Jérôme de Vivie <devivie@info.enserb.u-bordeaux.fr>
- * (C) 1999 Hervé Eychenne <eychenne@info.enserb.u-bordeaux.fr>
+/* (C) 1999 J��e de Vivie <devivie@info.enserb.u-bordeaux.fr>
+ * (C) 1999 Herv�Eychenne <eychenne@info.enserb.u-bordeaux.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -70,6 +70,7 @@ ipt_limit_match(const struct sk_buff *sk
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -106,11 +107,12 @@ user2credits(u_int32_t user)
}
static int
-ipt_limit_checkentry(const char *tablename,
- const void *inf,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+ipt_limit_init(const char *tablename,
+ const void *inf,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
struct xt_rateinfo *r = matchinfo;
@@ -183,7 +185,7 @@ static struct xt_match xt_limit_match[]
{
.name = "limit",
.family = AF_INET,
- .checkentry = ipt_limit_checkentry,
+ .init = ipt_limit_init,
.match = ipt_limit_match,
.matchsize = sizeof(struct xt_rateinfo),
#ifdef CONFIG_COMPAT
@@ -196,7 +198,7 @@ static struct xt_match xt_limit_match[]
{
.name = "limit",
.family = AF_INET6,
- .checkentry = ipt_limit_checkentry,
+ .init = ipt_limit_init,
.match = ipt_limit_match,
.matchsize = sizeof(struct xt_rateinfo),
.me = THIS_MODULE,
diff --git a/net/netfilter/xt_mac.c b/net/netfilter/xt_mac.c
index 425fc21..4b5eef2 100644
--- a/net/netfilter/xt_mac.c
+++ b/net/netfilter/xt_mac.c
@@ -29,6 +29,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index dfa1ee6..733e049 100644
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -25,6 +25,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -35,11 +36,12 @@ match(const struct sk_buff *skb,
}
static int
-checkentry(const char *tablename,
- const void *entry,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *entry,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct xt_mark_info *minfo = matchinfo;
@@ -85,7 +87,7 @@ static struct xt_match xt_mark_match[] =
{
.name = "mark",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_mark_info),
#ifdef CONFIG_COMPAT
@@ -98,7 +100,7 @@ static struct xt_match xt_mark_match[] =
{
.name = "mark",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_mark_info),
.me = THIS_MODULE,
diff --git a/net/netfilter/xt_multiport.c b/net/netfilter/xt_multiport.c
index 1602086..2619dfc 100644
--- a/net/netfilter/xt_multiport.c
+++ b/net/netfilter/xt_multiport.c
@@ -100,6 +100,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -131,6 +132,7 @@ match_v1(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -173,11 +175,12 @@ check(u_int16_t proto,
/* Called when user tries to insert an entry of this type. */
static int
-checkentry(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *info,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ipt_ip *ip = info;
const struct xt_multiport *multiinfo = matchinfo;
@@ -187,11 +190,12 @@ checkentry(const char *tablename,
}
static int
-checkentry_v1(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init_v1(const char *tablename,
+ const void *info,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ipt_ip *ip = info;
const struct xt_multiport_v1 *multiinfo = matchinfo;
@@ -201,11 +205,12 @@ checkentry_v1(const char *tablename,
}
static int
-checkentry6(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init6(const char *tablename,
+ const void *info,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ip6t_ip6 *ip = info;
const struct xt_multiport *multiinfo = matchinfo;
@@ -215,11 +220,12 @@ checkentry6(const char *tablename,
}
static int
-checkentry6_v1(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init6_v1(const char *tablename,
+ const void *info,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct ip6t_ip6 *ip = info;
const struct xt_multiport_v1 *multiinfo = matchinfo;
@@ -233,7 +239,7 @@ static struct xt_match xt_multiport_matc
.name = "multiport",
.family = AF_INET,
.revision = 0,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_multiport),
.me = THIS_MODULE,
@@ -242,7 +248,7 @@ static struct xt_match xt_multiport_matc
.name = "multiport",
.family = AF_INET,
.revision = 1,
- .checkentry = checkentry_v1,
+ .init = init_v1,
.match = match_v1,
.matchsize = sizeof(struct xt_multiport_v1),
.me = THIS_MODULE,
@@ -251,7 +257,7 @@ static struct xt_match xt_multiport_matc
.name = "multiport",
.family = AF_INET6,
.revision = 0,
- .checkentry = checkentry6,
+ .init = init6,
.match = match,
.matchsize = sizeof(struct xt_multiport),
.me = THIS_MODULE,
@@ -260,7 +266,7 @@ static struct xt_match xt_multiport_matc
.name = "multiport",
.family = AF_INET6,
.revision = 1,
- .checkentry = checkentry6_v1,
+ .init = init6_v1,
.match = match_v1,
.matchsize = sizeof(struct xt_multiport_v1),
.me = THIS_MODULE,
diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c
index fd8f954..9fb445c 100644
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
@@ -29,6 +29,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -102,11 +103,12 @@ match_outdev:
}
static int
-checkentry(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct xt_physdev_info *info = matchinfo;
@@ -135,7 +137,7 @@ static struct xt_match xt_physdev_match[
{
.name = "physdev",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_physdev_info),
.me = THIS_MODULE,
@@ -143,7 +145,7 @@ static struct xt_match xt_physdev_match[
{
.name = "physdev",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_physdev_info),
.me = THIS_MODULE,
diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c
index 16e7b08..1445de5 100644
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c
@@ -26,6 +26,7 @@ static int match(const struct sk_buff *s
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
diff --git a/net/netfilter/xt_policy.c b/net/netfilter/xt_policy.c
index 46bde2b..b7c5020 100644
--- a/net/netfilter/xt_policy.c
+++ b/net/netfilter/xt_policy.c
@@ -113,6 +113,7 @@ static int match(const struct sk_buff *s
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -133,9 +134,9 @@ static int match(const struct sk_buff *s
return ret;
}
-static int checkentry(const char *tablename, const void *ip_void,
- const struct xt_match *match,
- void *matchinfo, unsigned int hook_mask)
+static int init(const char *tablename, const void *ip_void,
+ const struct xt_match *match,
+ void *matchinfo, void *data, unsigned int hook_mask)
{
struct xt_policy_info *info = matchinfo;
@@ -168,7 +169,7 @@ static struct xt_match xt_policy_match[]
{
.name = "policy",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_policy_info),
.me = THIS_MODULE,
@@ -176,25 +177,25 @@ static struct xt_match xt_policy_match[]
{
.name = "policy",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_policy_info),
.me = THIS_MODULE,
},
};
-static int __init init(void)
+static int __init xt_policy_init(void)
{
return xt_register_matches(xt_policy_match,
ARRAY_SIZE(xt_policy_match));
}
-static void __exit fini(void)
+static void __exit xt_policy_fini(void)
{
xt_unregister_matches(xt_policy_match, ARRAY_SIZE(xt_policy_match));
}
-module_init(init);
-module_exit(fini);
+module_init(xt_policy_init);
+module_exit(xt_policy_fini);
MODULE_ALIAS("ipt_policy");
MODULE_ALIAS("ip6t_policy");
diff --git a/net/netfilter/xt_quota.c b/net/netfilter/xt_quota.c
index b75fa2c..a715b83 100644
--- a/net/netfilter/xt_quota.c
+++ b/net/netfilter/xt_quota.c
@@ -20,7 +20,7 @@ static int
match(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, int *hotdrop)
+ void *data, int offset, unsigned int protoff, int *hotdrop)
{
struct xt_quota_info *q = ((struct xt_quota_info *)matchinfo)->master;
int ret = q->flags & XT_QUOTA_INVERT ? 1 : 0;
@@ -39,9 +39,9 @@ match(const struct sk_buff *skb,
}
static int
-checkentry(const char *tablename, const void *entry,
- const struct xt_match *match, void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename, const void *entry,
+ const struct xt_match *match, void *matchinfo,
+ void *data, unsigned int hook_mask)
{
struct xt_quota_info *q = (struct xt_quota_info *)matchinfo;
@@ -56,7 +56,7 @@ static struct xt_match xt_quota_match[]
{
.name = "quota",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_quota_info),
.me = THIS_MODULE
@@ -64,7 +64,7 @@ static struct xt_match xt_quota_match[]
{
.name = "quota",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_quota_info),
.me = THIS_MODULE
diff --git a/net/netfilter/xt_realm.c b/net/netfilter/xt_realm.c
index a80b7d1..32df3d9 100644
--- a/net/netfilter/xt_realm.c
+++ b/net/netfilter/xt_realm.c
@@ -29,6 +29,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
diff --git a/net/netfilter/xt_sctp.c b/net/netfilter/xt_sctp.c
index 71bf036..ab57309 100644
--- a/net/netfilter/xt_sctp.c
+++ b/net/netfilter/xt_sctp.c
@@ -125,6 +125,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -159,11 +160,12 @@ match(const struct sk_buff *skb,
}
static int
-checkentry(const char *tablename,
- const void *inf,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename,
+ const void *inf,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct xt_sctp_info *info = matchinfo;
@@ -181,7 +183,7 @@ static struct xt_match xt_sctp_match[] =
{
.name = "sctp",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_sctp_info),
.proto = IPPROTO_SCTP,
@@ -190,7 +192,7 @@ static struct xt_match xt_sctp_match[] =
{
.name = "sctp",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_sctp_info),
.proto = IPPROTO_SCTP,
diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c
index d9010b1..2269cbf 100644
--- a/net/netfilter/xt_state.c
+++ b/net/netfilter/xt_state.c
@@ -26,6 +26,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -44,11 +45,12 @@ match(const struct sk_buff *skb,
return (sinfo->statemask & statebit);
}
-static int check(const char *tablename,
- const void *inf,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static int init(const char *tablename,
+ const void *inf,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
if (nf_ct_l3proto_try_module_get(match->family) < 0) {
@@ -61,7 +63,7 @@ static int check(const char *tablename,
}
static void
-destroy(const struct xt_match *match, void *matchinfo)
+destroy(const struct xt_match *match, void *matchinfo, void *data)
{
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
nf_ct_l3proto_module_put(match->family);
@@ -72,7 +74,7 @@ static struct xt_match xt_state_match[]
{
.name = "state",
.family = AF_INET,
- .checkentry = check,
+ .init = init,
.match = match,
.destroy = destroy,
.matchsize = sizeof(struct xt_state_info),
@@ -81,7 +83,7 @@ static struct xt_match xt_state_match[]
{
.name = "state",
.family = AF_INET6,
- .checkentry = check,
+ .init = init,
.match = match,
.destroy = destroy,
.matchsize = sizeof(struct xt_state_info),
diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
index 091a9f8..ed3a303 100644
--- a/net/netfilter/xt_statistic.c
+++ b/net/netfilter/xt_statistic.c
@@ -28,7 +28,7 @@ static int
match(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, int *hotdrop)
+ void *data, int offset, unsigned int protoff, int *hotdrop)
{
struct xt_statistic_info *info = (struct xt_statistic_info *)matchinfo;
int ret = info->flags & XT_STATISTIC_INVERT ? 1 : 0;
@@ -53,9 +53,9 @@ match(const struct sk_buff *skb,
}
static int
-checkentry(const char *tablename, const void *entry,
- const struct xt_match *match, void *matchinfo,
- unsigned int hook_mask)
+init(const char *tablename, const void *entry,
+ const struct xt_match *match, void *matchinfo,
+ void *data, unsigned int hook_mask)
{
struct xt_statistic_info *info = (struct xt_statistic_info *)matchinfo;
@@ -70,7 +70,7 @@ static struct xt_match xt_statistic_matc
{
.name = "statistic",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_statistic_info),
.me = THIS_MODULE,
@@ -78,7 +78,7 @@ static struct xt_match xt_statistic_matc
{
.name = "statistic",
.family = AF_INET6,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.matchsize = sizeof(struct xt_statistic_info),
.me = THIS_MODULE,
diff --git a/net/netfilter/xt_string.c b/net/netfilter/xt_string.c
index 4453252..253012e 100644
--- a/net/netfilter/xt_string.c
+++ b/net/netfilter/xt_string.c
@@ -26,6 +26,7 @@ static int match(const struct sk_buff *s
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -42,11 +43,12 @@ static int match(const struct sk_buff *s
#define STRING_TEXT_PRIV(m) ((struct xt_string_info *) m)
-static int checkentry(const char *tablename,
- const void *ip,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static int init(const char *tablename,
+ const void *ip,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
struct xt_string_info *conf = matchinfo;
struct ts_config *ts_conf;
@@ -68,7 +70,8 @@ static int checkentry(const char *tablen
return 1;
}
-static void destroy(const struct xt_match *match, void *matchinfo)
+static void destroy(const struct xt_match *match, void *matchinfo,
+ void *data)
{
textsearch_destroy(STRING_TEXT_PRIV(matchinfo)->config);
}
@@ -77,7 +80,7 @@ static struct xt_match xt_string_match[]
{
.name = "string",
.family = AF_INET,
- .checkentry = checkentry,
+ .init = init,
.match = match,
.destroy = destroy,
.matchsize = sizeof(struct xt_string_info),
@@ -86,8 +89,8 @@ static struct xt_match xt_string_match[]
{
.name = "string",
.family = AF_INET6,
- .checkentry = checkentry,
- .match = match,
+ .init = init,
+ .match = match,
.destroy = destroy,
.matchsize = sizeof(struct xt_string_info),
.me = THIS_MODULE
diff --git a/net/netfilter/xt_tcpmss.c b/net/netfilter/xt_tcpmss.c
index a3682fe..c5c5e77 100644
--- a/net/netfilter/xt_tcpmss.c
+++ b/net/netfilter/xt_tcpmss.c
@@ -29,6 +29,7 @@ match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c
index 46414b5..090ae2f 100644
--- a/net/netfilter/xt_tcpudp.c
+++ b/net/netfilter/xt_tcpudp.c
@@ -76,6 +76,7 @@ tcp_match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -137,11 +138,12 @@ tcp_match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-tcp_checkentry(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+xt_tcp_init(const char *tablename,
+ const void *info,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct xt_tcp *tcpinfo = matchinfo;
@@ -155,6 +157,7 @@ udp_match(const struct sk_buff *skb,
const struct net_device *out,
const struct xt_match *match,
const void *matchinfo,
+ void *data,
int offset,
unsigned int protoff,
int *hotdrop)
@@ -185,11 +188,12 @@ udp_match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
-udp_checkentry(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+xt_udp_init(const char *tablename,
+ const void *info,
+ const struct xt_match *match,
+ void *matchinfo,
+ void *data,
+ unsigned int hook_mask)
{
const struct xt_tcp *udpinfo = matchinfo;
@@ -201,7 +205,7 @@ static struct xt_match xt_tcpudp_match[]
{
.name = "tcp",
.family = AF_INET,
- .checkentry = tcp_checkentry,
+ .init = xt_tcp_init,
.match = tcp_match,
.matchsize = sizeof(struct xt_tcp),
.proto = IPPROTO_TCP,
@@ -210,7 +214,7 @@ static struct xt_match xt_tcpudp_match[]
{
.name = "tcp",
.family = AF_INET6,
- .checkentry = tcp_checkentry,
+ .init = xt_tcp_init,
.match = tcp_match,
.matchsize = sizeof(struct xt_tcp),
.proto = IPPROTO_TCP,
@@ -219,7 +223,7 @@ static struct xt_match xt_tcpudp_match[]
{
.name = "udp",
.family = AF_INET,
- .checkentry = udp_checkentry,
+ .init = xt_udp_init,
.match = udp_match,
.matchsize = sizeof(struct xt_udp),
.proto = IPPROTO_UDP,
@@ -228,7 +232,7 @@ static struct xt_match xt_tcpudp_match[]
{
.name = "udp",
.family = AF_INET6,
- .checkentry = udp_checkentry,
+ .init = xt_udp_init,
.match = udp_match,
.matchsize = sizeof(struct xt_udp),
.proto = IPPROTO_UDP,
@@ -237,7 +241,7 @@ static struct xt_match xt_tcpudp_match[]
{
.name = "udplite",
.family = AF_INET,
- .checkentry = udp_checkentry,
+ .init = xt_udp_init,
.match = udp_match,
.matchsize = sizeof(struct xt_udp),
.proto = IPPROTO_UDPLITE,
@@ -246,7 +250,7 @@ static struct xt_match xt_tcpudp_match[]
{
.name = "udplite",
.family = AF_INET6,
- .checkentry = udp_checkentry,
+ .init = xt_udp_init,
.match = udp_match,
.matchsize = sizeof(struct xt_udp),
.proto = IPPROTO_UDPLITE,
@@ -254,16 +258,16 @@ static struct xt_match xt_tcpudp_match[]
},
};
-static int __init xt_tcpudp_init(void)
+static int __init xt_tcpudp_module_init(void)
{
return xt_register_matches(xt_tcpudp_match,
ARRAY_SIZE(xt_tcpudp_match));
}
-static void __exit xt_tcpudp_fini(void)
+static void __exit xt_tcpudp_module_fini(void)
{
xt_unregister_matches(xt_tcpudp_match, ARRAY_SIZE(xt_tcpudp_match));
}
-module_init(xt_tcpudp_init);
-module_exit(xt_tcpudp_fini);
+module_init(xt_tcpudp_module_init);
+module_exit(xt_tcpudp_module_fini);
--
1.4.3.3
next prev parent reply other threads:[~2006-12-05 22:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-05 22:12 [PATCH 0/4][data-condition] Massimiliano Hofer
2006-12-05 22:15 ` Massimiliano Hofer [this message]
2006-12-05 22:16 ` [PATCH 2/4][data-condition]: instance data support in targets' prototypes and structures Massimiliano Hofer
2006-12-05 22:17 ` [PATCH 3/4][data-condition]: instance data support in netfilter core code Massimiliano Hofer
2006-12-05 22:18 ` [PATCH 4/4][data-condition]: condition match Massimiliano Hofer
2006-12-05 22:22 ` [PATCH -/4][data-condition]: userspace code Massimiliano Hofer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200612052315.03166.max@nucleus.it \
--to=max@nucleus.it \
--cc=kaber@trash.net \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.