BIG glitch.

[wxWidgets.git] / src / common / sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 55a9521b6e73bf38e641df65a4493e70c5bbaae1..234a87005bc295be7ee71f552983ce58131cc556 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -13,24 +13,43 @@
 #pragma implementation "sckaddr.h"
 #endif
 
 #pragma implementation "sckaddr.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#if wxUSE_SOCKETS
+
+#ifndef WX_PRECOMP
+#endif
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>

+
+#if !defined(__MWERKS__) && !defined(__SALFORDC__)

 #include <memory.h>
 #include <memory.h>

+#endif

 
 #include "wx/defs.h"
 #include "wx/object.h"
 
 
 #include "wx/defs.h"
 #include "wx/object.h"
 

+#if defined(__WXMAC__)
+#include "/wx/mac/macsock.h"
+#endif
+

 #if defined(__WINDOWS__)
 #include <winsock.h>
 #endif // __WINDOWS__
 
 #if defined(__UNIX__)
 #if defined(__WINDOWS__)
 #include <winsock.h>
 #endif // __WINDOWS__
 
 #if defined(__UNIX__)

-

 #ifdef VMS
 #include <socket.h>
 #include <in.h>
 #else
 #ifdef VMS
 #include <socket.h>
 #include <in.h>
 #else

+#include <sys/types.h>

 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>


@@ -38,14 +57,18 @@
 #include <unistd.h>
 #include <netdb.h>
 
 #include <unistd.h>
 #include <netdb.h>
 

+#ifdef __SUN__
+extern "C"
+{
+   struct hostent *gethostbyname(const char *name); 
+   int gethostname(char *name, int namelen); 
+};
+#endif
+

 #endif // __UNIX__
 
 #include "wx/sckaddr.h"
 
 #endif // __UNIX__
 
 #include "wx/sckaddr.h"
 

-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-

 #define CHECK_ADDRTYPE(var, type)
 
 #if !USE_SHARED_LIBRARY
 #define CHECK_ADDRTYPE(var, type)
 
 #if !USE_SHARED_LIBRARY


