Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert original UNIX C->C++ conversion and instead make it work exactly

Browse Source 
like the new MSW C++ GSocket.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-08-03 19:18:39 +00:00
parent 1f360a2db7
commit ba2a81d747
4 changed files with 172 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/gsocket.h
View File

@@ -11,14 +11,10 @@
#ifndef __GSOCKET_H #ifndef __GSOCKET_H
#define __GSOCKET_H #define __GSOCKET_H
#ifdef __WINDOWS__
/* #define wxUSE_GSOCKET_CPLUSPLUS 1 */
#undef wxUSE_GSOCKET_CPLUSPLUS
#else
/* DFE: Define this and compile gsocket.cpp instead of gsocket.c and /* DFE: Define this and compile gsocket.cpp instead of gsocket.c and
compile existing GUI gsock*.c as C++ to try out the new GSocket. */ compile existing GUI gsock*.c as C++ to try out the new GSocket. */
/* #define wxUSE_GSOCKET_CPLUSPLUS 1 */
#undef wxUSE_GSOCKET_CPLUSPLUS #undef wxUSE_GSOCKET_CPLUSPLUS
#endif
#if !defined(__cplusplus) && defined(wxUSE_GSOCKET_CPLUSPLUS) #if !defined(__cplusplus) && defined(wxUSE_GSOCKET_CPLUSPLUS)
#error "You need to compile this file (probably a GUI gsock peice) as C++" #error "You need to compile this file (probably a GUI gsock peice) as C++"
#endif #endif
@@ -49,11 +45,7 @@
#endif #endif
#ifdef wxUSE_GSOCKET_CPLUSPLUS #ifdef wxUSE_GSOCKET_CPLUSPLUS
# ifdef __WINDOWS__
class GSocket; class GSocket;
# else
typedef class GSocketBSD GSocket;
# endif
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
@@ -116,7 +108,7 @@ typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event,
/* Functions tables for internal use by GSocket code: */ /* Functions tables for internal use by GSocket code: */
#ifndef __WINDOWS__ #if !defined(__WINDOWS__) && !defined(wxUSE_GSOCKET_CPLUSPLUS)
struct GSocketBaseFunctionsTable struct GSocketBaseFunctionsTable
{ {
void (*Detected_Read)(GSocket *socket); void (*Detected_Read)(GSocket *socket);
@@ -124,7 +116,7 @@ struct GSocketBaseFunctionsTable
}; };
#endif #endif
#if defined(__WINDOWS__) && defined(wxUSE_GSOCKET_CPLUSPLUS) #if defined(wxUSE_GSOCKET_CPLUSPLUS)
/* Actually this is a misnomer now, but reusing this name means I don't /* Actually this is a misnomer now, but reusing this name means I don't
have to ifdef app traits or common socket code */ have to ifdef app traits or common socket code */
class GSocketGUIFunctionsTable class GSocketGUIFunctionsTable
@@ -157,7 +149,7 @@ struct GSocketGUIFunctionsTable
void (*Enable_Events)(GSocket *socket); void (*Enable_Events)(GSocket *socket);
void (*Disable_Events)(GSocket *socket); void (*Disable_Events)(GSocket *socket);
}; };
#endif /* defined(__WINDOWS__) && defined(wxUSE_GSOCKET_CPLUSPLUS) */ #endif /* defined(wxUSE_GSOCKET_CPLUSPLUS) */
/* Global initializers */ /* Global initializers */
@@ -176,7 +168,7 @@ void GSocket_Cleanup(void);
/* Constructors / Destructors */ /* Constructors / Destructors */
GSocket *GSocket_new(void); GSocket *GSocket_new(void);
#if !defined(__WINDOWS__) || !defined(wxUSE_GSOCKET_CPLUSPLUS) #if !defined(wxUSE_GSOCKET_CPLUSPLUS)
void GSocket_destroy(GSocket *socket); void GSocket_destroy(GSocket *socket);
#endif #endif

62
include/wx/unix/gsockunx.h
View File

