diff options
author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2002-02-22 20:12:27 +0000 |
---|---|---|
committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2002-02-22 20:12:27 +0000 |
commit | db7c4dafa066d9b6efb712d0befc6a1379e324b5 (patch) | |
tree | fa817690d20638e83f100228c272c966f7c82beb | |
parent | 903743c77197b59d91ccd6aa4a0f4660d46e1da6 (diff) | |
download | libapr-db7c4dafa066d9b6efb712d0befc6a1379e324b5.tar.gz |
add a little reminder that in this new code, as in existing
code, we assume that sin_port and sin6_port are at the same
offset
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63058 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | network_io/os2/sockets.c | 2 | ||||
-rw-r--r-- | network_io/unix/sockets.c | 2 | ||||
-rw-r--r-- | network_io/win32/sockets.c | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c index f0e183dba..5a421ab2f 100644 --- a/network_io/os2/sockets.c +++ b/network_io/os2/sockets.c @@ -278,6 +278,7 @@ APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock, memcpy(&(*apr_sock)->local_addr->sa.sin, os_sock_info->local, (*apr_sock)->local_addr->salen); + /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */ (*apr_sock)->local_addr->port = ntohs((*apr_sock)->local_addr->sa.sin.sin_port); } else { @@ -287,6 +288,7 @@ APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock, memcpy(&(*apr_sock)->remote_addr->sa.sin, os_sock_info->remote, (*apr_sock)->remote_addr->salen); + /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */ (*apr_sock)->remote_addr->port = ntohs((*apr_sock)->remote_addr->sa.sin.sin_port); } diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c index 46415f604..ecda7c7a6 100644 --- a/network_io/unix/sockets.c +++ b/network_io/unix/sockets.c @@ -358,6 +358,7 @@ apr_status_t apr_os_sock_make(apr_socket_t **apr_sock, memcpy(&(*apr_sock)->local_addr->sa.sin, os_sock_info->local, (*apr_sock)->local_addr->salen); + /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */ (*apr_sock)->local_addr->port = ntohs((*apr_sock)->local_addr->sa.sin.sin_port); } else { @@ -370,6 +371,7 @@ apr_status_t apr_os_sock_make(apr_socket_t **apr_sock, memcpy(&(*apr_sock)->remote_addr->sa.sin, os_sock_info->remote, (*apr_sock)->remote_addr->salen); + /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */ (*apr_sock)->remote_addr->port = ntohs((*apr_sock)->remote_addr->sa.sin.sin_port); } diff --git a/network_io/win32/sockets.c b/network_io/win32/sockets.c index 63c238402..45eb6aaac 100644 --- a/network_io/win32/sockets.c +++ b/network_io/win32/sockets.c @@ -390,6 +390,7 @@ APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock, os_sock_info->local, (*apr_sock)->local_addr->salen); (*apr_sock)->local_addr->pool = cont; + /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */ (*apr_sock)->local_addr->port = ntohs((*apr_sock)->local_addr->sa.sin.sin_port); } else { @@ -400,6 +401,7 @@ APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock, os_sock_info->remote, (*apr_sock)->remote_addr->salen); (*apr_sock)->remote_addr->pool = cont; + /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */ (*apr_sock)->remote_addr->port = ntohs((*apr_sock)->remote_addr->sa.sin.sin_port); } @@ -432,4 +434,4 @@ APR_DECLARE_SET_INHERIT(socket) { APR_DECLARE_UNSET_INHERIT(socket) { return; -}
\ No newline at end of file +} |