]> git.baikalelectronics.ru Git - kernel.git/commitdiff
netfilter: net/netfilter/ipvs/ip_vs_ftp.c: Remove use of NIPQUAD
authorJoe Perches <joe@perches.com>
Mon, 15 Mar 2010 17:03:05 +0000 (18:03 +0100)
committerPatrick McHardy <kaber@trash.net>
Mon, 15 Mar 2010 17:03:05 +0000 (18:03 +0100)
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>
net/netfilter/ipvs/ip_vs_ftp.c

index 73f38ea98f254734aa9da2931d4d93713f45fd38..9f6328303844fd3399ef9de65d7228931414da45 100644 (file)
@@ -208,8 +208,14 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
                 */
                from.ip = n_cp->vaddr.ip;
                port = n_cp->vport;
-               sprintf(buf, "%u,%u,%u,%u,%u,%u", NIPQUAD(from.ip),
-                       (ntohs(port)>>8)&255, ntohs(port)&255);
+               snprintf(buf, sizeof(buf), "%u,%u,%u,%u,%u,%u",
+                        ((unsigned char *)&from.ip)[0],
+                        ((unsigned char *)&from.ip)[1],
+                        ((unsigned char *)&from.ip)[2],
+                        ((unsigned char *)&from.ip)[3],
+                        ntohs(port) >> 8,
+                        ntohs(port) & 0xFF);
+
                buf_len = strlen(buf);
 
                /*