On Mon, Mar 08, 2010 at 04:31:39PM -0800, Joe Perches wrote: > 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@xxxxxxxxxxx> Acked-by: Simon Horman <horms@xxxxxxxxxxxx> > --- > net/netfilter/ipvs/ip_vs_ftp.c | 10 ++++++++-- > 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 73f38ea..9f63283 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, > */ > 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); > > /* > > > -- > To unsubscribe from this list: send the line "unsubscribe lvs-devel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe lvs-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
