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
[MTD] RBTX4939: add MTD support
[safe/jmp/linux-2.6]
/
net
/
ipv4
/
netfilter
/
nf_nat_ftp.c
diff --git
a/net/ipv4/netfilter/nf_nat_ftp.c
b/net/ipv4/netfilter/nf_nat_ftp.c
index
3663bd8
..
a1d5d58
100644
(file)
--- a/
net/ipv4/netfilter/nf_nat_ftp.c
+++ b/
net/ipv4/netfilter/nf_nat_ftp.c
@@
-28,7
+28,7
@@
MODULE_ALIAS("ip_nat_ftp");
/* FIXME: Time out? --RR */
static int
/* FIXME: Time out? --RR */
static int
-mangle_rfc959_packet(struct sk_buff *
*p
skb,
+mangle_rfc959_packet(struct sk_buff *skb,
__be32 newip,
u_int16_t port,
unsigned int matchoff,
__be32 newip,
u_int16_t port,
unsigned int matchoff,
@@
-43,13
+43,13
@@
mangle_rfc959_packet(struct sk_buff **pskb,
pr_debug("calling nf_nat_mangle_tcp_packet\n");
pr_debug("calling nf_nat_mangle_tcp_packet\n");
- return nf_nat_mangle_tcp_packet(
p
skb, ct, ctinfo, matchoff,
+ return nf_nat_mangle_tcp_packet(skb, ct, ctinfo, matchoff,
matchlen, buffer, strlen(buffer));
}
/* |1|132.235.1.2|6275| */
static int
matchlen, buffer, strlen(buffer));
}
/* |1|132.235.1.2|6275| */
static int
-mangle_eprt_packet(struct sk_buff *
*p
skb,
+mangle_eprt_packet(struct sk_buff *skb,
__be32 newip,
u_int16_t port,
unsigned int matchoff,
__be32 newip,
u_int16_t port,
unsigned int matchoff,
@@
-63,13
+63,13
@@
mangle_eprt_packet(struct sk_buff **pskb,
pr_debug("calling nf_nat_mangle_tcp_packet\n");
pr_debug("calling nf_nat_mangle_tcp_packet\n");
- return nf_nat_mangle_tcp_packet(
p
skb, ct, ctinfo, matchoff,
+ return nf_nat_mangle_tcp_packet(skb, ct, ctinfo, matchoff,
matchlen, buffer, strlen(buffer));
}
/* |1|132.235.1.2|6275| */
static int
matchlen, buffer, strlen(buffer));
}
/* |1|132.235.1.2|6275| */
static int
-mangle_epsv_packet(struct sk_buff *
*p
skb,
+mangle_epsv_packet(struct sk_buff *skb,
__be32 newip,
u_int16_t port,
unsigned int matchoff,
__be32 newip,
u_int16_t port,
unsigned int matchoff,
@@
-83,11
+83,11
@@
mangle_epsv_packet(struct sk_buff **pskb,
pr_debug("calling nf_nat_mangle_tcp_packet\n");
pr_debug("calling nf_nat_mangle_tcp_packet\n");
- return nf_nat_mangle_tcp_packet(
p
skb, ct, ctinfo, matchoff,
+ return nf_nat_mangle_tcp_packet(skb, ct, ctinfo, matchoff,
matchlen, buffer, strlen(buffer));
}
matchlen, buffer, strlen(buffer));
}
-static int (*mangle[])(struct sk_buff *
*
, __be32, u_int16_t,
+static int (*mangle[])(struct sk_buff *, __be32, u_int16_t,
unsigned int, unsigned int, struct nf_conn *,
enum ip_conntrack_info)
= {
unsigned int, unsigned int, struct nf_conn *,
enum ip_conntrack_info)
= {
@@
-99,7
+99,7
@@
static int (*mangle[])(struct sk_buff **, __be32, u_int16_t,
/* So, this packet has hit the connection tracking matching code.
Mangle it, and change the expectation to match the new version. */
/* So, this packet has hit the connection tracking matching code.
Mangle it, and change the expectation to match the new version. */
-static unsigned int nf_nat_ftp(struct sk_buff *
*p
skb,
+static unsigned int nf_nat_ftp(struct sk_buff *skb,
enum ip_conntrack_info ctinfo,
enum nf_ct_ftp_type type,
unsigned int matchoff,
enum ip_conntrack_info ctinfo,
enum nf_ct_ftp_type type,
unsigned int matchoff,
@@
-132,7
+132,7
@@
static unsigned int nf_nat_ftp(struct sk_buff **pskb,
if (port == 0)
return NF_DROP;
if (port == 0)
return NF_DROP;
- if (!mangle[type](
p
skb, newip, port, matchoff, matchlen, ct, ctinfo)) {
+ if (!mangle[type](skb, newip, port, matchoff, matchlen, ct, ctinfo)) {
nf_ct_unexpect_related(exp);
return NF_DROP;
}
nf_ct_unexpect_related(exp);
return NF_DROP;
}
@@
-147,7
+147,7
@@
static void __exit nf_nat_ftp_fini(void)
static int __init nf_nat_ftp_init(void)
{
static int __init nf_nat_ftp_init(void)
{
- BUG_ON(
rcu_dereference(nf_nat_ftp_hook)
);
+ BUG_ON(
nf_nat_ftp_hook != NULL
);
rcu_assign_pointer(nf_nat_ftp_hook, nf_nat_ftp);
return 0;
}
rcu_assign_pointer(nf_nat_ftp_hook, nf_nat_ftp);
return 0;
}