aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-03-15 13:03:05 -0400
committerPatrick McHardy <kaber@trash.net>2010-03-15 13:03:05 -0400
commit1da05f50f6a766c7611102382f85183b4db96c2d (patch)
treee0302f2d210a474b70d49c03a877c005a757095d
parent7b4df05537f4e6c0c3524055ece7f99b5c98cc87 (diff)
netfilter: net/netfilter/ipvs/ip_vs_ftp.c: Remove use of NIPQUAD
NIPQUAD has very few uses left. Remove this use and make the code have the identical form of the only other use of "%u,%u,%u,%u,%u,%u" in net/ipv4/netfilter/nf_nat_ftp.c Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Simon Horman <horms@verge.net.au> Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r--net/netfilter/ipvs/ip_vs_ftp.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index 73f38ea98f25..9f6328303844 100644
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -208,8 +208,14 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
208 */ 208 */
209 from.ip = n_cp->vaddr.ip; 209 from.ip = n_cp->vaddr.ip;
210 port = n_cp->vport; 210 port = n_cp->vport;
211 sprintf(buf, "%u,%u,%u,%u,%u,%u", NIPQUAD(from.ip), 211 snprintf(buf, sizeof(buf), "%u,%u,%u,%u,%u,%u",
212 (ntohs(port)>>8)&255, ntohs(port)&255); 212 ((unsigned char *)&from.ip)[0],
213 ((unsigned char *)&from.ip)[1],
214 ((unsigned char *)&from.ip)[2],
215 ((unsigned char *)&from.ip)[3],
216 ntohs(port) >> 8,
217 ntohs(port) & 0xFF);
218
213 buf_len = strlen(buf); 219 buf_len = strlen(buf);
214 220
215 /* 221 /*