Major changes. We now use ACE_ADDRESS_FAMILY_INET and ACE_PROTOCOL_FAMILY_INET which are defined in OS.h as the address and protocol families. This eliminates the #ifdef code that used to be in the SOCK_Dgram, SOCK_Connector, and SOCK_Acceptor code.

7 files changed, 36 insertions, 56 deletions

diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index e3d6aa9400d..4174344cf95 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -84,7 +84,7 @@ ACE_INET_Addr::operator == (const ACE_INET_Addr &sap) const
 }
 
 ACE_INET_Addr::ACE_INET_Addr (void)
-  : ACE_Addr (ACE_ADDRESS_FAMILY, sizeof this->inet_addr_)
+  : ACE_Addr (ACE_ADDRESS_FAMILY_INET, sizeof this->inet_addr_)
 {
   // ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->initialize();
@@ -164,7 +164,7 @@ ACE_INET_Addr::set (const char address[])
 }
 
 ACE_INET_Addr::ACE_INET_Addr (const char address[])
-  : ACE_Addr (ACE_ADDRESS_FAMILY, sizeof this->inet_addr_)
+  : ACE_Addr (ACE_ADDRESS_FAMILY_INET, sizeof this->inet_addr_)
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->set (address);
@@ -172,7 +172,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char address[])
 
 #if defined (ACE_HAS_WCHAR)
 ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[])
-  : ACE_Addr (ACE_ADDRESS_FAMILY, sizeof this->inet_addr_)
+  : ACE_Addr (ACE_ADDRESS_FAMILY_INET, sizeof this->inet_addr_)
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->set (address);
@@ -183,7 +183,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[])
 // Copy constructor.
 
 ACE_INET_Addr::ACE_INET_Addr (const ACE_INET_Addr &sa)
-  : ACE_Addr (ACE_ADDRESS_FAMILY, sizeof this->inet_addr_)
+  : ACE_Addr (ACE_ADDRESS_FAMILY_INET, sizeof this->inet_addr_)
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->set (sa);
@@ -218,12 +218,14 @@ ACE_INET_Addr::set (u_short port_number,
                     int encode)
 {
   ACE_TRACE ("ACE_INET_Addr::set");
-  ACE_UINT32 addrv4;
+
 #if defined (ACE_HAS_IPV6)
-  in6_addr addrv6;
-#endif
+  return this->set_usinggetaddrinfo (port_number,host_name,PF_UNSPEC,encode);
+#else
 
-  this->ACE_Addr::base_set (ACE_ADDRESS_FAMILY, sizeof this->inet_addr_);
+  ACE_UINT32 addrv4;
+
+  this->ACE_Addr::base_set (ACE_ADDRESS_FAMILY_INET, sizeof this->inet_addr_);
   this->initialize();
 
   // Yow, someone gave us a NULL host_name!
@@ -232,32 +234,11 @@ ACE_INET_Addr::set (u_short port_number,
       errno = EINVAL;
       return -1;
     }
-#if defined (ACE_HAS_IPV6)
-  else if (ACE_OS::inet_pton (AF_INET6,
-                              host_name,
-                              (void*)&addrv6) == 1) {
-    this->set_address((char*)&addrv6,
-                      sizeof addrv6,
-                      0);
-    this->set_port_number(port_number,
-                          encode);
-
-    return 0;
-  }
-  else if (ACE_OS::inet_pton (AF_INET,
-                              host_name,
-                              (void*)&addrv4) == 1)
-    {
-      return this->set (port_number,
-                        addrv4,0);
-    }
-#else
   else if (ACE_OS::inet_aton (host_name,
                               (struct in_addr *) &addrv4) == 1)
     return this->set (port_number,
                       encode ? ntohl (addrv4) : addrv4,
                       encode);
-#endif /* ACE_HAS_IPV6 */
   else
     {
 #if defined (VXWORKS) || defined (CHORUS)
@@ -286,8 +267,10 @@ ACE_INET_Addr::set (u_short port_number,
                             encode);
         }
     }
+#endif /* Top ACE_HAS_IPV6 */
 }
 
