X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fde6fcc9b551340a194ae4c726db5ab64b5c594..253293c10326afa0226932eab4753d188e1e22e2:/src/mac/carbon/gsocket.c?ds=sidebyside

diff --git a/src/mac/carbon/gsocket.c b/src/mac/carbon/gsocket.c
index ed895445f2..ef89f1a511 100644
--- 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,11 +80,11 @@ void wxCYield() ;
 #define qDebug2 1
 extern pascal void OTDebugStr(const char* str);
 #endif
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;
-
+int gOTInited = 0 ;
 
 OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
 
@@ -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;
@@ -195,39 +195,66 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
 
 int GSocket_Init()
 {
-	OSStatus err ;
+    return TRUE;
+}
+
+int GSocket_Verify_Inited() ;
+int GSocket_Verify_Inited()
+{
+    OSStatus err ;
 #if TARGET_CARBON
-	InitOpenTransportInContext( kInitOTForApplicationMask , NULL ) ;
+    // Marc Newsam: added the clientcontext variable
+    //              however, documentation is unclear how this works
+    OTClientContextPtr clientcontext;
+
+    if ( gInetSvcRef )
+      return TRUE ;
+
+    InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);
+    gOTInited = 1 ;
+    gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
+						NULL, &err, clientcontext);
 #else	
-	InitOpenTransport() ;
+    if ( gInetSvcRef )
+      return TRUE ;
+ 
+    InitOpenTransport() ;
+    gOTInited = 1 ;
+    gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
 #endif
-	gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
-	if ( gInetSvcRef == NULL ||  err != kOTNoError )
-	{
-		OTAssert("Could not open Inet Services", err == noErr);
-		return FALSE ;
-	}
-  return TRUE;
+    if ( gInetSvcRef == NULL ||  err != kOTNoError )
+    {
+	OTAssert("Could not open Inet Services", err == noErr);
+	return FALSE ;
+    }
+    return TRUE ;
 }
 
 void GSocket_Cleanup()
 {
-  if ( gInetSvcRef != NULL )
-	OTCloseProvider( gInetSvcRef );
-#if TARGET_CARBON
-  CloseOpenTransportInContext( NULL ) ;
-#else
-  CloseOpenTransport() ;
-#endif
+    if ( gOTInited != 0 )
+    {
+      if ( gInetSvcRef != NULL )
+    	OTCloseProvider( gInetSvcRef );
+    #if TARGET_CARBON
+      CloseOpenTransportInContext( NULL ) ;
+    #else
+      CloseOpenTransport() ;
+    #endif
+    }
 }
 
 /* Constructors / Destructors for GSocket */
 
 GSocket *GSocket_new()
 {
+     
   int i;
   GSocket *socket;
 
+ if ( GSocket_Verify_Inited() == FALSE )
+    return NULL ;
+
   socket = (GSocket *)malloc(sizeof(GSocket));
 
   if (socket == NULL)
@@ -245,8 +272,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             = 1*1000;
+                                /* 10 sec * 1000 millisec */
   socket->m_takesEvents			= TRUE ;
   socket->m_mac_events			= wxMacGetNotifierTable() ;
   return socket;
@@ -952,7 +979,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:
@@ -1048,6 +1077,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 )
 	{
@@ -1243,6 +1274,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;
@@ -1267,6 +1300,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);
@@ -1363,6 +1399,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);
@@ -1440,7 +1478,7 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket)
     {
     	OTResult state ;
    		OTByteCount sz = 0 ;
- 		state = OTGetEndpointState(socket->m_endpoint);
+ 		  state = OTGetEndpointState(socket->m_endpoint);
   
   		OTCountDataBytes( socket->m_endpoint , &sz ) ;
   		if ( state == T_INCON || sz > 0 )