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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_conntrack_tftp.c
diff --git
a/net/ipv4/netfilter/ip_conntrack_tftp.c
b/net/ipv4/netfilter/ip_conntrack_tftp.c
index
992fac3
..
7e33d3b
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_tftp.c
+++ b/
net/ipv4/netfilter/ip_conntrack_tftp.c
@@
-26,9
+26,9
@@
MODULE_DESCRIPTION("tftp connection tracking helper");
MODULE_LICENSE("GPL");
#define MAX_PORTS 8
MODULE_LICENSE("GPL");
#define MAX_PORTS 8
-static
in
t ports[MAX_PORTS];
+static
unsigned shor
t ports[MAX_PORTS];
static int ports_c;
static int ports_c;
-module_param_array(ports,
in
t, &ports_c, 0400);
+module_param_array(ports,
ushor
t, &ports_c, 0400);
MODULE_PARM_DESC(ports, "port numbers of tftp servers");
#if 0
MODULE_PARM_DESC(ports, "port numbers of tftp servers");
#if 0
@@
-65,27
+65,27
@@
static int tftp_help(struct sk_buff **pskb,
DUMP_TUPLE(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
DUMP_TUPLE(&ct->tuplehash[IP_CT_DIR_REPLY].tuple);
DUMP_TUPLE(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
DUMP_TUPLE(&ct->tuplehash[IP_CT_DIR_REPLY].tuple);
- exp = ip_conntrack_expect_alloc();
+ exp = ip_conntrack_expect_alloc(
ct
);
if (exp == NULL)
return NF_DROP;
exp->tuple = ct->tuplehash[IP_CT_DIR_REPLY].tuple;
exp->mask.src.ip = 0xffffffff;
if (exp == NULL)
return NF_DROP;
exp->tuple = ct->tuplehash[IP_CT_DIR_REPLY].tuple;
exp->mask.src.ip = 0xffffffff;
+ exp->mask.src.u.udp.port = 0;
exp->mask.dst.ip = 0xffffffff;
exp->mask.dst.u.udp.port = 0xffff;
exp->mask.dst.protonum = 0xff;
exp->expectfn = NULL;
exp->mask.dst.ip = 0xffffffff;
exp->mask.dst.u.udp.port = 0xffff;
exp->mask.dst.protonum = 0xff;
exp->expectfn = NULL;
- exp->
master = ct
;
+ exp->
flags = 0
;
DEBUGP("expect: ");
DUMP_TUPLE(&exp->tuple);
DUMP_TUPLE(&exp->mask);
if (ip_nat_tftp_hook)
ret = ip_nat_tftp_hook(pskb, ctinfo, exp);
DEBUGP("expect: ");
DUMP_TUPLE(&exp->tuple);
DUMP_TUPLE(&exp->mask);
if (ip_nat_tftp_hook)
ret = ip_nat_tftp_hook(pskb, ctinfo, exp);
- else if (ip_conntrack_expect_related(exp) != 0) {
- ip_conntrack_expect_free(exp);
+ else if (ip_conntrack_expect_related(exp) != 0)
ret = NF_DROP;
ret = NF_DROP;
- }
+ ip_conntrack_expect_put(exp);
break;
case TFTP_OPCODE_DATA:
case TFTP_OPCODE_ACK:
break;
case TFTP_OPCODE_DATA:
case TFTP_OPCODE_ACK:
@@
-101,9
+101,9
@@
static int tftp_help(struct sk_buff **pskb,
}
static struct ip_conntrack_helper tftp[MAX_PORTS];
}
static struct ip_conntrack_helper tftp[MAX_PORTS];
-static char tftp_names[MAX_PORTS][
10
];
+static char tftp_names[MAX_PORTS][
sizeof("tftp-65535")
];
-static void fini(void)
+static void
ip_conntrack_tftp_
fini(void)
{
int i;
{
int i;
@@
-114,7
+114,7
@@
static void fini(void)
}
}
}
}
-static int __init init(void)
+static int __init i
p_conntrack_tftp_i
nit(void)
{
int i, ret;
char *tmpname;
{
int i, ret;
char *tmpname;
@@
-148,12
+148,12
@@
static int __init init(void)
if (ret) {
printk("ERROR registering helper for port %d\n",
ports[i]);
if (ret) {
printk("ERROR registering helper for port %d\n",
ports[i]);
- fini();
+
ip_conntrack_tftp_
fini();
return(ret);
}
}
return(0);
}
return(ret);
}
}
return(0);
}
-module_init(init);
-module_exit(fini);
+module_init(i
p_conntrack_tftp_i
nit);
+module_exit(
ip_conntrack_tftp_
fini);