X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5c6eb5c178b44f4400495e06274ffd130635190..bd746613ca6b3bde3978b846fa026a4ab23bc933:/src/mac/gsocket.c
diff --git a/src/mac/gsocket.c b/src/mac/gsocket.c
index 10ee5d838d..f3985aee92 100644
--- a/src/mac/gsocket.c
+++ b/src/mac/gsocket.c
@@ -15,6 +15,7 @@
#ifndef __GSOCKET_STANDALONE__
#include "wx/setup.h"
+#include "wx/platform.h"
#endif
#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
@@ -29,12 +30,13 @@
#define TRUE 1
#endif
#else
+ #include <MacHeaders.c>
#define OTUNIXERRORS 1
#include <OpenTransport.h>
#include <OpenTransportProviders.h>
#include <OpenTptInternet.h>
#endif
-#if TARGET_CARBON
+#if TARGET_CARBON && !defined(OTAssert)
#define OTAssert( str , cond ) /* does not exists in Carbon */
#endif
@@ -84,7 +86,8 @@ extern pascal void OTDebugStr(const char* str);
#include <OTDebug.h>
#endif
InetSvcRef gInetSvcRef = 0 ;
-
+int gOTInited = 0 ;
+OTNotifyUPP gOTNotifierUPP = NULL ;
OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
@@ -183,7 +186,7 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
junk = OTSetBlocking(ep);
OTAssert("SetDefaultEndpointModes: Could not set blocking", junk == noErr);
*/
- junk = OTInstallNotifier(ep, OTInetEventHandler, data);
+ junk = OTInstallNotifier(ep, gOTNotifierUPP, data);
OTAssert("SetDefaultEndpointModes: Could not install notifier", junk == noErr);
/*
junk = OTUseSyncIdleEvents(ep, true);
@@ -194,6 +197,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,11 +210,19 @@ int GSocket_Init()
// 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
+ if ( gInetSvcRef )
+ return TRUE ;
+
InitOpenTransport() ;
+ gOTInited = 1 ;
gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
#endif
if ( gInetSvcRef == NULL || err != kOTNoError )
@@ -213,27 +230,37 @@ int GSocket_Init()
OTAssert("Could not open Inet Services", err == noErr);
return FALSE ;
}
- return TRUE;
+ gOTNotifierUPP = NewOTNotifyUPP( OTInetEventHandler ) ;
+ 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
+ if ( gOTNotifierUPP )
+ DisposeOTNotifyUPP( gOTNotifierUPP ) ;
+ }
}
/* 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)
@@ -251,8 +278,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;
@@ -450,9 +477,6 @@ GAddress *GSocket_GetPeer(GSocket *socket)
*/
GSocketError GSocket_SetServer(GSocket *sck)
{
- int type;
- int arg = 1;
-
assert(sck != NULL);
/* must not be in use */
@@ -522,9 +546,6 @@ GSocketError GSocket_SetServer(GSocket *sck)
GSocket *GSocket_WaitConnection(GSocket *socket)
{
GSocket *connection = NULL ;
- GSocketError err;
-
- int arg = 1;
assert(socket != NULL);
@@ -617,8 +638,6 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
*/
GSocketError GSocket_SetNonOriented(GSocket *sck)
{
- int arg = 1;
-
assert(sck != NULL);
if (sck->m_endpoint != kOTInvalidEndpointRef )
@@ -703,12 +722,9 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
*/
GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
{
- int ret;
- int arg = 1;
InetAddress addr ;
TEndpointInfo info;
- OTFlags flags = 0;
- OSStatus err = kOTNoError;
+ OSStatus err = kOTNoError;
TCall peer ;
assert(sck != NULL);
@@ -909,7 +925,6 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
*/
GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
{
- OTResult state ;
assert(socket != NULL);
wxMacProcessNotifierEvents() ;
/*
@@ -958,7 +973,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 +1071,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 +1268,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 +1294,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);
@@ -1295,8 +1319,6 @@ GSocketError GAddress_INET_SetAnyAddress(GAddress *address)
GSocketError GAddress_INET_SetHostAddress(GAddress *address,
unsigned long hostaddr)
{
- struct in_addr *addr;
-
assert(address != NULL);
CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
@@ -1322,7 +1344,6 @@ service_entry gServices[] =
GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
const char *protocol)
{
- InetAddress *addr;
int i ;
assert(address != NULL);
@@ -1357,8 +1378,6 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
{
- InetAddress *addr;
-
assert(address != NULL);
CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
address->m_port = port ;
@@ -1369,6 +1388,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);
@@ -1446,7 +1467,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 )
@@ -1616,10 +1637,12 @@ void _GSocket_Internal_Proc(unsigned long e , void* d )
/* Hack added for Mac OS X */
GSocketError GAddress_UNIX_GetPath(GAddress *addr, char *path, size_t buf)
{
+ return GSOCK_INVADDR;
}
GSocketError GAddress_UNIX_SetPath(GAddress *addr, const char *path)
{
+ return GSOCK_INVADDR;
}
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */