#ifndef __GSOCKET_STANDALONE__
#include "wx/setup.h"
+#include "wx/platform.h"
#endif
#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
#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
#include <OTDebug.h>
#endif
InetSvcRef gInetSvcRef = 0 ;
-
+int gOTInited = 0 ;
+OTNotifyUPP gOTNotifierUPP = NULL ;
OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
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);
return TRUE ;
InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);
+ gOTInited = 1 ;
gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
NULL, &err, clientcontext);
#else
return TRUE ;
InitOpenTransport() ;
+ gOTInited = 1 ;
gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
#endif
if ( gInetSvcRef == NULL || err != kOTNoError )
OTAssert("Could not open Inet Services", err == noErr);
return FALSE ;
}
+ 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 */
socket->m_server = FALSE;
socket->m_stream = TRUE;
socket->m_non_blocking = FALSE;
- socket->m_timeout = 10*1000;
+ socket->m_timeout = 1*1000;
/* 10 sec * 1000 millisec */
socket->m_takesEvents = TRUE ;
socket->m_mac_events = wxMacGetNotifierTable() ;
*/
GSocketError GSocket_SetServer(GSocket *sck)
{
- int type;
- int arg = 1;
-
assert(sck != NULL);
/* must not be in use */
GSocket *GSocket_WaitConnection(GSocket *socket)
{
GSocket *connection = NULL ;
- GSocketError err;
-
- int arg = 1;
assert(socket != NULL);
*/
GSocketError GSocket_SetNonOriented(GSocket *sck)
{
- int arg = 1;
-
assert(sck != NULL);
if (sck->m_endpoint != kOTInvalidEndpointRef )
*/
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);
*/
GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
{
- OTResult state ;
assert(socket != NULL);
wxMacProcessNotifierEvents() ;
/*
OTByteCount sz = 0 ;
OTCountDataBytes( socket->m_endpoint , &sz ) ;
- if ( size > sz )
+ if ( size > (int)sz )
size = sz ;
res = OTRcv( socket->m_endpoint , buffer , size , &flags ) ;
if ( res < 0 )
GSocketError GAddress_INET_SetHostAddress(GAddress *address,
unsigned long hostaddr)
{
- struct in_addr *addr;
-
assert(address != NULL);
CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
const char *protocol)
{
- InetAddress *addr;
- int i ;
+ size_t i ;
assert(address != NULL);
CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
{
- InetAddress *addr;
-
assert(address != NULL);
CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
address->m_port = port ;
{
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 )
/* 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__) */