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
netfilter: nfnetlink: netns support
[safe/jmp/linux-2.6]
/
net
/
netfilter
/
xt_sctp.c
diff --git
a/net/netfilter/xt_sctp.c
b/net/netfilter/xt_sctp.c
index
22df338
..
a189ada
100644
(file)
--- a/
net/netfilter/xt_sctp.c
+++ b/
net/netfilter/xt_sctp.c
@@
-11,8
+11,9
@@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Kiran Kumar Immidi");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Kiran Kumar Immidi");
-MODULE_DESCRIPTION("
Match for SCTP protocol packets
");
+MODULE_DESCRIPTION("
Xtables: SCTP protocol packet match
");
MODULE_ALIAS("ipt_sctp");
MODULE_ALIAS("ipt_sctp");
+MODULE_ALIAS("ip6t_sctp");
#ifdef DEBUG_SCTP
#define duprintf(format, args...) printk(format , ## args)
#ifdef DEBUG_SCTP
#define duprintf(format, args...) printk(format , ## args)
@@
-31,11
+32,9
@@
match_flags(const struct xt_sctp_flag_info *flag_info,
{
int i;
{
int i;
- for (i = 0; i < flag_count; i++)
{
- if (flag_info[i].chunktype == chunktype)
{
+ for (i = 0; i < flag_count; i++)
+ if (flag_info[i].chunktype == chunktype)
return (chunkflags & flag_info[i].flag_mask) == flag_info[i].flag;
return (chunkflags & flag_info[i].flag_mask) == flag_info[i].flag;
- }
- }
return true;
}
return true;
}
@@
-43,22
+42,22
@@
match_flags(const struct xt_sctp_flag_info *flag_info,
static inline bool
match_packet(const struct sk_buff *skb,
unsigned int offset,
static inline bool
match_packet(const struct sk_buff *skb,
unsigned int offset,
- const u_int32_t *chunkmap,
- int chunk_match_type,
- const struct xt_sctp_flag_info *flag_info,
- const int flag_count,
+ const struct xt_sctp_info *info,
bool *hotdrop)
{
u_int32_t chunkmapcopy[256 / sizeof (u_int32_t)];
bool *hotdrop)
{
u_int32_t chunkmapcopy[256 / sizeof (u_int32_t)];
- sctp_chunkhdr_t _sch, *sch;
+ const sctp_chunkhdr_t *sch;
+ sctp_chunkhdr_t _sch;
+ int chunk_match_type = info->chunk_match_type;
+ const struct xt_sctp_flag_info *flag_info = info->flag_info;
+ int flag_count = info->flag_count;
#ifdef DEBUG_SCTP
int i = 0;
#endif
#ifdef DEBUG_SCTP
int i = 0;
#endif
- if (chunk_match_type == SCTP_CHUNK_MATCH_ALL) {
- SCTP_CHUNKMAP_COPY(chunkmapcopy, chunkmap);
- }
+ if (chunk_match_type == SCTP_CHUNK_MATCH_ALL)
+ SCTP_CHUNKMAP_COPY(chunkmapcopy, info->chunkmap);
do {
sch = skb_header_pointer(skb, offset, sizeof(_sch), &_sch);
do {
sch = skb_header_pointer(skb, offset, sizeof(_sch), &_sch);
@@
-75,7
+74,7
@@
match_packet(const struct sk_buff *skb,
duprintf("skb->len: %d\toffset: %d\n", skb->len, offset);
duprintf("skb->len: %d\toffset: %d\n", skb->len, offset);
- if (SCTP_CHUNKMAP_IS_SET(chunkmap, sch->type)) {
+ if (SCTP_CHUNKMAP_IS_SET(
info->
chunkmap, sch->type)) {
switch (chunk_match_type) {
case SCTP_CHUNK_MATCH_ANY:
if (match_flags(flag_info, flag_count,
switch (chunk_match_type) {
case SCTP_CHUNK_MATCH_ANY:
if (match_flags(flag_info, flag_count,
@@
-86,16
+85,14
@@
match_packet(const struct sk_buff *skb,
case SCTP_CHUNK_MATCH_ALL:
if (match_flags(flag_info, flag_count,
case SCTP_CHUNK_MATCH_ALL:
if (match_flags(flag_info, flag_count,
- sch->type, sch->flags)) {
+ sch->type, sch->flags))
SCTP_CHUNKMAP_CLEAR(chunkmapcopy, sch->type);
SCTP_CHUNKMAP_CLEAR(chunkmapcopy, sch->type);
- }
break;
case SCTP_CHUNK_MATCH_ONLY:
if (!match_flags(flag_info, flag_count,
break;
case SCTP_CHUNK_MATCH_ONLY:
if (!match_flags(flag_info, flag_count,
- sch->type, sch->flags)) {
+ sch->type, sch->flags))
return false;
return false;
- }
break;
}
} else {
break;
}
} else {
@@
-108,7
+105,7
@@
match_packet(const struct sk_buff *skb,
switch (chunk_match_type) {
case SCTP_CHUNK_MATCH_ALL:
switch (chunk_match_type) {
case SCTP_CHUNK_MATCH_ALL:
- return SCTP_CHUNKMAP_IS_CLEAR(chunkmap);
+ return SCTP_CHUNKMAP_IS_CLEAR(chunkmap
copy
);
case SCTP_CHUNK_MATCH_ANY:
return false;
case SCTP_CHUNK_MATCH_ONLY:
case SCTP_CHUNK_MATCH_ANY:
return false;
case SCTP_CHUNK_MATCH_ONLY:
@@
-120,52
+117,39
@@
match_packet(const struct sk_buff *skb,
}
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)
+sctp_mt(const struct sk_buff *skb, const struct xt_match_param *par)
{
{
- const struct xt_sctp_info *info = matchinfo;
- sctp_sctphdr_t _sh, *sh;
+ const struct xt_sctp_info *info = par->matchinfo;
+ const sctp_sctphdr_t *sh;
+ sctp_sctphdr_t _sh;
- if (
offset
) {
+ if (
par->fragoff != 0
) {
duprintf("Dropping non-first fragment.. FIXME\n");
return false;
}
duprintf("Dropping non-first fragment.. FIXME\n");
return false;
}
- sh = skb_header_pointer(skb, p
rot
off, sizeof(_sh), &_sh);
+ sh = skb_header_pointer(skb, p
ar->th
off, sizeof(_sh), &_sh);
if (sh == NULL) {
duprintf("Dropping evil TCP offset=0 tinygram.\n");
if (sh == NULL) {
duprintf("Dropping evil TCP offset=0 tinygram.\n");
- *hotdrop = true;
+ *
par->
hotdrop = true;
return false;
}
duprintf("spt: %d\tdpt: %d\n", ntohs(sh->source), ntohs(sh->dest));
return false;
}
duprintf("spt: %d\tdpt: %d\n", ntohs(sh->source), ntohs(sh->dest));
- return SCCHECK(
((ntohs(sh->source) >= info->spts[0])
- &&
(ntohs(sh->source) <= info->spts[1]))
,
+ return SCCHECK(
ntohs(sh->source) >= info->spts[0]
+ &&
ntohs(sh->source) <= info->spts[1]
,
XT_SCTP_SRC_PORTS, info->flags, info->invflags)
XT_SCTP_SRC_PORTS, info->flags, info->invflags)
- && SCCHECK(
((ntohs(sh->dest) >= info->dpts[0])
- &&
(ntohs(sh->dest) <= info->dpts[1]))
,
+ && SCCHECK(
ntohs(sh->dest) >= info->dpts[0]
+ &&
ntohs(sh->dest) <= info->dpts[1]
,
XT_SCTP_DEST_PORTS, info->flags, info->invflags)
XT_SCTP_DEST_PORTS, info->flags, info->invflags)
- && SCCHECK(match_packet(skb, protoff + sizeof (sctp_sctphdr_t),
- info->chunkmap, info->chunk_match_type,
- info->flag_info, info->flag_count,
- hotdrop),
+ && SCCHECK(match_packet(skb, par->thoff + sizeof(sctp_sctphdr_t),
+ info, par->hotdrop),
XT_SCTP_CHUNK_TYPES, info->flags, info->invflags);
}
XT_SCTP_CHUNK_TYPES, info->flags, info->invflags);
}
-static bool
-checkentry(const char *tablename,
- const void *inf,
- const struct xt_match *match,
- void *matchinfo,
- unsigned int hook_mask)
+static bool sctp_mt_check(const struct xt_mtchk_param *par)
{
{
- const struct xt_sctp_info *info = matchinfo;
+ const struct xt_sctp_info *info =
par->
matchinfo;
return !(info->flags & ~XT_SCTP_VALID_FLAGS)
&& !(info->invflags & ~XT_SCTP_VALID_FLAGS)
return !(info->flags & ~XT_SCTP_VALID_FLAGS)
&& !(info->invflags & ~XT_SCTP_VALID_FLAGS)
@@
-177,36
+161,36
@@
checkentry(const char *tablename,
| SCTP_CHUNK_MATCH_ONLY)));
}
| SCTP_CHUNK_MATCH_ONLY)));
}
-static struct xt_match
xt_sctp_match[]
= {
+static struct xt_match
sctp_mt_reg[] __read_mostly
= {
{
.name = "sctp",
{
.name = "sctp",
- .family =
AF_INET
,
- .checkentry =
checkentry
,
- .match =
match
,
+ .family =
NFPROTO_IPV4
,
+ .checkentry =
sctp_mt_check
,
+ .match =
sctp_mt
,
.matchsize = sizeof(struct xt_sctp_info),
.proto = IPPROTO_SCTP,
.me = THIS_MODULE
},
{
.name = "sctp",
.matchsize = sizeof(struct xt_sctp_info),
.proto = IPPROTO_SCTP,
.me = THIS_MODULE
},
{
.name = "sctp",
- .family =
AF_INET
6,
- .checkentry =
checkentry
,
- .match =
match
,
+ .family =
NFPROTO_IPV
6,
+ .checkentry =
sctp_mt_check
,
+ .match =
sctp_mt
,
.matchsize = sizeof(struct xt_sctp_info),
.proto = IPPROTO_SCTP,
.me = THIS_MODULE
},
};
.matchsize = sizeof(struct xt_sctp_info),
.proto = IPPROTO_SCTP,
.me = THIS_MODULE
},
};
-static int __init
xt_sctp
_init(void)
+static int __init
sctp_mt
_init(void)
{
{
- return xt_register_matches(
xt_sctp_match, ARRAY_SIZE(xt_sctp_match
));
+ return xt_register_matches(
sctp_mt_reg, ARRAY_SIZE(sctp_mt_reg
));
}
}
-static void __exit
xt_sctp_fini
(void)
+static void __exit
sctp_mt_exit
(void)
{
{
- xt_unregister_matches(
xt_sctp_match, ARRAY_SIZE(xt_sctp_match
));
+ xt_unregister_matches(
sctp_mt_reg, ARRAY_SIZE(sctp_mt_reg
));
}
}
-module_init(
xt_sctp
_init);
-module_exit(
xt_sctp_fini
);
+module_init(
sctp_mt
_init);
+module_exit(
sctp_mt_exit
);