@@ -98,25 +121,29 @@ const wxSockAddress& wxIPV4address::operator =(const wxSockAddress& addr)
 
 bool wxIPV4address::Hostname(const wxString& name)
 {
 
 bool wxIPV4address::Hostname(const wxString& name)
 {

-  struct hostent *hostent;
+  struct hostent *theHostent;

   struct in_addr *addr;
   
   if (name.IsNull())
     return FALSE;
   
   if (!name.IsNumber()) {
   struct in_addr *addr;
   
   if (name.IsNull())
     return FALSE;
   
   if (!name.IsNumber()) {

-    if ((hostent = gethostbyname(name.GetData())) == 0) {
+    if ((theHostent = gethostbyname(name.GetData())) == 0) {

       return FALSE;
     }
   } else {
       return FALSE;
     }
   } else {

+#ifdef __WXMAC__
+    long len_addr = inet_addr(name.GetData()).s_addr ;
+#else

     long len_addr = inet_addr(name.GetData());
     long len_addr = inet_addr(name.GetData());

+#endif

     if (len_addr == -1)
       return FALSE;
     m_addr->sin_addr.s_addr = len_addr;
     return TRUE;
   }
 
     if (len_addr == -1)
       return FALSE;
     m_addr->sin_addr.s_addr = len_addr;
     return TRUE;
   }
 

-  addr = (struct in_addr *) *(hostent->h_addr_list);
+  addr = (struct in_addr *) *(theHostent->h_addr_list);

 
   m_addr->sin_addr.s_addr = addr[0].s_addr;
   return TRUE;
 
   m_addr->sin_addr.s_addr = addr[0].s_addr;
   return TRUE;


@@ -130,22 +157,22 @@ bool wxIPV4address::Hostname(unsigned long addr)
 
 bool wxIPV4address::Service(const wxString& name)
 {
 
 bool wxIPV4address::Service(const wxString& name)
 {

-  struct servent *servent;
+  struct servent *theServent;

   
   if (name.IsNull())
     return FALSE;
   
   if (!name.IsNumber()) {
   
   if (name.IsNull())
     return FALSE;
   
   if (!name.IsNumber()) {

-    if ((servent = getservbyname(name, "tcp")) == 0)
+    if ((theServent = getservbyname(name, "tcp")) == 0)

       return FALSE;
   } else {
       return FALSE;
   } else {

-    if ((servent = getservbyport(atoi(name), "tcp")) == 0) {
+    if ((theServent = getservbyport(atoi(name), "tcp")) == 0) {

       m_addr->sin_port = htons(atoi(name));
       return TRUE;
     }
   }
   
       m_addr->sin_port = htons(atoi(name));
       return TRUE;
     }
   }
   

-  m_addr->sin_port = servent->s_port;
+  m_addr->sin_port = theServent->s_port;

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -171,7 +198,11 @@ wxString wxIPV4address::Hostname()
 
   h_ent = gethostbyaddr((char *)&(m_addr->sin_addr), sizeof(m_addr->sin_addr),
                        GetFamily());
 
   h_ent = gethostbyaddr((char *)&(m_addr->sin_addr), sizeof(m_addr->sin_addr),
                        GetFamily());

-  return wxString(h_ent->h_name);
+                       
+  if (!h_ent)
+     return wxString("");
+  else
+     return wxString(h_ent->h_name);

 }
 
 unsigned short wxIPV4address::Service()
 }
 
 unsigned short wxIPV4address::Service()


@@ -234,7 +265,7 @@ const wxSockAddress& wxIPV6address::operator =(const wxSockAddress& addr)
 
 bool wxIPV6address::Hostname(const wxString& name)
 {
 
 bool wxIPV6address::Hostname(const wxString& name)
 {

-  struct hostent *hostent;
+  struct hostent *theHostent;

   struct in_addr *addr;
   
   if (name.IsNull())
   struct in_addr *addr;
   
   if (name.IsNull())


@@ -242,14 +273,14 @@ bool wxIPV6address::Hostname(const wxString& name)
   
   if (!name.IsNumber()) {
     hostent = gethostbyname2((char*) name, AF_INET6);
   
   if (!name.IsNumber()) {
     hostent = gethostbyname2((char*) name, AF_INET6);

-    if (!hostent)
+    if (!theHostent)

       return FALSE;
   } else {
     // Don't how to do
     return FALSE;
   }
 
       return FALSE;
   } else {
     // Don't how to do
     return FALSE;
   }
 

-  addr = (struct in6_addr *) *(hostent->h_addr_list);
+  addr = (struct in6_addr *) *(theHostent->h_addr_list);

 
   m_addr->sin6_addr.s6_addr = addr[0].s6_addr;
   return TRUE;
 
   m_addr->sin6_addr.s6_addr = addr[0].s6_addr;
   return TRUE;


@@ -263,22 +294,22 @@ bool wxIPV6address::Hostname(unsigned char addr[16])
 
 bool wxIPV6address::Service(const char *name)
 {
 
 bool wxIPV6address::Service(const char *name)
 {

-  struct servent *servent;
+  struct servent *theServent;

   
   if (!name || !strlen(name))
     return FALSE;
   
   if (!isdigit(*name)) {
   
   if (!name || !strlen(name))
     return FALSE;
   
   if (!isdigit(*name)) {

-    if ((servent = getservbyname((char*) name, "tcp")) == 0)
+    if ((theServent = getservbyname((char*) name, "tcp")) == 0)

       return FALSE;
   } else {
       return FALSE;
   } else {

-    if ((servent = getservbyport(atoi(name), "tcp")) == 0) {
+    if ((theServent = getservbyport(atoi(name), "tcp")) == 0) {

       m_addr->sin_port = htons(atoi(name));
       return TRUE;
     }
   }
   
       m_addr->sin_port = htons(atoi(name));
       return TRUE;
     }
   }
   

-  m_addr->sin_port = servent->s_port;
+  m_addr->sin_port = theServent->s_port;

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -389,3 +420,6 @@ void wxUNIXaddress::Disassemble(struct sockaddr *addr, size_t len)
   *m_addr = *(struct sockaddr_un *)addr;
 }
 #endif
   *m_addr = *(struct sockaddr_un *)addr;
 }
 #endif

+
+#endif 
+  // wxUSE_SOCKETS