ChangeLogTag:Mon Jan 7 15:55:26 2002 Ossama Othman <ossama@uci.edu>

4 files changed, 45 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index b083b6aa647..01dd8db6de8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
+Mon Jan  7 15:55:26 2002  Ossama Othman  <ossama@uci.edu>
+
+	* ace/INET_Addr.cpp (set):
+
+	  Pass a pointer to a "struct in_addr" to inet_aton(), i.e. the
+	  proper type, instead of a forcibly casted ACE_UINT32.  Also
+	  updated existing code to use the in_addr::s_addr member instead
+	  of the previous ACE_UINT32 variable.
+
 Mon Jan  7 15:13:09 2002  Mayur Deshpande  <mayur@ics.uci.edu>
+
 	* performance-tests/Misc/context_switch_time.cpp (main):
 	  Since the Yield_test does seem to work on VxWorks now (see 
 	  ChangeLog below), the 'ifdefs' for bypassing VxWorks for the
@@ -10,8 +20,8 @@ Mon Jan  7 15:08:25 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 	  Changed ::taskDelay (1) to ::taskDelay (0) for VxWorks in 
 	  thr_yield ().  The change with (0), now does seem to perform
 	  the yield correctly as reflected in the Yield-Test of 
-	  context_switch_time.  Thanks to Charlie Grames <charlie.grames@windriver.com>
-	  for this tip.
+	  context_switch_time.  Thanks to Charlie Grames
+	  <charlie.grames@windriver.com> for this tip.
 
 Mon Jan  7 15:16:10 2002  Ossama Othman  <ossama@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index b083b6aa647..01dd8db6de8 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,4 +1,14 @@
+Mon Jan  7 15:55:26 2002  Ossama Othman  <ossama@uci.edu>
+
+	* ace/INET_Addr.cpp (set):
+
+	  Pass a pointer to a "struct in_addr" to inet_aton(), i.e. the
+	  proper type, instead of a forcibly casted ACE_UINT32.  Also
+	  updated existing code to use the in_addr::s_addr member instead
+	  of the previous ACE_UINT32 variable.
+
 Mon Jan  7 15:13:09 2002  Mayur Deshpande  <mayur@ics.uci.edu>
+
 	* performance-tests/Misc/context_switch_time.cpp (main):
 	  Since the Yield_test does seem to work on VxWorks now (see 
 	  ChangeLog below), the 'ifdefs' for bypassing VxWorks for the
@@ -10,8 +20,8 @@ Mon Jan  7 15:08:25 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 	  Changed ::taskDelay (1) to ::taskDelay (0) for VxWorks in 
 	  thr_yield ().  The change with (0), now does seem to perform
 	  the yield correctly as reflected in the Yield-Test of 
-	  context_switch_time.  Thanks to Charlie Grames <charlie.grames@windriver.com>
-	  for this tip.
+	  context_switch_time.  Thanks to Charlie Grames
+	  <charlie.grames@windriver.com> for this tip.
 
 Mon Jan  7 15:16:10 2002  Ossama Othman  <ossama@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b083b6aa647..01dd8db6de8 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,4 +1,14 @@
+Mon Jan  7 15:55:26 2002  Ossama Othman  <ossama@uci.edu>
+
+	* ace/INET_Addr.cpp (set):
+
+	  Pass a pointer to a "struct in_addr" to inet_aton(), i.e. the
+	  proper type, instead of a forcibly casted ACE_UINT32.  Also
+	  updated existing code to use the in_addr::s_addr member instead
+	  of the previous ACE_UINT32 variable.
+
 Mon Jan  7 15:13:09 2002  Mayur Deshpande  <mayur@ics.uci.edu>
+
 	* performance-tests/Misc/context_switch_time.cpp (main):
 	  Since the Yield_test does seem to work on VxWorks now (see 
 	  ChangeLog below), the 'ifdefs' for bypassing VxWorks for the
@@ -10,8 +20,8 @@ Mon Jan  7 15:08:25 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 	  Changed ::taskDelay (1) to ::taskDelay (0) for VxWorks in 
 	  thr_yield ().  The change with (0), now does seem to perform
 	  the yield correctly as reflected in the Yield-Test of 
-	  context_switch_time.  Thanks to Charlie Grames <charlie.grames@windriver.com>
-	  for this tip.
+	  context_switch_time.  Thanks to Charlie Grames
+	  <charlie.grames@windriver.com> for this tip.
 
 Mon Jan  7 15:16:10 2002  Ossama Othman  <ossama@uci.edu>
 
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index f0c51dfc613..d77067f2465 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -261,14 +261,14 @@ ACE_INET_Addr::set (u_short port_number,
 #else /* ACE_HAS_IPV6 */
 
   // IPv6 not supported... insure the family is set to IPv4
-  address_family = PF_INET;
+  address_family = AF_INET;
   this->set_type (address_family);
   this->inet_addr_.in4_.sin_family = address_family;
-  ACE_UINT32 addrv4;
+  struct in_addr addrv4;
   if (ACE_OS::inet_aton (host_name,
-                         (struct in_addr *) &addrv4) == 1)
+                         &addrv4) == 1)
     return this->set (port_number,
-                      encode ? ntohl (addrv4) : addrv4,
+                      encode ? ntohl (addrv4.s_addr) : addrv4.s_addr,
                       encode);
   else
     {
@@ -290,11 +290,11 @@ ACE_INET_Addr::set (u_short port_number,
         }
       else
         {
-          (void) ACE_OS_String::memcpy ((void *) &addrv4,
+          (void) ACE_OS_String::memcpy ((void *) &addrv4.s_addr,
                                         hp->h_addr,
                                         hp->h_length);
           return this->set (port_number,
-                            encode ? ntohl (addrv4) : addrv4,
+                            encode ? ntohl (addrv4.s_addr) : addrv4.s_addr,
                             encode);
         }
     }
@@ -589,7 +589,7 @@ ACE_INET_Addr::get_host_name (char hostname[],
             {
               //result == -1;
               // This could be worse than hostname[len -1] = '\0'?
-              hostname[0] = '\0';   
+              hostname[0] = '\0';
             }
         }
     }
@@ -729,7 +729,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const
         return -1;
 
       if (ACE_OS::strlen (hp->h_name) >= len)
-        {        
+        {
           // We know the length, so use memcpy
           if (len > 0)
             {
@@ -738,7 +738,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const
             }
           errno = ENOSPC;
           return -2;  // -2 Means that we have a good string
-          // Using errno looks ok, but ENOSPC could be set on 
+          // Using errno looks ok, but ENOSPC could be set on
           // other places.
         }