Fixed apparent typo.

[wxWidgets.git] / src / mac / carbon / gsocket.c

diff --git a/src/mac/carbon/gsocket.c b/src/mac/carbon/gsocket.c
index 20e4049f58bdecc3f973f16f4d7358602485bae6..54114255567e56373bf3aa48d1b80e568ed29a99 100644 (file)
--- a/src/mac/carbon/gsocket.c
+++ b/src/mac/carbon/gsocket.c
@@ -19,7 +19,7 @@
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
   #include <CoreServices/CoreServices.h>
 
   #ifndef FALSE
@@ -80,7 +80,7 @@ void wxCYield() ;
 #define qDebug2 1
 extern pascal void OTDebugStr(const char* str);
 #endif
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;
@@ -121,7 +121,7 @@ OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode)
        ret.opt.maxlen = kOTFourByteOptionSize;
 
        opt->level      = INET_IP;                                      // dealing with an IP Level function
-#ifdef __UNIX__
+#ifdef __DARWIN__
        opt->name       = kIP_REUSEADDR;
 #else
        opt->name       = IP_REUSEADDR;
@@ -194,6 +194,12 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
 /* Global initialisers */
 
 int GSocket_Init()
+{
+    return TRUE;
+}
+
+int GSocket_Verify_Inited() ;
+int GSocket_Verify_Inited()
 {
     OSStatus err ;
 #if TARGET_CARBON
@@ -201,10 +207,16 @@ int GSocket_Init()
     //              however, documentation is unclear how this works
     OTClientContextPtr clientcontext;
 
+    if ( gInetSvcRef )
+      return TRUE ;
+
     InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);
     gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
                                                NULL, &err, clientcontext);
 #else  
+    if ( gInetSvcRef )
+      return TRUE ;
+ 
     InitOpenTransport() ;
     gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
 #endif
@@ -213,7 +225,7 @@ int GSocket_Init()
        OTAssert("Could not open Inet Services", err == noErr);
        return FALSE ;
     }
-    return TRUE;
+    return TRUE ;
 }
 
 void GSocket_Cleanup()
@@ -231,9 +243,13 @@ void GSocket_Cleanup()
 
 GSocket *GSocket_new()
 {
+     
   int i;
   GSocket *socket;
 
+ if ( GSocket_Verify_Inited() == FALSE )
+    return NULL ;
+
   socket = (GSocket *)malloc(sizeof(GSocket));
 
   if (socket == NULL)
@@ -251,8 +267,8 @@ GSocket *GSocket_new()
   socket->m_server              = FALSE;
   socket->m_stream              = TRUE;
   socket->m_non_blocking        = FALSE;
-  socket->m_timeout             = 10*60*1000;
-                                /* 10 minutes * 60 sec * 1000 millisec */
+  socket->m_timeout             = 10*1000;
+                                /* 10 sec * 1000 millisec */
   socket->m_takesEvents                        = TRUE ;
   socket->m_mac_events                 = wxMacGetNotifierTable() ;
   return socket;
@@ -958,7 +974,9 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
 {
   assert(socket != NULL);
 
-  socket->m_timeout = millisec;
+//  this is usually set too high and we have not yet been able to detect a closed
+//  stream, thus we leave the 10 sec timeout
+//  socket->m_timeout = millisec;
 }
 
 /* GSocket_GetError:
@@ -1054,6 +1072,8 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
        OTByteCount sz = 0 ;
 
        OTCountDataBytes( socket->m_endpoint , &sz ) ;
+       if ( size > sz )
+         size = sz ;
        res = OTRcv( socket->m_endpoint , buffer , size , &flags ) ;
        if ( res < 0 )
        {
@@ -1249,6 +1269,8 @@ GSocketError _GAddress_translate_from(GAddress *address,
 GSocketError _GAddress_translate_to(GAddress *address,
                                     InetAddress *addr)
 {
+ if ( GSocket_Verify_Inited() == FALSE )
+    return GSOCK_IOERR ;
   memset(addr, 0 , sizeof(struct InetAddress));
   OTInitInetAddress( addr , address->m_port , address->m_host ) ;
   return GSOCK_NOERROR;
@@ -1273,6 +1295,9 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   InetHostInfo hinfo ;
   OSStatus ret ;
 
+ if ( GSocket_Verify_Inited() == FALSE )
+    return GSOCK_IOERR ;
+
   assert(address != NULL);
 
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
@@ -1369,6 +1394,8 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
 GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t sbuf)
 {
   InetDomainName name ;
+ if ( GSocket_Verify_Inited() == FALSE )
+    return GSOCK_IOERR ;
   
   assert(address != NULL); 
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);