Tue Oct 24 13:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 27 insertions, 6 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 795528612e5..d973df59b06 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,13 @@
+Tue Oct 24 13:54:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+	* ace/os_include/netinet/os_in.h:
+	* ace/config-rtems.h:
+	  Added ACE_LACKS_IP_MREQ
+
+	* ace/INET_Addr.cpp (get_port_number_from_name):
+	  Added ACE_LACKS_HTONS check
+
+
 Tue Oct 24 13:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 	* ace/Reactor.h:
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index b8c0da25092..b2edf6697fb 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -357,6 +357,7 @@ static int get_port_number_from_name (const char port_name[],
 {
   int port_number = 0;
 
+#if !defined (ACE_LACKS_HTONS)
   // Maybe port_name is directly a port number?
   char *endp = 0;
   port_number = static_cast<int> (ACE_OS::strtol (port_name, &endp, 10));
@@ -370,6 +371,7 @@ static int get_port_number_from_name (const char port_name[],
       n = htons (n);
       return n;
     }
+#endif
 
   // We try to resolve port number from its name.
 
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index a911ec63bcd..775f855e0d9 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -65,7 +65,7 @@ namespace
 
   // Does this box have ipv6 turned on?
   int ace_ipv6_enabled = -1;
-  
+
 }
 #endif /* ACE_HAS_IPV6 */
 
@@ -583,7 +583,7 @@ ACE::get_fqdn (ACE_INET_Addr const & addr,
    if (ACE::debug())
      ACE_DEBUG ((LM_DEBUG,
                  ACE_TEXT ("(%P|%t) - ACE::get_fqdn, ")
-                 ACE_TEXT ("canonical host name is %s\n"),  
+                 ACE_TEXT ("canonical host name is %s\n"),
                  ACE_TEXT_CHAR_TO_TCHAR (hp->h_name)));
 
    // check if the canonical name is the FQDN
@@ -594,9 +594,9 @@ ACE::get_fqdn (ACE_INET_Addr const & addr,
        // list of aliases
        char** q;
 
-       // for every address and for every alias within the address, check and 
+       // for every address and for every alias within the address, check and
        // see if we can locate a FQDN
-       for (p = hp->h_addr_list; *p != 0; ++p) 
+       for (p = hp->h_addr_list; *p != 0; ++p)
          {
            for (q = hp->h_aliases; *q != 0; ++q)
              {
@@ -604,7 +604,7 @@ ACE::get_fqdn (ACE_INET_Addr const & addr,
                  {
                    // we got an FQDN from an alias. use this
                    if (ACE_OS::strlen (*q) >= len)
-                     // the hostname is too huge to fit into a 
+                     // the hostname is too huge to fit into a
                      // buffer of size MAXHOSTNAMELEN
                      // should we check other aliases as well
                      // before bailing out prematurely?
@@ -616,7 +616,7 @@ ACE::get_fqdn (ACE_INET_Addr const & addr,
                    if (ACE::debug ())
                      ACE_DEBUG ((LM_DEBUG,
                                  ACE_TEXT ("(%P|%t) - ACE::get_fqdn, ")
-                                 ACE_TEXT ("found fqdn within alias as %s\n"),  
+                                 ACE_TEXT ("found fqdn within alias as %s\n"),
                                  ACE_TEXT_CHAR_TO_TCHAR(*q)));
                    ACE_OS::strcpy (hostname, *q);
 
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index d50b415cc42..e5fbece7fc9 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -163,6 +163,7 @@
 # define ACE_LACKS_SOCKADDR_IN
 # define ACE_LACKS_HOSTENT
 # define ACE_LACKS_SOCKADDR
+# define ACE_LACKS_IP_MREQ
 
 // Missing methods
 # define ACE_LACKS_GETHOSTBYADDR
diff --git a/ACE/ace/os_include/netinet/os_in.h b/ACE/ace/os_include/netinet/os_in.h
index 7dc0d39d143..12ce491d0f3 100644
--- a/ACE/ace/os_include/netinet/os_in.h
+++ b/ACE/ace/os_include/netinet/os_in.h
@@ -85,6 +85,14 @@ extern "C"
   };
 # endif /* ACE_LACKS_SOCKADDR_IN */
 
+# if defined (ACE_LACKS_IP_MREQ)
+  struct ip_mreq
+  {
+    struct  in_addr imr_multiaddr;  /* IP multicast address of group */
+    struct  in_addr imr_interface;  /* local IP address of interface */
+  };
+# endif /* ACE_LACKS_IP_MREQ */
+
 #if !defined (IPPORT_RESERVED)
 #  define IPPORT_RESERVED       1024
 #endif /* !IPPORT_RESERVED */