aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipvs/ip_vs_ftp.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-09-28 17:29:52 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 21:03:04 -0400
commit014d730d56b559eacb11e91969a1f41c3feb36f9 (patch)
treed8c3a08108f435879b4d436c7b3c4a726d31c6af /net/ipv4/ipvs/ip_vs_ftp.c
parentd4263cde88d3fee2af0aac8836bb785cdb6b06c0 (diff)
[IPVS]: ipvs annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_ftp.c')
-rw-r--r--net/ipv4/ipvs/ip_vs_ftp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/ipvs/ip_vs_ftp.c b/net/ipv4/ipvs/ip_vs_ftp.c
index 62505d8f9ff6..b3bbb4a07ae0 100644
--- a/net/ipv4/ipvs/ip_vs_ftp.c
+++ b/net/ipv4/ipvs/ip_vs_ftp.c
@@ -74,7 +74,7 @@ ip_vs_ftp_done_conn(struct ip_vs_app *app, struct ip_vs_conn *cp)
74 */ 74 */
75static int ip_vs_ftp_get_addrport(char *data, char *data_limit, 75static int ip_vs_ftp_get_addrport(char *data, char *data_limit,
76 const char *pattern, size_t plen, char term, 76 const char *pattern, size_t plen, char term,
77 __u32 *addr, __u16 *port, 77 __be32 *addr, __be16 *port,
78 char **start, char **end) 78 char **start, char **end)
79{ 79{
80 unsigned char p[6]; 80 unsigned char p[6];
@@ -140,8 +140,8 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
140 struct tcphdr *th; 140 struct tcphdr *th;
141 char *data, *data_limit; 141 char *data, *data_limit;
142 char *start, *end; 142 char *start, *end;
143 __u32 from; 143 __be32 from;
144 __u16 port; 144 __be16 port;
145 struct ip_vs_conn *n_cp; 145 struct ip_vs_conn *n_cp;
146 char buf[24]; /* xxx.xxx.xxx.xxx,ppp,ppp\000 */ 146 char buf[24]; /* xxx.xxx.xxx.xxx,ppp,ppp\000 */
147 unsigned buf_len; 147 unsigned buf_len;
@@ -199,7 +199,7 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
199 from = n_cp->vaddr; 199 from = n_cp->vaddr;
200 port = n_cp->vport; 200 port = n_cp->vport;
201 sprintf(buf,"%d,%d,%d,%d,%d,%d", NIPQUAD(from), 201 sprintf(buf,"%d,%d,%d,%d,%d,%d", NIPQUAD(from),
202 port&255, (port>>8)&255); 202 ntohs(port)&255, (ntohs(port)>>8)&255);
203 buf_len = strlen(buf); 203 buf_len = strlen(buf);
204 204
205 /* 205 /*
@@ -243,8 +243,8 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
243 struct tcphdr *th; 243 struct tcphdr *th;
244 char *data, *data_start, *data_limit; 244 char *data, *data_start, *data_limit;
245 char *start, *end; 245 char *start, *end;
246 __u32 to; 246 __be32 to;
247 __u16 port; 247 __be16 port;
248 struct ip_vs_conn *n_cp; 248 struct ip_vs_conn *n_cp;
249 249
250 /* no diff required for incoming packets */ 250 /* no diff required for incoming packets */