@@ -30,11 +30,27 @@
#endif #endif
#ifdef wxUSE_GSOCKET_CPLUSPLUS #ifdef wxUSE_GSOCKET_CPLUSPLUS
class GSocketBSD class GSocketGUIFunctionsTableConcrete: public GSocketGUIFunctionsTable
{ {
public: public:
GSocketBSD(); virtual bool OnInit();
virtual ~GSocketBSD(); virtual void OnExit();
virtual bool CanUseEventLoop();
virtual bool Init_Socket(GSocket *socket);
virtual void Destroy_Socket(GSocket *socket);
virtual void Install_Callback(GSocket *socket, GSocketEvent event);
virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event);
virtual void Enable_Events(GSocket *socket);
virtual void Disable_Events(GSocket *socket);
};
#endif /* def wxUSE_GSOCKET_CPLUSPLUS */
#ifdef wxUSE_GSOCKET_CPLUSPLUS
class GSocket
{
public:
GSocket();
virtual ~GSocket();
bool IsOk() { return m_ok; } bool IsOk() { return m_ok; }
void Close(); void Close();
void Shutdown(); void Shutdown();
@@ -52,7 +68,7 @@ public:
GSocketEventFlags Select(GSocketEventFlags flags); GSocketEventFlags Select(GSocketEventFlags flags);
void SetNonBlocking(int non_block); void SetNonBlocking(int non_block);
void SetTimeout(unsigned long millisec); void SetTimeout(unsigned long millisec);
GSocketError GetError(); GSocketError WXDLLIMPEXP_NET GetError();
void SetCallback(GSocketEventFlags flags, void SetCallback(GSocketEventFlags flags,
GSocketCallback callback, char *cdata); GSocketCallback callback, char *cdata);
void UnsetCallback(GSocketEventFlags flags); void UnsetCallback(GSocketEventFlags flags);
@@ -62,6 +78,8 @@ public:
/* API compatibility functions */ /* API compatibility functions */
static void _GSocket_Detected_Read(GSocket *socket); static void _GSocket_Detected_Read(GSocket *socket);
static void _GSocket_Detected_Write(GSocket *socket); static void _GSocket_Detected_Write(GSocket *socket);
virtual void Detected_Read();
virtual void Detected_Write();
protected: protected:
void Enable(GSocketEvent event); void Enable(GSocketEvent event);
void Disable(GSocketEvent event); void Disable(GSocketEvent event);
@@ -71,13 +89,7 @@ protected:
int Recv_Dgram(char *buffer, int size); int Recv_Dgram(char *buffer, int size);
int Send_Stream(const char *buffer, int size); int Send_Stream(const char *buffer, int size);
int Send_Dgram(const char *buffer, int size); int Send_Dgram(const char *buffer, int size);
void Detected_Read();
void Detected_Write();
bool m_ok; bool m_ok;
virtual void EventLoop_Enable_Events() = 0;
virtual void EventLoop_Disable_Events() = 0;
virtual void EventLoop_Install_Callback(GSocketEvent event) = 0;
virtual void EventLoop_Uninstall_Callback(GSocketEvent event) = 0;
public: public:
/* DFE: We can't protect these data member until the GUI code is updated */ /* DFE: We can't protect these data member until the GUI code is updated */
/* protected: */ /* protected: */
@@ -109,37 +121,15 @@ struct _GSocket
char *m_gui_dependent; char *m_gui_dependent;
#ifndef wxUSE_GSOCKET_CPLUSPLUS
/* Function pointers */ /* Function pointers */
struct GSocketBaseFunctionsTable *m_functions; struct GSocketBaseFunctionsTable *m_functions;
#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
}; };
#ifndef wxUSE_GSOCKET_CPLUSPLUS #ifndef wxUSE_GSOCKET_CPLUSPLUS
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#else
/**************************************************************************/
/* GSocketBSDGUIShim */
class GSocketBSDGUIShim:public GSocketBSD
{
friend void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc);
public:
static inline bool GUI_Init();
static inline void GUI_Cleanup();
static inline bool UseGUI();
GSocketBSDGUIShim();
virtual ~GSocketBSDGUIShim();
protected:
virtual void EventLoop_Enable_Events();
virtual void EventLoop_Disable_Events();
virtual void EventLoop_Install_Callback(GSocketEvent event);
virtual void EventLoop_Uninstall_Callback(GSocketEvent event);
private:
/* Table of GUI-related functions. We must call them indirectly because
* of wxBase and GUI separation: */
static struct GSocketGUIFunctionsTable *ms_gui_functions;
};
#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */ #endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
#ifdef __cplusplus #ifdef __cplusplus
@@ -192,6 +182,8 @@ inline void GSocket_SetNonBlocking(GSocket *socket, int non_block)
{ socket->SetNonBlocking(non_block); } { socket->SetNonBlocking(non_block); }
inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec) inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
{ socket->SetTimeout(millisec); } { socket->SetTimeout(millisec); }
inline GSocketError GSocket_GetError(GSocket *socket)
{ return socket->GetError(); }
inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags, inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
GSocketCallback fallback, char *cdata) GSocketCallback fallback, char *cdata)
{ socket->SetCallback(flags,fallback,cdata); } { socket->SetCallback(flags,fallback,cdata); }
@@ -203,6 +195,8 @@ inline GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
inline GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname, inline GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname,
const void *optval, int optlen) const void *optval, int optlen)
{ return socket->SetSockOpt(level,optname,optval,optlen); } { return socket->SetSockOpt(level,optname,optval,optlen); }
inline void GSocket_destroy(GSocket *socket)
{ delete socket; }
#endif /* def wxUSE_GSOCKET_CPLUSPLUS */ #endif /* def wxUSE_GSOCKET_CPLUSPLUS */

