diff options
| author |  Patrick McHardy <kaber@trash.net>
| 2010-03-18 12:55:50 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net>
| 2010-03-18 12:55:50 +0100 |
| commit | e8a96f69383f3d88cdc06d8ccd450f70c48628a3 (patch) | |
| tree | b8ce41ee20eb379731e7592d7b6fb17471918a61 /net/netfilter | |
| parent | netfilter: remove unused headers in net/netfilter/nfnetlink.c (diff) | |
| parent | netfilter: net/netfilter/ipvs/ip_vs_ftp.c: Remove use of NIPQUAD (diff) | |
| download | linux-e8a96f69383f3d88cdc06d8ccd450f70c48628a3.tar.gz linux-e8a96f69383f3d88cdc06d8ccd450f70c48628a3.tar.bz2 linux-e8a96f69383f3d88cdc06d8ccd450f70c48628a3.zip | |
Merge branch 'master' of ../nf-2.6
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | 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 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, */ 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); /* |