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

1 files changed, 2 insertions, 3 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;