X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e27c99c7504d9168ee0ddd6043f942fd230027bc..702f5349c6468baae69ce6b7b2c780c3be57ee7c:/include/wx/msw/gsockmsw.h diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h index 84a6598e4d..fe5d5a2942 100644 --- a/include/wx/msw/gsockmsw.h +++ b/include/wx/msw/gsockmsw.h @@ -1,188 +1,72 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockmsw.h - * Purpose: GSocket MSW header - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ - -#ifndef __GSOCK_MSW_H -#define __GSOCK_MSW_H - -#ifndef __GSOCKET_STANDALONE__ -#include "wx/setup.h" -#endif - -#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) - -#ifndef __GSOCKET_STANDALONE__ -#include "wx/gsocket.h" -#else -#include "gsocket.h" -#endif +///////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/gsockmsw.h +// Purpose: MSW-specific socket implementation +// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin +// Created: April 1997 +// Copyright: (C) 1999-1997, Guilhem Lavaux +// (C) 1999-2000, Guillermo Rodriguez Garcia +// (C) 2008 Vadim Zeitlin +// RCS_ID: $Id$ +// License: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + + +#ifndef _WX_MSW_GSOCKMSW_H_ +#define _WX_MSW_GSOCKMSW_H_ #include "wx/msw/wrapwin.h" -#ifndef TRUE -#define TRUE 1 +#if defined(__CYGWIN__) + //CYGWIN gives annoying warning about runtime stuff if we don't do this +# define USE_SYS_TYPES_FD_SET +# include #endif -#ifndef FALSE -#define FALSE 0 +#if defined(__WXWINCE__) || defined(__CYGWIN__) + #include #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 Enable_Events(GSocket *socket); - virtual void Disable_Events(GSocket *socket); -}; +// ---------------------------------------------------------------------------- +// MSW-specific socket implementation +// ---------------------------------------------------------------------------- -/* Definition of GSocket */ -class GSocket +class wxSocketImplMSW : public wxSocketImpl { public: - GSocket(); - ~GSocket(); - bool IsOk() { return m_ok; } - void Close(); - void Shutdown(); - GSocketError SetLocal(GAddress *address); - GSocketError SetPeer(GAddress *address); - GAddress *GetLocal(); - GAddress *GetPeer(); - GSocketError SetServer(); - GSocket *WaitConnection(); - int 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(bool non_block); - void SetTimeout(unsigned long millis); - GSocketError WXDLLIMPEXP_NET GetError(); - void SetCallback(GSocketEventFlags flags, - GSocketCallback callback, char *cdata); - void UnsetCallback(GSocketEventFlags flags); - GSocketError GetSockOpt(int level, int optname, - void *optval, int *optlen); - GSocketError SetSockOpt(int level, int optname, - const void *optval, int optlen); -protected: - GSocketError Input_Timeout(); - GSocketError Output_Timeout(); - GSocketError Connect_Timeout(); - int Recv_Stream(char *buffer, int size); - int Recv_Dgram(char *buffer, int size); - int Send_Stream(const char *buffer, int size); - int Send_Dgram(const char *buffer, int size); - bool m_ok; - -/* TODO: Make these protected */ -public: - SOCKET m_fd; - GAddress *m_local; - GAddress *m_peer; - GSocketError m_error; - - /* Attributes */ - int m_non_blocking; - int m_server; - int m_stream; - int m_establishing; - int m_reusable; - struct timeval m_timeout; - - /* Callbacks */ - GSocketEventFlags m_detected; - GSocketCallback m_cbacks[GSOCK_MAX_EVENT]; - char *m_data[GSOCK_MAX_EVENT]; - int m_msgnumber; -}; + wxSocketImplMSW(wxSocketBase& wxsocket); -/* TODO: Fix src/common/socket.cpp to use the new API */ -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 int GSocket_SetReusable(GSocket *socket) -{ return socket->SetReusable(); } -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 != 0); } -inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec) -{ socket->SetTimeout(millisec); } -inline GSocketError GSocket_GetError(GSocket *socket) -{ return socket->GetError(); } -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); } -inline GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname, - void *optval, int *optlen) -{ return socket->GetSockOpt(level,optname,optval,optlen); } -inline GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname, - const void *optval, int optlen) -{ return socket->SetSockOpt(level,optname,optval,optlen); } -inline void GSocket_destroy(GSocket *socket) -{ delete socket; } - -#ifdef __cplusplus -extern "C" { -#endif + virtual ~wxSocketImplMSW(); -/* Definition of GAddress */ -struct _GAddress -{ - struct sockaddr *m_addr; - size_t m_len; + virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket); - GAddressType m_family; - int m_realfamily; - GSocketError m_error; -}; + int Read(char *buffer, int size); + int Write(const char *buffer, int size); +private: + virtual wxSocketError DoHandleConnect(int ret); + virtual void DoClose(); -/* GAddress */ + virtual void UnblockAndRegisterWithEventLoop() + { + // no need to make the socket non-blocking, Install_Callback() will do + // it + wxSocketManager::Get()->Install_Callback(this); + } -GSocketError _GAddress_translate_from(GAddress *address, - struct sockaddr *addr, int len); -GSocketError _GAddress_translate_to (GAddress *address, - struct sockaddr **addr, int *len); -GSocketError _GAddress_Init_INET(GAddress *address); -GSocketError _GAddress_Init_UNIX(GAddress *address); + wxSocketError Input_Timeout(); + wxSocketError Output_Timeout(); + wxSocketError Connect_Timeout(); + int Recv_Stream(char *buffer, int size); + int Recv_Dgram(char *buffer, int size); + int Send_Stream(const char *buffer, int size); + int Send_Dgram(const char *buffer, int size); -#ifdef __cplusplus -} -#endif + int m_msgnumber; + + friend class wxSocketMSWManager; -#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ + DECLARE_NO_COPY_CLASS(wxSocketImplMSW) +}; -#endif /* __GSOCK_MSW_H */ +#endif /* _WX_MSW_GSOCKMSW_H_ */