+#if defined (ACE_HAS_IPV6)
 // XXXXX this method should change name to something different.
 // Possibly use this as a replacement for the ugly set method
 // currently used for IPv4.
@@ -308,7 +291,6 @@ int ACE_INET_Addr::set_usinggetaddrinfo (u_short port_number,
   }
   int ret = -1;
   for(res = res0; res != 0; res = res->ai_next) {
-    printf("length of address is %d\n",res->ai_addrlen);
     if(res->ai_addrlen == sizeof(sockaddr_in)) {
       sockaddr_in *addr = (sockaddr_in*)res->ai_addr;
       this->set_address((const char*)&addr->sin_addr,sizeof(addr->sin_addr),0);
@@ -329,6 +311,7 @@ int ACE_INET_Addr::set_usinggetaddrinfo (u_short port_number,
   freeaddrinfo(res0);
   return ret;
 }
+#endif
 
 // Initializes a ACE_INET_Addr from a <port_name> and the remote
 // <host_name>.
@@ -443,7 +426,7 @@ int
 ACE_INET_Addr::set (const sockaddr_in *addr, int len)
 {
   ACE_TRACE ("ACE_INET_Addr::set");
-  this->ACE_Addr::base_set (ACE_ADDRESS_FAMILY, len);
+  this->ACE_Addr::base_set (ACE_ADDRESS_FAMILY_INET, len);
 
   this->set_address((char*)&addr->sin_addr,
                     sizeof addr->sin_addr,
@@ -460,7 +443,7 @@ ACE_INET_Addr::set_addr (void *addr, int len)
 {
   ACE_TRACE ("ACE_INET_Addr::set_addr");
 
-  this->ACE_Addr::base_set (ACE_ADDRESS_FAMILY, len);
+  this->ACE_Addr::base_set (ACE_ADDRESS_FAMILY_INET, len);
   ACE_OS::memcpy ((void *) &this->inet_addr_,
                   (void *) addr, len);
 }
@@ -682,11 +665,11 @@ int ACE_INET_Addr::set_address (const char *ip_addr,
 {
   ACE_TRACE ("ACE_INET_Addr::set");
 
-  this->ACE_Addr::base_set (ACE_ADDRESS_FAMILY, sizeof this->inet_addr_);
+  this->ACE_Addr::base_set (ACE_ADDRESS_FAMILY_INET, sizeof this->inet_addr_);
 #if defined (ACE_HAS_IPV6)
-  this->inet_addr_.sin6_family = ACE_ADDRESS_FAMILY;
+  this->inet_addr_.sin6_family = ACE_ADDRESS_FAMILY_INET;
 #else
-  this->inet_addr_.sin_family = ACE_ADDRESS_FAMILY;
+  this->inet_addr_.sin_family = ACE_ADDRESS_FAMILY_INET;
 #endif
 
   if(len == 4)
@@ -822,8 +805,8 @@ void ACE_INET_Addr::initialize(void)
   (void) ACE_OS::memset ((void *) &this->inet_addr_,
                          0, sizeof this->inet_addr_);
 #if defined (ACE_HAS_IPV6)
-  this->inet_addr_.sin6_family = ACE_ADDRESS_FAMILY;
+  this->inet_addr_.sin6_family = ACE_ADDRESS_FAMILY_INET;
 #else
-  this->inet_addr_.sin_family = ACE_ADDRESS_FAMILY;
+  this->inet_addr_.sin_family = ACE_ADDRESS_FAMILY_INET;
 #endif
 }
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index f879a7a2666..b4a63ac90d2 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -27,14 +27,6 @@
 #  include /**/ "inetLib.h"
 #endif /* VXWORKS */
 
-// I don't know if this is a good place to put this, but it's
-// the most logical.
-#if defined (ACE_HAS_IPV6)
-#define ACE_ADDRESS_FAMILY AF_INET6
-#else
-#define ACE_ADDRESS_FAMILY AF_INET
-#endif
-
 /**
  * @class ACE_INET_Addr
  *
diff --git a/ace/OS.h b/ace/OS.h
index 8931617fa9b..d1d38ffb44c 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -4154,6 +4154,14 @@ typedef fd_set ACE_FD_SET_TYPE;
 #   define INET6_ADDRSTRLEN 46
 # endif /* INET6_ADDRSTRLEN */
 
+#if defined (ACE_HAS_IPV6)
+#define ACE_ADDRESS_FAMILY_INET AF_INET6
+#define ACE_PROTOCOL_FAMILY_INET PF_INET6
+#else
+#define ACE_ADDRESS_FAMILY_INET AF_INET
+#define ACE_PROTOCOL_FAMILY_INET PF_INET
+#endif
+
 # if defined (ACE_LACKS_SIGSET)
 #    if defined (ACE_HAS_PACE) && !defined (ACE_WIN32)
 typedef pace_sigset_t sigset_t;
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index 080692c35a8..c728fc2e8c8 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -48,7 +48,7 @@ public:
    */
   ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
                      int reuse_addr = 0,
-                     int protocol_family = PF_INET,
+                     int protocol_family = ACE_PROTOCOL_FAMILY_INET,
                      int backlog = ACE_DEFAULT_BACKLOG,
                      int protocol = 0);
 
@@ -72,7 +72,7 @@ public:
    */
   int open (const ACE_Addr &local_sap,
             int reuse_addr = 0,
-            int protocol_family = PF_INET,
+            int protocol_family = ACE_PROTOCOL_FAMILY_INET,
             int backlog = ACE_DEFAULT_BACKLOG,
             int protocol = 0);
 
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index 2d9b3027c17..4bd82823f3f 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -68,7 +68,7 @@ public:
                       int reuse_addr = 0,
                       int flags = 0,
                       int perms = 0,
-                      int protocol_family = PF_INET,
+                      int protocol_family = ACE_PROTOCOL_FAMILY_INET,
                       int protocol = 0);
 
   /**
@@ -100,7 +100,7 @@ public:
                       u_long flags = 0,
                       int reuse_addr = 0,
                       int perms = 0,
-                      int protocol_family = PF_INET,
+                      int protocol_family = ACE_PROTOCOL_FAMILY_INET,
                       int protocol = 0);
 
   /**
@@ -128,7 +128,7 @@ public:
                int reuse_addr = 0,
                int flags = 0,
                int perms = 0,
-               int protocol_family = PF_INET,
+               int protocol_family = ACE_PROTOCOL_FAMILY_INET,
                int protocol = 0);
 
   /**
@@ -158,7 +158,7 @@ public:
                u_long flags = 0,
                int reuse_addr = 0,
                int perms = 0,
-               int protocol_family = PF_INET,
+               int protocol_family = ACE_PROTOCOL_FAMILY_INET,
                int protocol = 0);
 
   /// Default dtor.
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index c9b2288b65c..98aadbe1f41 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -100,12 +100,9 @@ ACE_SOCK_Dgram::shared_open (const ACE_Addr &local,
   ACE_TRACE ("ACE_SOCK_Dgram::shared_open");
   int error = 0;
 
-  printf("in ACE_SOCK_Dgram::shared_open\n");
-
   if (local == ACE_Addr::sap_any
       && protocol_family == PF_INET)
     {
-      printf("trying ACE::bind_port\n");
       if (ACE::bind_port (this->get_handle ()) == -1)
         error = 1;
     }
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index ed696817878..1bb4a5647c2 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -39,7 +39,7 @@ public:
   /// This is a BSD-style method (i.e., no QoS) for initiating a socket
   /// dgram that will accept datagrams at the <local> address.
   ACE_SOCK_Dgram (const ACE_Addr &local,
-                  int protocol_family = PF_INET,
+                  int protocol_family = ACE_PROTOCOL_FAMILY_INET,
                   int protocol = 0,
                   int reuse_addr = 0);
 
@@ -59,7 +59,7 @@ public:
   /// This is a BSD-style method (i.e., no QoS) for initiating a socket
   /// dgram that will accept datagrams at the <local> address.
   int open (const ACE_Addr &local,
-            int protocol_family = PF_INET,
+            int protocol_family = ACE_PROTOCOL_FAMILY_INET,
             int protocol = 0,
             int reuse_addr = 0);