#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
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+#include "wx/msw/wrapwin.h"
+#else
+#include <windows.h>
#include <winsock.h>
+#endif
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
-#ifdef __cplusplus
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+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);
+};
+#endif /* def wxUSE_GSOCKET_CPLUSPLUS */
+
+#if defined(__cplusplus) && !defined wxUSE_GSOCKET_CPLUSPLUS
extern "C" {
#endif
/* Definition of GSocket */
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+class GSocket
+#else
struct _GSocket
+#endif
{
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+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:
+#endif /* def wxUSE_GSOCKET_CPLUSPLUS */
SOCKET m_fd;
GAddress *m_local;
GAddress *m_peer;
GSocketError m_error;
- bool m_non_blocking;
- bool m_server;
- bool m_stream;
- bool m_oriented;
+ /* 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;
};
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+/* 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; }
+#endif /* def wxUSE_GSOCKET_CPLUSPLUS */
+
+#if defined(__cplusplus) && !defined wxUSE_GSOCKET_CPLUSPLUS
+}
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Definition of GAddress */
struct _GAddress
{
GSocketError m_error;
};
-
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
/* Input / output */
GSocketError _GSocket_Input_Timeout(GSocket *socket);
GSocketError _GSocket_Output_Timeout(GSocket *socket);
+GSocketError _GSocket_Connect_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);
/* Callbacks */
-void _GSocket_Configure_Callbacks(GSocket *socket);
+int _GSocket_GUI_Init(void);
+void _GSocket_GUI_Cleanup(void);
+int _GSocket_GUI_Init_Socket(GSocket *socket);
+void _GSocket_GUI_Destroy_Socket(GSocket *socket);
+
LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
+void _GSocket_Enable_Events(GSocket *socket);
+void _GSocket_Disable_Events(GSocket *socket);
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
+
/* GAddress */
GSocketError _GAddress_translate_from(GAddress *address,
struct sockaddr *addr, int len);
-
-GSocketError _GAddress_translate_to(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);
}
#endif
+#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+
#endif /* __GSOCK_MSW_H */
projects / wxWidgets.git / blobdiff