git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
netfilter
/
xt_helper.c
diff --git
a/net/netfilter/xt_helper.c
b/net/netfilter/xt_helper.c
index
38b6715
..
04bc32b
100644
(file)
--- a/
net/netfilter/xt_helper.c
+++ b/
net/netfilter/xt_helper.c
@@
-24,6
+24,7
@@
#endif
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_helper.h>
#endif
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_helper.h>
+#include <net/netfilter/nf_conntrack_compat.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Martin Josefsson <gandalf@netfilter.org>");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Martin Josefsson <gandalf@netfilter.org>");
@@
-42,6
+43,7
@@
static int
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
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,
const void *matchinfo,
int offset,
unsigned int protoff,
@@
-89,6
+91,7
@@
static int
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
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,
const void *matchinfo,
int offset,
unsigned int protoff,
@@
-96,6
+99,7
@@
match(const struct sk_buff *skb,
{
const struct xt_helper_info *info = matchinfo;
struct nf_conn *ct;
{
const struct xt_helper_info *info = matchinfo;
struct nf_conn *ct;
+ struct nf_conn_help *master_help;
enum ip_conntrack_info ctinfo;
int ret = info->invert;
enum ip_conntrack_info ctinfo;
int ret = info->invert;
@@
-111,7
+115,8
@@
match(const struct sk_buff *skb,
}
read_lock_bh(&nf_conntrack_lock);
}
read_lock_bh(&nf_conntrack_lock);
- if (!ct->master->helper) {
+ master_help = nfct_help(ct->master);
+ if (!master_help || !master_help->helper) {
DEBUGP("xt_helper: master ct %p has no helper\n",
exp->expectant);
goto out_unlock;
DEBUGP("xt_helper: master ct %p has no helper\n",
exp->expectant);
goto out_unlock;
@@
-123,8
+128,8
@@
match(const struct sk_buff *skb,
if (info->name[0] == '\0')
ret ^= 1;
else
if (info->name[0] == '\0')
ret ^= 1;
else
- ret ^= !strncmp(
ct->master->helper->name, info->name,
- strlen(
ct->master
->helper->name));
+ ret ^= !strncmp(
master_help->helper->name, info->name,
+ strlen(
master_help
->helper->name));
out_unlock:
read_unlock_bh(&nf_conntrack_lock);
return ret;
out_unlock:
read_unlock_bh(&nf_conntrack_lock);
return ret;
@@
-133,56
+138,59
@@
out_unlock:
static int check(const char *tablename,
const void *inf,
static int check(const char *tablename,
const void *inf,
+ const struct xt_match *match,
void *matchinfo,
void *matchinfo,
- unsigned int matchsize,
unsigned int hook_mask)
{
struct xt_helper_info *info = matchinfo;
unsigned int hook_mask)
{
struct xt_helper_info *info = matchinfo;
- info->name[29] = '\0';
-
- /* verify size */
- if (matchsize != XT_ALIGN(sizeof(struct xt_helper_info)))
+ if (nf_ct_l3proto_try_module_get(match->family) < 0) {
+ printk(KERN_WARNING "can't load conntrack support for "
+ "proto=%d\n", match->family);
return 0;
return 0;
-
+ }
+ info->name[29] = '\0';
return 1;
}
return 1;
}
-static struct xt_match helper_match = {
- .name = "helper",
- .match = &match,
- .checkentry = &check,
- .me = THIS_MODULE,
-};
-static struct xt_match helper6_match = {
- .name = "helper",
- .match = &match,
- .checkentry = &check,
- .me = THIS_MODULE,
-};
-
-static int __init init(void)
+static void
+destroy(const struct xt_match *match, void *matchinfo)
{
{
- int ret;
- need_conntrack();
-
- ret = xt_register_match(AF_INET, &helper_match);
- if (ret < 0)
- return ret;
+ nf_ct_l3proto_module_put(match->family);
+}
- ret = xt_register_match(AF_INET6, &helper6_match);
- if (ret < 0)
- xt_unregister_match(AF_INET, &helper_match);
+static struct xt_match xt_helper_match[] = {
+ {
+ .name = "helper",
+ .family = AF_INET,
+ .checkentry = check,
+ .match = match,
+ .destroy = destroy,
+ .matchsize = sizeof(struct xt_helper_info),
+ .me = THIS_MODULE,
+ },
+ {
+ .name = "helper",
+ .family = AF_INET6,
+ .checkentry = check,
+ .match = match,
+ .destroy = destroy,
+ .matchsize = sizeof(struct xt_helper_info),
+ .me = THIS_MODULE,
+ },
+};
- return ret;
+static int __init xt_helper_init(void)
+{
+ return xt_register_matches(xt_helper_match,
+ ARRAY_SIZE(xt_helper_match));
}
}
-static void __exit fini(void)
+static void __exit
xt_helper_
fini(void)
{
{
- xt_unregister_match(AF_INET, &helper_match);
- xt_unregister_match(AF_INET6, &helper6_match);
+ xt_unregister_matches(xt_helper_match, ARRAY_SIZE(xt_helper_match));
}
}
-module_init(init);
-module_exit(fini);
+module_init(
xt_helper_
init);
+module_exit(
xt_helper_
fini);