diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2002-03-15 17:42:05 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2002-03-15 17:42:05 +0000 |
| commit | 01fdd1e882fbe1ecf6bfc08313ccfa93dd383590 (patch) | |
| tree | fef1a3547f37a2234b47ffdded339e5afb7f40d5 /strings | |
| parent | 0c497fa4e08dba99ff5b2d278fa53ea9c3f0cd65 (diff) | |
| download | libapr-01fdd1e882fbe1ecf6bfc08313ccfa93dd383590.tar.gz | |
clean up the use of apr_sockaddr_t (stay out of family-specific
struct sockaddr* as much as possible)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63137 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/apr_snprintf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/strings/apr_snprintf.c b/strings/apr_snprintf.c index 888d13054..d9ceb3454 100644 --- a/strings/apr_snprintf.c +++ b/strings/apr_snprintf.c @@ -501,13 +501,12 @@ static char *conv_apr_sockaddr(apr_sockaddr_t *sa, char *buf_end, int *len) int sub_len; char *ipaddr_str; - /* XXX IPv6: this assumes sin_port and sin6_port are at same offset */ - p = conv_10(ntohs(sa->sa.sin.sin_port), TRUE, &is_negative, p, &sub_len); + p = conv_10(sa->port, TRUE, &is_negative, p, &sub_len); *--p = ':'; apr_sockaddr_ip_get(&ipaddr_str, sa); sub_len = strlen(ipaddr_str); #if APR_HAVE_IPV6 - if (sa->sa.sin.sin_family == APR_INET6 && + if (sa->family == APR_INET6 && !IN6_IS_ADDR_V4MAPPED(&sa->sa.sin6.sin6_addr)) { *(p - 1) = ']'; p -= sub_len + 2; |