X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09e6e5ec02fdcf888062ac8a52fada2017608950..f499ca450c3863cea52f7b7f77aa7eecc942b552:/include/wx/unix/gsockunx.h diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h index e5eefa2c4e..c4a5ba3773 100644 --- a/include/wx/unix/gsockunx.h +++ b/include/wx/unix/gsockunx.h @@ -1,8 +1,10 @@ /* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockunx.h - * Purpose: GSocket Unix header - * CVSID: $Id$ + * Project: GSocket (Generic Socket) for WX + * Name: gsockunx.h + * Copyright: (c) Guilhem Lavaux + * Licence: wxWindows Licence + * Purpose: GSocket Unix header + * CVSID: $Id$ * ------------------------------------------------------------------------- */ @@ -21,20 +23,25 @@ #include "gsocket.h" #endif -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef FALSE -#define FALSE 0 -#endif +class GSocketGUIFunctionsTableConcrete: 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); +}; -#ifdef wxUSE_GSOCKET_CPLUSPLUS -class GSocketBSD +class GSocket { public: - GSocketBSD(); - ~GSocketBSD(); + GSocket(); + virtual ~GSocket(); bool IsOk() { return m_ok; } void Close(); void Shutdown(); @@ -44,20 +51,23 @@ public: GAddress *GetPeer(); GSocketError SetServer(); GSocket *WaitConnection(); + bool SetReusable(); GSocketError Connect(GSocketStream stream); GSocketError SetNonOriented(); int Read(char *buffer, int size); int Write(const char *buffer, int size); GSocketEventFlags Select(GSocketEventFlags flags); - void SetNonBlocking(int non_block); + void SetNonBlocking(bool non_block); void SetTimeout(unsigned long millisec); - GSocketError GetError(); + GSocketError WXDLLIMPEXP_NET GetError(); void SetCallback(GSocketEventFlags flags, GSocketCallback callback, char *cdata); void UnsetCallback(GSocketEventFlags flags); - /* API compatibility functions */ - static void _GSocket_Detected_Read(GSocket *socket); - static void _GSocket_Detected_Write(GSocket *socket); + GSocketError GetSockOpt(int level, int optname, void *optval, int *optlen); + GSocketError SetSockOpt(int level, int optname, + const void *optval, int optlen); + virtual void Detected_Read(); + virtual void Detected_Write(); protected: void Enable(GSocketEvent event); void Disable(GSocketEvent event); @@ -67,31 +77,20 @@ protected: int Recv_Dgram(char *buffer, int size); int Send_Stream(const char *buffer, int size); int Send_Dgram(const char *buffer, int size); - void Detected_Read(); - void Detected_Write(); bool m_ok; public: -//DFE: We can't protect these data member until the GUI code is updated -//protected: -#else //def wxUSE_GSOCKET_CPLUSPLUS - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ -/* Definition of GSocket */ -struct _GSocket -{ -#endif //def wxUSE_GSOCKET_CPLUSPLUS + /* DFE: We can't protect these data member until the GUI code is updated */ + /* protected: */ int m_fd; GAddress *m_local; GAddress *m_peer; GSocketError m_error; - int m_non_blocking; - int m_server; - int m_stream; - int m_oriented; - int m_establishing; + bool m_non_blocking; + bool m_server; + bool m_stream; + bool m_establishing; + bool m_reusable; unsigned long m_timeout; /* Callbacks */ @@ -101,14 +100,7 @@ struct _GSocket char *m_gui_dependent; - /* Function pointers */ - struct GSocketBaseFunctionsTable *m_functions; }; -#ifndef wxUSE_GSOCKET_CPLUSPLUS -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif //ndef wxUSE_GSOCKET_CPLUSPLUS #ifdef __cplusplus extern "C" { @@ -128,77 +120,11 @@ struct _GAddress } #endif /* __cplusplus */ -// Compatibility methods to support old C API (from gsocket.h) -#ifdef wxUSE_GSOCKET_CPLUSPLUS -inline void GSocket_Shutdown(GSocket *socket) -{ socket->Shutdown(); } -inline GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address) -{ return socket->SetLocal(address); } -inline GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address) -{ return socket->SetPeer(address); } -inline GAddress *GSocket_GetLocal(GSocket *socket) -{ return socket->GetLocal(); } -inline GAddress *GSocket_GetPeer(GSocket *socket) -{ return socket->GetPeer(); } -inline GSocketError GSocket_SetServer(GSocket *socket) -{ return socket->SetServer(); } -inline GSocket *GSocket_WaitConnection(GSocket *socket) -{ return socket->WaitConnection(); } -inline GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream) -{ return socket->Connect(stream); } -inline GSocketError GSocket_SetNonOriented(GSocket *socket) -{ return socket->SetNonOriented(); } -inline int GSocket_Read(GSocket *socket, char *buffer, int size) -{ return socket->Read(buffer,size); } -inline int GSocket_Write(GSocket *socket, const char *buffer, int size) -{ return socket->Write(buffer,size); } -inline GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) -{ return socket->Select(flags); } -inline void GSocket_SetNonBlocking(GSocket *socket, int non_block) -{ socket->SetNonBlocking(non_block); } -inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec) -{ socket->SetTimeout(millisec); } -inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags, - GSocketCallback fallback, char *cdata) -{ socket->SetCallback(flags,fallback,cdata); } -inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags) -{ socket->UnsetCallback(flags); } - -#endif //def wxUSE_GSOCKET_CPLUSPLUS #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -/* Input / Output */ - -GSocketError _GSocket_Input_Timeout(GSocket *socket); -GSocketError _GSocket_Output_Timeout(GSocket *socket); -int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size); -int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size); -int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size); -int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size); - -/* Callbacks */ - -int _GSocket_GUI_Init(void); -void _GSocket_GUI_Cleanup(void); - -int _GSocket_GUI_Init_Socket(GSocket *socket); -void _GSocket_GUI_Destroy_Socket(GSocket *socket); - -void _GSocket_Enable_Events(GSocket *socket); -void _GSocket_Disable_Events(GSocket *socket); -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event); -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event); - -void _GSocket_Enable(GSocket *socket, GSocketEvent event); -void _GSocket_Disable(GSocket *socket, GSocketEvent event); - -#ifndef wxUSE_GSOCKET_CPLUSPLUS -void _GSocket_Detected_Read(GSocket *socket); -void _GSocket_Detected_Write(GSocket *socket); -#endif //ndef wxUSE_GSOCKET_CPLUSPLUS /* GAddress */