Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1da05f50 authored by Joe Perches's avatar Joe Perches Committed by Patrick McHardy
Browse files

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: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 7b4df055

net/netfilter/ipvs/ip_vs_ftp.c

+8 −2
Original line number Diff line number Diff line
@@ -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);



		/*