diff options
author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-11-16 01:51:36 +0000 |
---|---|---|
committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-11-16 01:51:36 +0000 |
commit | d9ad3b349120f6878f078161e8080d1ca92ff5c7 (patch) | |
tree | 069da2925ff9bfa0f6170731273b2e5afb442921 /include/arch | |
parent | 16daafd3201070bda2856b797a99e192f9550ba2 (diff) | |
download | libapr-d9ad3b349120f6878f078161e8080d1ca92ff5c7.tar.gz |
This is a small step toward's David Reid's IPv6 patch. I started
with the part of David's patch which uses apr_sockaddr_t instead of
sockaddr_in inside apr_socket_t, got everything to compile (and seem
to run properly on Unix), and simplified some of the code which
allocates storage for apr_socket_t and fills out fields in
apr_sockaddr_t.
I didn't add all the code from the patch that supports IPv6
throughout. I didn't add any of the API enhancements.
This includes a port of the code to Win32. I'll later commit the
required changes for OS/2.
Submitted by: David Reid
Reviewed by: Jeff Trawick
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60737 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/arch')
-rw-r--r-- | include/arch/unix/networkio.h | 5 | ||||
-rw-r--r-- | include/arch/win32/networkio.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/arch/unix/networkio.h b/include/arch/unix/networkio.h index 3fdc52e2a..45a768e64 100644 --- a/include/arch/unix/networkio.h +++ b/include/arch/unix/networkio.h @@ -122,9 +122,8 @@ struct apr_socket_t { apr_pool_t *cntxt; int socketdes; - struct sockaddr_in *local_addr; - struct sockaddr_in *remote_addr; - apr_socklen_t addr_len; + apr_sockaddr_t *local_addr; + apr_sockaddr_t *remote_addr; apr_interval_time_t timeout; #ifndef HAVE_POLL int connected; diff --git a/include/arch/win32/networkio.h b/include/arch/win32/networkio.h index 3d5897a62..e7657d126 100644 --- a/include/arch/win32/networkio.h +++ b/include/arch/win32/networkio.h @@ -61,9 +61,8 @@ struct apr_socket_t { apr_pool_t *cntxt; SOCKET sock; - struct sockaddr_in *local_addr; - struct sockaddr_in *remote_addr; - size_t addr_len; + apr_sockaddr_t *local_addr; + apr_sockaddr_t *remote_addr; apr_interval_time_t timeout; apr_int32_t disconnected; int local_port_unknown; |