4
src/common/appcmn.cpp
View File

@@ -588,7 +588,7 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
{ {
#if defined(__WINDOWS__) && defined(wxUSE_GSOCKET_CPLUSPLUS) #if defined(wxUSE_GSOCKET_CPLUSPLUS)
static GSocketGUIFunctionsTableConcrete table; static GSocketGUIFunctionsTableConcrete table;
return &table; return &table;
#else #else
@@ -612,7 +612,7 @@ GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
}; };
return &table; return &table;
#endif // !__WXMAC__ || __DARWIN__ #endif // !__WXMAC__ || __DARWIN__
#endif // defined(__WINDOWS__) && defined(wxUSE_GSOCKET_CPLUSPLUS) #endif // defined(wxUSE_GSOCKET_CPLUSPLUS)
} }
#endif #endif

290
src/unix/gsocket.cpp
View File

@@ -5,16 +5,18 @@
* Guilhem Lavaux, * Guilhem Lavaux,
* Guillermo Rodriguez Garcia <guille@iies.es> * Guillermo Rodriguez Garcia <guille@iies.es>
* Purpose: GSocket main Unix and OS/2 file * Purpose: GSocket main Unix and OS/2 file
* Licence: The wxWindows licence * Licence: The wxWidgets licence
* CVSID: $Id$ * CVSID: $Id$
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#include "wx/wxprec.h" /*
#ifndef WX_PRECOMP * PLEASE don't put C++ comments here - this is a C source file.
#include "wx/app.h" */
#include "wx/apptrait.h"
#endif //ndef WX_PRECOMP #ifndef __GSOCKET_STANDALONE__
#include "wx/setup.h"
#endif
#if defined(__VISAGECPP__) #if defined(__VISAGECPP__)
/* Seems to be needed by Visual Age C++, though I don't see how it manages /* Seems to be needed by Visual Age C++, though I don't see how it manages
@@ -159,82 +161,74 @@ int _System soclose(int);
# define GSocket_Debug(args) # define GSocket_Debug(args)
#endif /* __GSOCKET_DEBUG__ */ #endif /* __GSOCKET_DEBUG__ */
/////////////////////////////////////////////////////////////////////////// /* Table of GUI-related functions. We must call them indirectly because
// GSocketBSDGUIShim * of wxBase and GUI separation: */
struct GSocketGUIFunctionsTable *GSocketBSDGUIShim::ms_gui_functions = NULL;
static struct GSocketGUIFunctionsTable *gs_gui_functions;
class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
{
public:
virtual bool OnInit();
virtual void OnExit();
virtual bool CanUseEventLoop();
virtual bool Init_Socket(GSocket *socket);
virtual void Destroy_Socket(GSocket *socket);
virtual void Install_Callback(GSocket *socket, GSocketEvent event);
{}
virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event);
virtual void Enable_Events(GSocket *socket);
virtual void Disable_Events(GSocket *socket);
};
bool GSocketGUIFunctionsTableNull::OnInit()
{ return true; }
void GSocketGUIFunctionsTableNull::OnExit()
{}
bool GSocketGUIFunctionsTableNull::CanUseEventLoop()
{ return false; }
bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *socket)
{ return true; }
void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *socket)
{}
void GSocketGUIFunctionsTableNull::Install_Callback(GSocket *socket, GSocketEvent event)
{}
void GSocketGUIFunctionsTableNull::Uninstall_Callback(GSocket *socket, GSocketEvent event)
{}
void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *socket)
{}
void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *socket)
{}
/* Global initialisers */
void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc) void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
{ {
GSocketBSDGUIShim::ms_gui_functions = guifunc; gs_gui_functions = guifunc;
} }
inline bool GSocketBSDGUIShim::UseGUI()
{
return ms_gui_functions;
}
inline bool GSocketBSDGUIShim::GUI_Init()
{
return (ms_gui_functions)?ms_gui_functions->GUI_Init():true;
}
inline void GSocketBSDGUIShim::GUI_Cleanup()
{
if (ms_gui_functions) ms_gui_functions->GUI_Cleanup();
}
GSocketBSDGUIShim::GSocketBSDGUIShim()
{
m_ok = (ms_gui_functions ? ms_gui_functions->GUI_Init_Socket(this) : true);
}
GSocketBSDGUIShim::~GSocketBSDGUIShim()
{
if (ms_gui_functions) ms_gui_functions->GUI_Destroy_Socket(this);
}
void GSocketBSDGUIShim::EventLoop_Enable_Events()
{
if (ms_gui_functions) ms_gui_functions->Enable_Events(this);
}
void GSocketBSDGUIShim::EventLoop_Disable_Events()
{
if (ms_gui_functions) ms_gui_functions->Disable_Events(this);
}
void GSocketBSDGUIShim::EventLoop_Install_Callback(GSocketEvent event)
{
if (ms_gui_functions) ms_gui_functions->Install_Callback(this, event);
}
void GSocketBSDGUIShim::EventLoop_Uninstall_Callback(GSocketEvent event)
{
if (ms_gui_functions) ms_gui_functions->Uninstall_Callback(this, event);
}
///////////////////////////////////////////////////////////////////////////
// GSocketBSD
static struct GSocketBaseFunctionsTable gs_base_functions =
{
GSocketBSD::_GSocket_Detected_Read,
GSocketBSD::_GSocket_Detected_Write
};
/* Global initialisers */
int GSocket_Init(void) int GSocket_Init(void)
{ {
return GSocketBSDGUIShim::GUI_Init(); if (!gs_gui_functions)
{
static class GSocketGUIFunctionsTableNull table;
gs_gui_functions = &table;
}
if ( !gs_gui_functions->OnInit() )
return 0;
return 1;
} }
void GSocket_Cleanup(void) void GSocket_Cleanup(void)
{ {
GSocketBSDGUIShim::GUI_Cleanup(); if (gs_gui_functions)
{
gs_gui_functions->OnExit();
}
} }
GSocketBSD::GSocketBSD() /* Constructors / Destructors for GSocket */
GSocket::GSocket()
{ {
int i; int i;
@@ -255,23 +249,32 @@ GSocketBSD::GSocketBSD()
/* 10 minutes * 60 sec * 1000 millisec */ /* 10 minutes * 60 sec * 1000 millisec */
m_establishing = FALSE; m_establishing = FALSE;
m_functions = &gs_base_functions; assert(gs_gui_functions);
/* Per-socket GUI-specific initialization */
m_ok = true; m_ok = gs_gui_functions->Init_Socket(this);
} }
void GSocketBSD::Close() void GSocket::Close()
{ {
EventLoop_Disable_Events(); gs_gui_functions->Disable_Events(this);
// gsockosx.c calls CFSocketInvalidate which closes the socket for us /* gsockosx.c calls CFSocketInvalidate which closes the socket for us */
#if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))) #if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
close(m_fd); close(m_fd);
#endif #endif
m_fd = INVALID_SOCKET; m_fd = INVALID_SOCKET;
} }
GSocketBSD::~GSocketBSD() GSocket::~GSocket()
{ {
assert(this);
/* Check that the socket is really shutdowned */
if (m_fd != INVALID_SOCKET)
Shutdown();
/* Per-socket GUI-specific cleanup */
gs_gui_functions->Destroy_Socket(this);
/* Destroy private addresses */ /* Destroy private addresses */
if (m_local) if (m_local)
GAddress_destroy(m_local); GAddress_destroy(m_local);
@@ -284,7 +287,7 @@ GSocketBSD::~GSocketBSD()
* Disallow further read/write operations on this socket, close * Disallow further read/write operations on this socket, close
* the fd and disable all callbacks. * the fd and disable all callbacks.
*/ */
void GSocketBSD::Shutdown() void GSocket::Shutdown()
{ {
int evt; int evt;
@@ -320,7 +323,7 @@ void GSocketBSD::Shutdown()
* GSOCK_INVSOCK - the socket is not valid. * GSOCK_INVSOCK - the socket is not valid.
* GSOCK_INVADDR - the address is not valid. * GSOCK_INVADDR - the address is not valid.
*/ */
GSocketError GSocketBSD::SetLocal(GAddress *address) GSocketError GSocket::SetLocal(GAddress *address)
{ {
assert(this); assert(this);
@@ -346,7 +349,7 @@ GSocketError GSocketBSD::SetLocal(GAddress *address)
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
GSocketError GSocketBSD::SetPeer(GAddress *address) GSocketError GSocket::SetPeer(GAddress *address)
{ {
assert(this); assert(this);
@@ -365,7 +368,7 @@ GSocketError GSocketBSD::SetPeer(GAddress *address)
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
GAddress *GSocketBSD::GetLocal() GAddress *GSocket::GetLocal()
{ {
GAddress *address; GAddress *address;
struct sockaddr addr; struct sockaddr addr;
@@ -410,7 +413,7 @@ GAddress *GSocketBSD::GetLocal()
return address; return address;
} }
GAddress *GSocketBSD::GetPeer() GAddress *GSocket::GetPeer()
{ {
assert(this); assert(this);
@@ -433,7 +436,7 @@ GAddress *GSocketBSD::GetPeer()
* GSOCK_INVADDR - the local address has not been set. * GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error. * GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocketBSD::SetServer() GSocketError GSocket::SetServer()
{ {
int arg = 1; int arg = 1;
@@ -470,12 +473,12 @@ GSocketError GSocketBSD::SetServer()
#else #else
ioctl(m_fd, FIONBIO, &arg); ioctl(m_fd, FIONBIO, &arg);
#endif #endif
EventLoop_Enable_Events(); gs_gui_functions->Enable_Events(this);
/* allow a socket to re-bind if the socket is in the TIME_WAIT /* allow a socket to re-bind if the socket is in the TIME_WAIT
state after being previously closed. state after being previously closed.
*/ */
if(m_reusable) if (m_reusable)
setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long)); setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
/* Bind to the local address, /* Bind to the local address,
@@ -508,7 +511,7 @@ GSocketError GSocketBSD::SetServer()
* GSOCK_MEMERR - couldn't allocate memory. * GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error. * GSOCK_IOERR - low-level error.
*/ */
GSocket *GSocketBSD::WaitConnection() GSocket *GSocket::WaitConnection()
{ {
struct sockaddr from; struct sockaddr from;
SOCKLEN_T fromlen = sizeof(from); SOCKLEN_T fromlen = sizeof(from);
@@ -533,7 +536,6 @@ GSocket *GSocketBSD::WaitConnection()
if (!connection) if (!connection)
{ {
delete connection;
m_error = GSOCK_MEMERR; m_error = GSOCK_MEMERR;
return NULL; return NULL;
} }
@@ -541,7 +543,7 @@ GSocket *GSocketBSD::WaitConnection()
/* Wait for a connection (with timeout) */ /* Wait for a connection (with timeout) */
if (Input_Timeout() == GSOCK_TIMEDOUT) if (Input_Timeout() == GSOCK_TIMEDOUT)
{ {
delete connection; GSocket_destroy(connection);
/* m_error set by _GSocket_Input_Timeout */ /* m_error set by _GSocket_Input_Timeout */
return NULL; return NULL;
} }
@@ -555,7 +557,7 @@ GSocket *GSocketBSD::WaitConnection()
else else
m_error = GSOCK_IOERR; m_error = GSOCK_IOERR;
delete connection; GSocket_destroy(connection);
return NULL; return NULL;
} }
@@ -567,7 +569,7 @@ GSocket *GSocketBSD::WaitConnection()
connection->m_peer = GAddress_new(); connection->m_peer = GAddress_new();
if (!connection->m_peer) if (!connection->m_peer)
{ {
delete connection; GSocket_destroy(connection);
m_error = GSOCK_MEMERR; m_error = GSOCK_MEMERR;
return NULL; return NULL;
} }
@@ -575,7 +577,7 @@ GSocket *GSocketBSD::WaitConnection()
if (err != GSOCK_NOERROR) if (err != GSOCK_NOERROR)
{ {
GAddress_destroy(connection->m_peer); GAddress_destroy(connection->m_peer);
delete connection; GSocket_destroy(connection);
m_error = err; m_error = err;
return NULL; return NULL;
} }
@@ -584,15 +586,15 @@ GSocket *GSocketBSD::WaitConnection()
#else #else
ioctl(connection->m_fd, FIONBIO, &arg); ioctl(connection->m_fd, FIONBIO, &arg);
#endif #endif
connection->EventLoop_Enable_Events(); gs_gui_functions->Enable_Events(connection);
return connection; return connection;
} }
int GSocketBSD::SetReusable() int GSocket::SetReusable()
{ {
/* socket must not be null, and must not be in use/already bound */ /* socket must not be null, and must not be in use/already bound */
if (NULL != this && m_fd == INVALID_SOCKET) { if (this && m_fd == INVALID_SOCKET) {
m_reusable = TRUE; m_reusable = TRUE;
return TRUE; return TRUE;
} }
@@ -624,7 +626,7 @@ int GSocketBSD::SetReusable()
* GSOCK_MEMERR - couldn't allocate memory. * GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error. * GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocketBSD::Connect(GSocketStream stream) GSocketError GSocket::Connect(GSocketStream stream)
{ {
int err, ret; int err, ret;
int arg = 1; int arg = 1;
@@ -665,7 +667,7 @@ GSocketError GSocketBSD::Connect(GSocketStream stream)
#else #else
ioctl(m_fd, FIONBIO, &arg); ioctl(m_fd, FIONBIO, &arg);
#endif #endif
EventLoop_Enable_Events(); gs_gui_functions->Enable_Events(this);
/* Connect it to the peer address, with a timeout (see below) */ /* Connect it to the peer address, with a timeout (see below) */
ret = connect(m_fd, m_peer->m_addr, m_peer->m_len); ret = connect(m_fd, m_peer->m_addr, m_peer->m_len);
@@ -736,7 +738,7 @@ GSocketError GSocketBSD::Connect(GSocketStream stream)
* GSOCK_INVADDR - the local address has not been set. * GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error. * GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocketBSD::SetNonOriented() GSocketError GSocket::SetNonOriented()
{ {
int arg = 1; int arg = 1;
@@ -771,7 +773,7 @@ GSocketError GSocketBSD::SetNonOriented()
#else #else
ioctl(m_fd, FIONBIO, &arg); ioctl(m_fd, FIONBIO, &arg);
#endif #endif
EventLoop_Enable_Events(); gs_gui_functions->Enable_Events(this);
/* Bind to the local address, /* Bind to the local address,
* and retrieve the actual address bound. * and retrieve the actual address bound.
@@ -792,7 +794,7 @@ GSocketError GSocketBSD::SetNonOriented()
/* Generic IO */ /* Generic IO */
/* Like recv(), send(), ... */ /* Like recv(), send(), ... */
int GSocketBSD::Read(char *buffer, int size) int GSocket::Read(char *buffer, int size)
{ {
int ret; int ret;
@@ -833,7 +835,7 @@ int GSocketBSD::Read(char *buffer, int size)
return ret; return ret;
} }
int GSocketBSD::Write(const char *buffer, int size) int GSocket::Write(const char *buffer, int size)
{ {
int ret; int ret;
@@ -897,9 +899,9 @@ int GSocketBSD::Write(const char *buffer, int size)
* performed. This function won't block, regardless of the * performed. This function won't block, regardless of the
* mode (blocking | nonblocking) of the socket. * mode (blocking | nonblocking) of the socket.
*/ */
GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags) GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
{ {
if (!GSocketBSDGUIShim::UseGUI()) if (!gs_gui_functions->CanUseEventLoop())
{ {
GSocketEventFlags result = 0; GSocketEventFlags result = 0;
@@ -1028,7 +1030,7 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
* Sets the socket to non-blocking mode. All IO calls will return * Sets the socket to non-blocking mode. All IO calls will return
* immediately. * immediately.
*/ */
void GSocketBSD::SetNonBlocking(int non_block) void GSocket::SetNonBlocking(int non_block)
{ {
assert(this); assert(this);
@@ -1041,7 +1043,7 @@ void GSocketBSD::SetNonBlocking(int non_block)
* Sets the timeout for blocking calls. Time is expressed in * Sets the timeout for blocking calls. Time is expressed in
* milliseconds. * milliseconds.
*/ */
void GSocketBSD::SetTimeout(unsigned long millisec) void GSocket::SetTimeout(unsigned long millisec)
{ {
assert(this); assert(this);
@@ -1053,7 +1055,7 @@ void GSocketBSD::SetTimeout(unsigned long millisec)
* operations do not clear this back to GSOCK_NOERROR, so use it only * operations do not clear this back to GSOCK_NOERROR, so use it only
* after an error. * after an error.
*/ */
GSocketError GSocketBSD::GetError() GSocketError WXDLLIMPEXP_NET GSocket::GetError()
{ {
assert(this); assert(this);
@@ -1090,7 +1092,7 @@ GSocketError GSocketBSD::GetError()
* *
* void function(GSocket *socket, GSocketEvent event, char *cdata) * void function(GSocket *socket, GSocketEvent event, char *cdata)
*/ */
void GSocketBSD::SetCallback(GSocketEventFlags flags, void GSocket::SetCallback(GSocketEventFlags flags,
GSocketCallback callback, char *cdata) GSocketCallback callback, char *cdata)
{ {
int count; int count;
@@ -1111,7 +1113,7 @@ void GSocketBSD::SetCallback(GSocketEventFlags flags,
* Disables all callbacks specified by 'flags', which may be a * Disables all callbacks specified by 'flags', which may be a
* combination of flags OR'ed toghether. * combination of flags OR'ed toghether.
*/ */
void GSocketBSD::UnsetCallback(GSocketEventFlags flags) void GSocket::UnsetCallback(GSocketEventFlags flags)
{ {
int count; int count;
@@ -1127,8 +1129,7 @@ void GSocketBSD::UnsetCallback(GSocketEventFlags flags)
} }
} }
GSocketError GSocket::GetSockOpt(int level, int optname,
GSocketError GSocketBSD::GetSockOpt(int level, int optname,
void *optval, int *optlen) void *optval, int *optlen)
{ {
if (getsockopt(m_fd, level, optname, optval, optlen) == 0) if (getsockopt(m_fd, level, optname, optval, optlen) == 0)
@@ -1138,7 +1139,7 @@ GSocketError GSocketBSD::GetSockOpt(int level, int optname,
return GSOCK_OPTERR; return GSOCK_OPTERR;
} }
GSocketError GSocketBSD::SetSockOpt(int level, int optname, GSocketError GSocket::SetSockOpt(int level, int optname,
const void *optval, int optlen) const void *optval, int optlen)
{ {
if (setsockopt(m_fd, level, optname, optval, optlen) == 0) if (setsockopt(m_fd, level, optname, optval, optlen) == 0)
@@ -1148,30 +1149,30 @@ GSocketError GSocketBSD::SetSockOpt(int level, int optname,
return GSOCK_OPTERR; return GSOCK_OPTERR;
} }
#define CALL_CALLBACK(event) { \ #define CALL_CALLBACK(socket, event) { \
Disable(event); \ socket->Disable(event); \
if (m_cbacks[event]) \ if (socket->m_cbacks[event]) \
m_cbacks[event](this, event, m_data[event]); \ socket->m_cbacks[event](socket, event, socket->m_data[event]); \
} }
void GSocketBSD::Enable(GSocketEvent event) void GSocket::Enable(GSocketEvent event)
{ {
m_detected &= ~(1 << event); m_detected &= ~(1 << event);
EventLoop_Install_Callback(event); gs_gui_functions->Install_Callback(this, event);
} }
void GSocketBSD::Disable(GSocketEvent event) void GSocket::Disable(GSocketEvent event)
{ {
m_detected |= (1 << event); m_detected |= (1 << event);
EventLoop_Uninstall_Callback(event); gs_gui_functions->Uninstall_Callback(this, event);
} }
/* _GSocket_Input_Timeout: /* _GSocket_Input_Timeout:
* For blocking sockets, wait until data is available or * For blocking sockets, wait until data is available or
* until timeout ellapses. * until timeout ellapses.
*/ */
GSocketError GSocketBSD::Input_Timeout() GSocketError GSocket::Input_Timeout()
{ {
struct timeval tv; struct timeval tv;
fd_set readfds; fd_set readfds;
@@ -1210,7 +1211,7 @@ GSocketError GSocketBSD::Input_Timeout()
* For blocking sockets, wait until data can be sent without * For blocking sockets, wait until data can be sent without
* blocking or until timeout ellapses. * blocking or until timeout ellapses.
*/ */
GSocketError GSocketBSD::Output_Timeout() GSocketError GSocket::Output_Timeout()
{ {
struct timeval tv; struct timeval tv;
fd_set writefds; fd_set writefds;
@@ -1258,12 +1259,12 @@ GSocketError GSocketBSD::Output_Timeout()
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
int GSocketBSD::Recv_Stream(char *buffer, int size) int GSocket::Recv_Stream(char *buffer, int size)
{ {
return recv(m_fd, buffer, size, 0); return recv(m_fd, buffer, size, 0);
} }
int GSocketBSD::Recv_Dgram(char *buffer, int size) int GSocket::Recv_Dgram(char *buffer, int size)
{ {
struct sockaddr from; struct sockaddr from;
SOCKLEN_T fromlen = sizeof(from); SOCKLEN_T fromlen = sizeof(from);
@@ -1299,7 +1300,7 @@ int GSocketBSD::Recv_Dgram(char *buffer, int size)
return ret; return ret;
} }
int GSocketBSD::Send_Stream(const char *buffer, int size) int GSocket::Send_Stream(const char *buffer, int size)
{ {
int ret; int ret;
@@ -1314,7 +1315,7 @@ int GSocketBSD::Send_Stream(const char *buffer, int size)
return ret; return ret;
} }
int GSocketBSD::Send_Dgram(const char *buffer, int size) int GSocket::Send_Dgram(const char *buffer, int size)
{ {
struct sockaddr *addr; struct sockaddr *addr;
int len, ret; int len, ret;
@@ -1347,7 +1348,7 @@ int GSocketBSD::Send_Dgram(const char *buffer, int size)
return ret; return ret;
} }
void GSocketBSD::Detected_Read() void GSocket::Detected_Read()
{ {
char c; char c;
@@ -1358,30 +1359,30 @@ void GSocketBSD::Detected_Read()
{ {
m_establishing = FALSE; m_establishing = FALSE;
CALL_CALLBACK(GSOCK_LOST); CALL_CALLBACK(this, GSOCK_LOST);
Shutdown(); Shutdown();
return; return;
} }
if (recv(m_fd, &c, 1, MSG_PEEK) > 0) if (recv(m_fd, &c, 1, MSG_PEEK) > 0)
{ {
CALL_CALLBACK(GSOCK_INPUT); CALL_CALLBACK(this, GSOCK_INPUT);
} }
else else
{ {
if (m_server && m_stream) if (m_server && m_stream)
{ {
CALL_CALLBACK(GSOCK_CONNECTION); CALL_CALLBACK(this, GSOCK_CONNECTION);
} }
else else
{ {
CALL_CALLBACK(GSOCK_LOST); CALL_CALLBACK(this, GSOCK_LOST);
Shutdown(); Shutdown();
} }
} }
} }
void GSocketBSD::Detected_Write() void GSocket::Detected_Write()
{ {
/* If we have already detected a LOST event, then don't try /* If we have already detected a LOST event, then don't try
* to do any further processing. * to do any further processing.
@@ -1390,7 +1391,7 @@ void GSocketBSD::Detected_Write()
{ {
m_establishing = FALSE; m_establishing = FALSE;
CALL_CALLBACK(GSOCK_LOST); CALL_CALLBACK(this, GSOCK_LOST);
Shutdown(); Shutdown();
return; return;
} }
@@ -1406,52 +1407,35 @@ void GSocketBSD::Detected_Write()
if (error) if (error)
{ {
CALL_CALLBACK(GSOCK_LOST); CALL_CALLBACK(this, GSOCK_LOST);
Shutdown(); Shutdown();
} }
else else
{ {
CALL_CALLBACK(GSOCK_CONNECTION); CALL_CALLBACK(this, GSOCK_CONNECTION);
/* We have to fire this event by hand because CONNECTION (for clients) /* We have to fire this event by hand because CONNECTION (for clients)
* and OUTPUT are internally the same and we just disabled CONNECTION * and OUTPUT are internally the same and we just disabled CONNECTION
* events with the above macro. * events with the above macro.
*/ */
CALL_CALLBACK(GSOCK_OUTPUT); CALL_CALLBACK(this, GSOCK_OUTPUT);
} }
} }
else else
{ {
CALL_CALLBACK(GSOCK_OUTPUT); CALL_CALLBACK(this, GSOCK_OUTPUT);
} }
} }
/* Compatibility functions for GSocket */ /* Compatibility functions for GSocket */
GSocket *GSocket_new(void) GSocket *GSocket_new(void)
{ {
GSocket *newsocket = new GSocketBSDGUIShim(); GSocket *newsocket = new GSocket();
if(newsocket->IsOk()) if(newsocket->IsOk())
return newsocket; return newsocket;
delete newsocket; delete newsocket;
return NULL; return NULL;
} }
void GSocket_destroy(GSocket *socket)
{
assert(socket);
/* Check that the socket is really shutdowned */
if (socket->m_fd != INVALID_SOCKET)
socket->Shutdown();
delete socket;
}
void GSocketBSD::_GSocket_Detected_Read(GSocket *socket)
{ socket->Detected_Read(); }
void GSocketBSD::_GSocket_Detected_Write(GSocket *socket)
{ socket->Detected_Write(); }
/* /*
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
* GAddress * GAddress
@@ -1659,7 +1643,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
#else #else
/* Use gethostbyname by default */ /* Use gethostbyname by default */
#ifndef __WXMAC__ #ifndef __WXMAC__
int val = 1; //VA doesn't like constants in conditional expressions at all int val = 1; /* VA doesn't like constants in conditional expressions */
if (val) if (val)
#endif #endif
{ {