git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bt/rfcomm/tty: join error paths
[safe/jmp/linux-2.6]
/
net
/
netfilter
/
xt_multiport.c
diff --git
a/net/netfilter/xt_multiport.c
b/net/netfilter/xt_multiport.c
index
3d69d62
..
d06bb2d
100644
(file)
--- a/
net/netfilter/xt_multiport.c
+++ b/
net/netfilter/xt_multiport.c
@@
-22,7
+22,7
@@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
-MODULE_DESCRIPTION("
x_tables multiple port match module
");
+MODULE_DESCRIPTION("
Xtables: multiple port matching for TCP, UDP, UDP-Lite, SCTP and DCCP
");
MODULE_ALIAS("ipt_multiport");
MODULE_ALIAS("ip6t_multiport");
MODULE_ALIAS("ipt_multiport");
MODULE_ALIAS("ip6t_multiport");
@@
-34,8
+34,8
@@
MODULE_ALIAS("ip6t_multiport");
/* Returns 1 if the port is matched by the test, 0 otherwise. */
static inline bool
/* Returns 1 if the port is matched by the test, 0 otherwise. */
static inline bool
-ports_match(const u_int16_t *portlist, enum xt_multiport_flags flags,
- u_int8_t count, u_int16_t src, u_int16_t dst)
+ports_match
_v0
(const u_int16_t *portlist, enum xt_multiport_flags flags,
+
u_int8_t count, u_int16_t src, u_int16_t dst)
{
unsigned int i;
for (i = 0; i < count; i++) {
{
unsigned int i;
for (i = 0; i < count; i++) {
@@
-95,59
+95,46
@@
ports_match_v1(const struct xt_multiport_v1 *minfo,
}
static bool
}
static bool
-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,
- bool *hotdrop)
+multiport_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
{
{
- __be16 _ports[2], *pptr;
- const struct xt_multiport *multiinfo = matchinfo;
+ const __be16 *pptr;
+ __be16 _ports[2];
+ const struct xt_multiport *multiinfo = par->matchinfo;
- if (
offset
)
+ if (
par->fragoff != 0
)
return false;
return false;
- pptr = skb_header_pointer(skb, p
rot
off, sizeof(_ports), _ports);
+ pptr = skb_header_pointer(skb, p
ar->th
off, sizeof(_ports), _ports);
if (pptr == NULL) {
/* We've been asked to examine this packet, and we
* can't. Hence, no choice but to drop.
*/
duprintf("xt_multiport: Dropping evil offset=0 tinygram.\n");
if (pptr == NULL) {
/* We've been asked to examine this packet, and we
* can't. Hence, no choice but to drop.
*/
duprintf("xt_multiport: Dropping evil offset=0 tinygram.\n");
- *hotdrop = true;
+ *
par->
hotdrop = true;
return false;
}
return false;
}
- return ports_match(multiinfo->ports,
- multiinfo->flags, multiinfo->count,
- ntohs(pptr[0]), ntohs(pptr[1]));
+ return ports_match_v0(multiinfo->ports, multiinfo->flags,
+ multiinfo->count, ntohs(pptr[0]), ntohs(pptr[1]));
}
static bool
}
static bool
-match_v1(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)
+multiport_mt(const struct sk_buff *skb, const struct xt_match_param *par)
{
{
- __be16 _ports[2], *pptr;
- const struct xt_multiport_v1 *multiinfo = matchinfo;
+ const __be16 *pptr;
+ __be16 _ports[2];
+ const struct xt_multiport_v1 *multiinfo = par->matchinfo;
- if (
offset
)
+ if (
par->fragoff != 0
)
return false;
return false;
- pptr = skb_header_pointer(skb, p
rot
off, sizeof(_ports), _ports);
+ pptr = skb_header_pointer(skb, p
ar->th
off, sizeof(_ports), _ports);
if (pptr == NULL) {
/* We've been asked to examine this packet, and we
* can't. Hence, no choice but to drop.
*/
duprintf("xt_multiport: Dropping evil offset=0 tinygram.\n");
if (pptr == NULL) {
/* We've been asked to examine this packet, and we
* can't. Hence, no choice but to drop.
*/
duprintf("xt_multiport: Dropping evil offset=0 tinygram.\n");
- *hotdrop = true;
+ *
par->
hotdrop = true;
return false;
}
return false;
}
@@
-171,113
+158,91
@@
check(u_int16_t proto,
&& count <= XT_MULTI_PORTS;
}
&& count <= XT_MULTI_PORTS;
}
-/* Called when user tries to insert an entry of this type. */
-static bool
-checkentry(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static bool multiport_mt_check_v0(const struct xt_mtchk_param *par)
{
{
- const struct ipt_ip *ip = info;
- const struct xt_multiport *multiinfo = matchinfo;
+ const struct ipt_ip *ip =
par->entry
info;
+ const struct xt_multiport *multiinfo =
par->
matchinfo;
return check(ip->proto, ip->invflags, multiinfo->flags,
multiinfo->count);
}
return check(ip->proto, ip->invflags, multiinfo->flags,
multiinfo->count);
}
-static bool
-checkentry_v1(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static bool multiport_mt_check(const struct xt_mtchk_param *par)
{
{
- const struct ipt_ip *ip = info;
- const struct xt_multiport_v1 *multiinfo = matchinfo;
+ const struct ipt_ip *ip =
par->entry
info;
+ const struct xt_multiport_v1 *multiinfo =
par->
matchinfo;
return check(ip->proto, ip->invflags, multiinfo->flags,
multiinfo->count);
}
return check(ip->proto, ip->invflags, multiinfo->flags,
multiinfo->count);
}
-static bool
-checkentry6(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static bool multiport_mt6_check_v0(const struct xt_mtchk_param *par)
{
{
- const struct ip6t_ip6 *ip = info;
- const struct xt_multiport *multiinfo = matchinfo;
+ const struct ip6t_ip6 *ip =
par->entry
info;
+ const struct xt_multiport *multiinfo =
par->
matchinfo;
return check(ip->proto, ip->invflags, multiinfo->flags,
multiinfo->count);
}
return check(ip->proto, ip->invflags, multiinfo->flags,
multiinfo->count);
}
-static bool
-checkentry6_v1(const char *tablename,
- const void *info,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static bool multiport_mt6_check(const struct xt_mtchk_param *par)
{
{
- const struct ip6t_ip6 *ip = info;
- const struct xt_multiport_v1 *multiinfo = matchinfo;
+ const struct ip6t_ip6 *ip =
par->entry
info;
+ const struct xt_multiport_v1 *multiinfo =
par->
matchinfo;
return check(ip->proto, ip->invflags, multiinfo->flags,
multiinfo->count);
}
return check(ip->proto, ip->invflags, multiinfo->flags,
multiinfo->count);
}
-static struct xt_match
xt_multiport_match[]
= {
+static struct xt_match
multiport_mt_reg[] __read_mostly
= {
{
.name = "multiport",
{
.name = "multiport",
- .family =
AF_INET
,
+ .family =
NFPROTO_IPV4
,
.revision = 0,
.revision = 0,
- .checkentry =
checkentry
,
- .match = m
atch
,
+ .checkentry =
multiport_mt_check_v0
,
+ .match = m
ultiport_mt_v0
,
.matchsize = sizeof(struct xt_multiport),
.me = THIS_MODULE,
},
{
.name = "multiport",
.matchsize = sizeof(struct xt_multiport),
.me = THIS_MODULE,
},
{
.name = "multiport",
- .family =
AF_INET
,
+ .family =
NFPROTO_IPV4
,
.revision = 1,
.revision = 1,
- .checkentry =
checkentry_v1
,
- .match = m
atch_v1
,
+ .checkentry =
multiport_mt_check
,
+ .match = m
ultiport_mt
,
.matchsize = sizeof(struct xt_multiport_v1),
.me = THIS_MODULE,
},
{
.name = "multiport",
.matchsize = sizeof(struct xt_multiport_v1),
.me = THIS_MODULE,
},
{
.name = "multiport",
- .family =
AF_INET
6,
+ .family =
NFPROTO_IPV
6,
.revision = 0,
.revision = 0,
- .checkentry =
checkentry6
,
- .match = m
atch
,
+ .checkentry =
multiport_mt6_check_v0
,
+ .match = m
ultiport_mt_v0
,
.matchsize = sizeof(struct xt_multiport),
.me = THIS_MODULE,
},
{
.name = "multiport",
.matchsize = sizeof(struct xt_multiport),
.me = THIS_MODULE,
},
{
.name = "multiport",
- .family =
AF_INET
6,
+ .family =
NFPROTO_IPV
6,
.revision = 1,
.revision = 1,
- .checkentry =
checkentry6_v1
,
- .match = m
atch_v1
,
+ .checkentry =
multiport_mt6_check
,
+ .match = m
ultiport_mt
,
.matchsize = sizeof(struct xt_multiport_v1),
.me = THIS_MODULE,
},
};
.matchsize = sizeof(struct xt_multiport_v1),
.me = THIS_MODULE,
},
};
-static int __init
xt_multipor
t_init(void)
+static int __init
multiport_m
t_init(void)
{
{
- return xt_register_matches(
xt_multiport_match
,
-
ARRAY_SIZE(xt_multiport_match
));
+ return xt_register_matches(
multiport_mt_reg
,
+
ARRAY_SIZE(multiport_mt_reg
));
}
}
-static void __exit
xt_multiport_fini
(void)
+static void __exit
multiport_mt_exit
(void)
{
{
- xt_unregister_matches(xt_multiport_match,
- ARRAY_SIZE(xt_multiport_match));
+ xt_unregister_matches(multiport_mt_reg, ARRAY_SIZE(multiport_mt_reg));
}
}
-module_init(
xt_multipor
t_init);
-module_exit(
xt_multiport_fini
);
+module_init(
multiport_m
t_init);
+module_exit(
multiport_mt_exit
);