added wxSTD macro

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

diff --git a/src/mac/gsocket.c b/src/mac/gsocket.c
index 10ee5d838dbbcc4cdb7a38276b2dfd6ae2897035..ef89f1a51116aa1f873df34d957fc97ac0002a2e 100644 (file)
--- a/src/mac/gsocket.c
+++ b/src/mac/gsocket.c
@@ -84,7 +84,7 @@ extern pascal void OTDebugStr(const char* str);
   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;
   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;

-
+int gOTInited = 0 ;

 
 OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
 
 
 OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
 


@@ -194,6 +194,12 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
 /* Global initialisers */
 
 int GSocket_Init()
 /* Global initialisers */
 
 int GSocket_Init()

+{
+    return TRUE;
+}
+
+int GSocket_Verify_Inited() ;
+int GSocket_Verify_Inited()

 {
     OSStatus err ;
 #if TARGET_CARBON
 {
     OSStatus err ;
 #if TARGET_CARBON


@@ -201,11 +207,19 @@ int GSocket_Init()
     //              however, documentation is unclear how this works
     OTClientContextPtr clientcontext;
 
     //              however, documentation is unclear how this works
     OTClientContextPtr clientcontext;
 

+    if ( gInetSvcRef )
+      return TRUE ;
+

     InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);
     InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);

+    gOTInited = 1 ;

     gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
                                                NULL, &err, clientcontext);
 #else  
     gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
                                                NULL, &err, clientcontext);
 #else  

+    if ( gInetSvcRef )
+      return TRUE ;
+ 

     InitOpenTransport() ;
     InitOpenTransport() ;

+    gOTInited = 1 ;

     gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
 #endif
     if ( gInetSvcRef == NULL ||  err != kOTNoError )
     gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
 #endif
     if ( gInetSvcRef == NULL ||  err != kOTNoError )


@@ -213,27 +227,34 @@ int GSocket_Init()
        OTAssert("Could not open Inet Services", err == noErr);
        return FALSE ;
     }
        OTAssert("Could not open Inet Services", err == noErr);
        return FALSE ;
     }

-    return TRUE;
+    return TRUE ;

 }
 
 void GSocket_Cleanup()
 {
 }
 
 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()
 {
 }
 
 /* Constructors / Destructors for GSocket */
 
 GSocket *GSocket_new()
 {

+     

   int i;
   GSocket *socket;
 
   int i;
   GSocket *socket;
 

+ if ( GSocket_Verify_Inited() == FALSE )
+    return NULL ;
+

   socket = (GSocket *)malloc(sizeof(GSocket));
 
   if (socket == NULL)
   socket = (GSocket *)malloc(sizeof(GSocket));
 
   if (socket == NULL)


@@ -251,8 +272,8 @@ GSocket *GSocket_new()
   socket->m_server              = FALSE;
   socket->m_stream              = TRUE;
   socket->m_non_blocking        = FALSE;
   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;
   socket->m_takesEvents                        = TRUE ;
   socket->m_mac_events                 = wxMacGetNotifierTable() ;
   return socket;


@@ -958,7 +979,9 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
 {
   assert(socket != NULL);
 
 {
   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:
 }
 
 /* GSocket_GetError:


@@ -1054,6 +1077,8 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
        OTByteCount sz = 0 ;
 
        OTCountDataBytes( socket->m_endpoint , &sz ) ;
        OTByteCount sz = 0 ;
 
        OTCountDataBytes( socket->m_endpoint , &sz ) ;

+       if ( size > sz )
+         size = sz ;

        res = OTRcv( socket->m_endpoint , buffer , size , &flags ) ;
        if ( res < 0 )
        {
        res = OTRcv( socket->m_endpoint , buffer , size , &flags ) ;
        if ( res < 0 )
        {


@@ -1249,6 +1274,8 @@ GSocketError _GAddress_translate_from(GAddress *address,
 GSocketError _GAddress_translate_to(GAddress *address,
                                     InetAddress *addr)
 {
 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;
   memset(addr, 0 , sizeof(struct InetAddress));
   OTInitInetAddress( addr , address->m_port , address->m_host ) ;
   return GSOCK_NOERROR;


@@ -1273,6 +1300,9 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   InetHostInfo hinfo ;
   OSStatus ret ;
 
   InetHostInfo hinfo ;
   OSStatus ret ;
 

+ if ( GSocket_Verify_Inited() == FALSE )
+    return GSOCK_IOERR ;
+

   assert(address != NULL);
 
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
   assert(address != NULL);
 
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);


@@ -1369,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 ;
 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);
   
   assert(address != NULL); 
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);


@@ -1446,7 +1478,7 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket)
     {
        OTResult state ;
                OTByteCount sz = 0 ;
     {
        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 )
   
                OTCountDataBytes( socket->m_endpoint , &sz ) ;
                if ( state == T_INCON || sz > 0 )