// #pragma implementation "socket.cpp"
#endif
+#ifdef __MWERKS__
+typedef int socklen_t ;
+#endif
+
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include <wx/timer.h>
#include <wx/utils.h>
+// Not enough OS behaviour defined for wxStubs
+#ifndef __WXSTUBS__
+
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
/////////////////////////////////////////////////////////////////////////////
// System specific headers
/////////////////////////////////////////////////////////////////////////////
+#ifdef __WXMAC__
+// in order to avoid problems with our c library and double definitions
+#define close closesocket
+#define ioctl ioctlsocket
+
+#include <wx/mac/macsock.h>
+extern GUSISpinFn GUSISpin;
+#define PROCESS_EVENTS() wxMacProcessEvents()
+const short kwxMacNetEventsMax = 1000 ;
+short wxMacNetEventsTop = 0 ;
+short wxMacNetEventsBottom = 0 ;
+short wxMacNetEventsEvents[kwxMacNetEventsMax] ;
+void *wxMacNetEventsReferences[kwxMacNetEventsMax] ;
+
+#define FD_READ 1
+#define FD_WRITE 2
+#define FD_CLOSE 4
+#define FD_ACCEPT 8
+#define FD_CONNECT 16
+#define FD_READY 32
+
+extern "C" void wxMacSocketHandlerProc( void *refcon , short event ) ; // adds events
+extern "C" void wxMacSocketOnRequestProc( void *refcon , short event ) ; // consumes them
+extern "C" void GUSISetReference( short sock , short eventmask , void * data ) ;
+void wxMacProcessEvents() ;
+#endif
+
#if defined(__WINDOWS__)
#include <winsock.h>
#endif // __WINDOWS__
/////////////////////////////////////////////////////////////////////////////
// wxSocket headers
/////////////////////////////////////////////////////////////////////////////
+#include "wx/module.h"
#define WXSOCK_INTERNAL
#include "wx/sckaddr.h"
#include "wx/socket.h"
#endif
#ifdef __WXMOTIF__
-#define wxAPP_CONTEXT wxTheApp->appContext
+#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())
#endif
#ifdef __WINDOWS__
#if defined( NEED_WSAFDIsSet ) || defined( _MSC_VER )
int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
{
- int i = set->fd_count;
+ int i = set->fd_count;
- while (i--)
- {
- if (set->fd_array[i] == fd)
- return 1;
- }
+ while (i--)
+ {
+ if (set->fd_array[i] == fd)
+ return 1;
+ }
- return 0;
+ return 0;
}
#endif
#endif
// Some patch ///// END
/////////////////////////////////////////////////////////////////////////////
+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+
+// --------------------------------------------------------------
+// Module
+// --------------------------------------------------------------
+class wxSocketModule: public wxModule
+{
+ DECLARE_DYNAMIC_CLASS(wxSocketModule)
+public:
+ wxSocketModule() {}
+ bool OnInit();
+ void OnExit();
+};
+
// --------------------------------------------------------------
// ClassInfos
// --------------------------------------------------------------
IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
IMPLEMENT_CLASS(wxSocketHandler, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
#endif
-class wxSockWakeUp : public wxTimer {
+class wxSockWakeUp : public wxTimer
+{
public:
int *my_id;
int n_val;
wxSocketBase *sock;
- wxSockWakeUp(wxSocketBase *_sock, int *id, int new_val) {
+ wxSockWakeUp(wxSocketBase *_sock, int *id, int new_val)
+ {
my_id = id; n_val = new_val;
sock = _sock;
}
- virtual void Notify() {
+ virtual void Notify()
+ {
*my_id = n_val;
if (sock) sock->Notify(FALSE);
}
};
/// Socket request
-class SockRequest : public wxObject {
+class SockRequest : public wxObject
+{
public:
char *buffer;
size_t size, nbytes;
// --------- wxSocketBase CONSTRUCTOR ---------------------------
// --------------------------------------------------------------
wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
- wxSocketBase::wxSockType _type) :
+ wxSocketBase::wxSockType _type) :
wxEvtHandler(),
m_flags(_flags), m_type(_type), m_connected(FALSE), m_connecting(FALSE),
m_fd(INVALID_SOCKET), m_waitflags(0), m_cbk(0), m_cdata(0), m_id(-1),
}
// --------------------------------------------------------------
-// --------- wxSocketBase CONSTRUCTOR ---------------------------
+// wxSocketBase
// --------------------------------------------------------------
+
wxSocketBase::~wxSocketBase()
{
DestroyCallbacks();
if (m_unread)
free(m_unread);
- if (m_handler) {
+ if (m_handler)
+ {
#ifdef __WINDOWS__
if (m_internal->my_msg)
m_handler->DestroyMessage(m_internal->my_msg);
bool wxSocketBase::Close()
{
- if (m_fd != INVALID_SOCKET) {
- for (int i=0;i<3;i++) {
+ if (m_fd != INVALID_SOCKET)
+ {
+ for (int i=0;i<3;i++)
+ {
wxNode *n, *node = req_list[i].First();
- while (node) {
+ while (node)
+ {
SockRequest *req = (SockRequest *)node->Data();
req->done = TRUE;
}
// --------------------------------------------------------------
-// --------- wxSocketBase base IO functions ---------------------
+// wxSocketBase base IO function
// --------------------------------------------------------------
+
wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
{
m_lcount = GetPushback(buffer, nbytes, FALSE);
size_t nbytes_old = nbytes;
nbytes -= GetPushback(buffer, nbytes, TRUE);
- if (!nbytes) {
+ if (!nbytes)
+ {
m_lcount = nbytes_old;
return *this;
}
{
SockMsg msg;
+ // warning about 'cast truncates constant value'
+#ifdef _MSC_VER
+ #pragma warning(disable: 4310)
+#endif // _MSC_VER
+
msg.sig[0] = (char) 0xad;
msg.sig[1] = (char) 0xde;
msg.sig[2] = (char) 0xed;
Write((char *)&msg, sizeof(msg));
return *this;
+
+#ifdef _MSC_VER
+ #pragma warning(default: 4310)
+#endif // _MSC_VER
}
wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
SaveState();
SetFlags((wxSockFlags)(NOWAIT | SPEED));
- while (recv_size == MAX_BUFSIZE) {
+ while (recv_size == MAX_BUFSIZE)
+ {
recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
}
#undef MAX_BUFSIZE
}
+// If what? Who seems to need unsigned int?
+// BTW uint isn't even defined on wxMSW for VC++ for some reason. Even if it
+// were, getpeername/getsockname don't take unsigned int*, they take int*.
+//
+// Under glibc 2.0.7, socketbits.h declares socklen_t to be unsigned int
+// and it uses *socklen_t as the 3rd parameter. Robert.
+
+// JACS - How can we detect this?
+// Meanwhile, if your compiler complains about socklen_t,
+// switch lines below.
+
+#if wxHAVE_GLIBC2
+# define wxSOCKET_INT socklen_t
+#else
+# define wxSOCKET_INT int
+#endif
+
// --------------------------------------------------------------
-// --------- wxSocketBase socket info functions -----------------
+// wxSocketBase socket info functions
// --------------------------------------------------------------
+
bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
{
struct sockaddr my_addr;
- size_t len_addr = sizeof(my_addr);
+ wxSOCKET_INT len_addr = sizeof(my_addr);
if (m_fd < 0)
return FALSE;
- if (getpeername(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)
+ if (getpeername(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0)
return FALSE;
addr_man.Disassemble(&my_addr, len_addr);
bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
{
struct sockaddr my_addr;
- size_t len_addr = sizeof(my_addr);
+ wxSOCKET_INT len_addr = sizeof(my_addr);
if (m_fd < 0)
return FALSE;
- if (getsockname(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)
+ if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0)
+
return FALSE;
addr_man.Disassemble(&my_addr, len_addr);
}
// --------------------------------------------------------------
-// --------- wxSocketBase wait functions ------------------------
+// wxSocketBase wait functions
// --------------------------------------------------------------
+
void wxSocketBase::SaveState()
{
wxSockState *state = new wxSockState;
// --------------------------------------------------------------
// --------- wxSocketBase wait functions ------------------------
// --------------------------------------------------------------
-//
+
bool wxSocketBase::_Wait(long seconds, long microseconds, int type)
{
if ((!m_connected && !m_connecting) || m_fd < 0)
RestoreState();
- if (m_waitflags & 0x40) {
+ if (m_waitflags & 0x40)
+ {
m_waitflags = 0;
return TRUE;
}
#if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
#if defined(__WXMOTIF__) || defined(__WXXT__)
static void wx_socket_read(XtPointer client, int *fid,
- XtInputId *WXUNUSED(id))
+ XtInputId *WXUNUSED(id))
#define fd *fid
#else
static void wx_socket_read(gpointer client, gint fd,
i = recv(fd, &c, 1, MSG_PEEK);
- if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) {
+ if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT))
+ {
sock->OnRequest(wxSocketBase::EVT_ACCEPT);
return;
}
- if (i != 0) {
+ if (i != 0)
+ {
if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
+ {
return;
+ }
sock->OnRequest(wxSocketBase::EVT_READ);
- } else {
- if (!(sock->NeededReq() & wxSocketBase::REQ_LOST)) {
+ }
+ else
+ {
+ if (!(sock->NeededReq() & wxSocketBase::REQ_LOST))
+ {
sock->Close();
return;
}
#if defined(__WXMOTIF__) || defined(__WXXT__)
static void wx_socket_write(XtPointer client, int *WXUNUSED(fid),
- XtInputId *WXUNUSED(id))
+ XtInputId *WXUNUSED(id))
#else
static void wx_socket_write(gpointer client, gint WXUNUSED(fd),
- GdkInputCondition WXUNUSED(cond))
+ GdkInputCondition WXUNUSED(cond))
#endif
{
wxSocketBase *sock = (wxSocketBase *)client;
i = recv(fd, &c, 1, MSG_PEEK);
- if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) {
+ if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT))
+ {
sock->OnRequest(wxSocketBase::EVT_ACCEPT);
return;
}
/* Bytes arrived */
- if (i != 0) {
+ if (i != 0)
+ {
if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
return (Notify_value) FALSE;
sock->OnRequest(wxSocketBase::EVT_READ);
- } else {
+ }
+ else
+ {
if (!(sock->NeededReq() & wxSocketBase::REQ_LOST))
return;
wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt)
{
- switch (evt) {
+ switch (evt)
+ {
case EVT_READ:
return REQ_READ;
case EVT_PEEK:
void wxSocketBase::SetFlags(wxSockFlags _flags)
{
m_flags = _flags;
- if (_flags & SPEED) {
+ if (_flags & SPEED)
+ {
unsigned long flag = 0;
ioctl(m_fd, FIONBIO, &flag);
m_flags = (wxSockFlags)(m_flags & ~WAITALL);
Notify(FALSE);
- } else {
+ }
+ else
+ {
unsigned long flag = 1;
ioctl(m_fd, FIONBIO, &flag);
}
void wxSocketBase::SetNotify(wxRequestNotify flags)
{
wxRequestNotify old_needed_req = m_neededreq;
- if (flags & REQ_ACCEPT) {
+ if (flags & REQ_ACCEPT)
+ {
/* Check if server */
if (!(GetClassInfo()->IsKindOf(CLASSINFO(wxSocketServer))))
flags &= ~REQ_ACCEPT;
}
m_neededreq = flags;
- if (m_cbkon && old_needed_req != flags)
+
+/*
+ if (m_cbkon && old_needed_req != flags) seems to be wrong, Robert Roebling
+ SetupCallbacks();
+*/
+
+ if (old_needed_req != flags)
SetupCallbacks();
}
if (m_fd == INVALID_SOCKET || !m_handler || (m_flags & SPEED))
return;
-#if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
- if (m_cbkon)
- DestroyCallbacks();
- if (m_neededreq & (REQ_ACCEPT | REQ_READ | REQ_LOST)) {
-#ifdef __WXGTK__
- m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_READ,
- wx_socket_read, (gpointer)this);
-#else
- m_internal->sock_inputid = XtAppAddInput (wxAPP_CONTEXT, m_fd,
+#if defined(__WXMOTIF__) || defined(__WXXT__)
+ if (m_neededreq & (REQ_ACCEPT | REQ_READ | REQ_LOST))
+ {
+ if (m_internal->sock_inputid <= 0)
+ {
+ m_internal->sock_inputid = XtAppAddInput (wxAPP_CONTEXT, m_fd,
(XtPointer *) XtInputReadMask,
(XtInputCallbackProc) wx_socket_read,
(XtPointer) this);
-#endif
+ }
}
- if (m_neededreq & (REQ_CONNECT | REQ_WRITE)) {
-#ifdef __WXGTK__
- m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_WRITE,
- wx_socket_write, (gpointer)this);
-#else
- m_internal->sock_outputid = XtAppAddInput (wxAPP_CONTEXT, m_fd,
+ else
+ {
+ if (m_internal->sock_inputid > 0)
+ {
+ XtRemoveInput(m_internal->sock_inputid);
+ m_internal->sock_inputid = 0;
+ }
+ }
+
+ if (m_neededreq & (REQ_CONNECT | REQ_WRITE))
+ {
+ if (m_internal->sock_outputid <= 0)
+ {
+ m_internal->sock_outputid = XtAppAddInput (wxAPP_CONTEXT, m_fd,
(XtPointer *) XtInputWriteMask,
(XtInputCallbackProc) wx_socket_write,
(XtPointer) this);
+ }
+ }
+ else
+ {
+ if (m_internal->sock_outputid > 0)
+ {
+ XtRemoveInput(m_internal->sock_outputid);
+ m_internal->sock_outputid = 0;
+ }
+ }
#endif
+
+
+#ifdef __WXGTK__
+ if (m_neededreq & (REQ_ACCEPT | REQ_READ | REQ_LOST))
+ {
+ if (m_internal->sock_inputid <= 0)
+ {
+ m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_READ,
+ wx_socket_read, (gpointer)this);
+ }
+ }
+ else
+ {
+ if (m_internal->sock_inputid > 0)
+ {
+/*
+ gdk_input_remove(m_internal->sock_inputid);
+ m_internal->sock_inputid = 0;
+*/
+ }
+ }
+
+ if (m_neededreq & (REQ_CONNECT | REQ_WRITE))
+ {
+ if (m_internal->sock_outputid <= 0)
+ {
+ m_internal->sock_outputid = gdk_input_add(m_fd, GDK_INPUT_WRITE,
+ wx_socket_write, (gpointer)this);
+ }
+ }
+ else
+ {
+ if (m_internal->sock_outputid > 0)
+ {
+/*
+ gdk_input_remove(m_internal->sock_outputid);
+ m_internal->sock_outputid = 0;
+*/
+ }
}
#endif
-#ifdef __WINDOWS__
+
+
+#ifdef __WXMSW__
WORD mask = 0;
if (m_neededreq & REQ_READ)
if (!m_internal->my_msg)
m_internal->my_msg = m_handler->NewMessage(this);
WSAAsyncSelect(m_fd, m_handler->GetHWND(), m_internal->my_msg, mask);
+#endif
+#ifdef __WXMAC__
+ short mask = 0;
+
+ if (m_neededreq & REQ_READ)
+ mask |= FD_READ;
+ if (m_neededreq & REQ_WRITE)
+ mask |= FD_WRITE;
+ if (m_neededreq & REQ_LOST)
+ mask |= FD_CLOSE;
+ if (m_neededreq & REQ_ACCEPT)
+ mask |= FD_ACCEPT;
+ if (m_neededreq & REQ_CONNECT)
+ mask |= FD_CONNECT;
+
+ GUSISetReference( m_fd ,mask, this ) ;
+ unsigned long flag = 1;
+ ioctl(m_fd, FIONBIO, &flag);
#endif
m_cbkon = TRUE;
m_processing = FALSE;
{
if (!m_cbkon || !m_handler)
return;
+
m_cbkon = FALSE;
m_processing = FALSE;
#if defined(__WXMOTIF__) || defined(__WXXT__)
#ifdef __WINDOWS__
WSAAsyncSelect(m_fd, m_handler->GetHWND(), 0, 0);
#endif
+#ifdef __WXMAC__
+ GUSISetReference( m_fd , 0 , 0 ) ;
+ int bottom = wxMacNetEventsBottom ;
+ while ( wxMacNetEventsTop != bottom )
+ {
+ // set all events that reference this socket to nil
+ if ( wxMacNetEventsReferences[bottom] == (void*) this )
+ wxMacNetEventsReferences[bottom] = NULL ;
+ bottom++ ;
+ if ( bottom == kwxMacNetEventsMax )
+ bottom = 0 ;
+ }
+ SetFlags( m_flags ) ;
+#endif
}
void wxSocketBase::Notify(bool notify)
wxRequestNotify req_notif = EventToNotify(req_evt);
// Mask the current event
- SetNotify(m_neededreq & ~req_notif);
-
+ SetNotify(m_neededreq & ~req_notif);
+
if (req_evt <= EVT_WRITE && DoRequests(req_evt))
return;
- if (m_waitflags & 0xF0) {
+ if (m_waitflags & 0xF0)
+ {
// Wake up
- if ((m_waitflags & 0x0F) == req_evt) {
+ if ((m_waitflags & 0x0F) == req_evt)
+ {
m_waitflags = 0x80;
#ifndef __WXGTK__
- DestroyCallbacks(); // I disable it to prevent infinite loop on X11.
+ DestroyCallbacks();
#endif
}
return;
}
- if (req_evt == EVT_LOST) {
+ if (req_evt == EVT_LOST)
+ {
m_connected = FALSE;
Close();
}
// --------------------------------------------------------------
// --------- wxSocketBase functions [Callback, CallbackData] ----
// --------------------------------------------------------------
+
wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSocketBase::wxSockCbk _cbk)
{
wxSockCbk old_cbk = m_cbk;
// --------------------------------------------------------------
// --------- wxSocketBase pushback library ----------------------
// --------------------------------------------------------------
+
void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
{
char *curr_pos;
delete node;
- switch (req->type) {
+ switch (req->type)
+ {
case EVT_READ:
case EVT_PEEK:
ret = recv(m_fd, req->buffer, req->size,
(req->type == EVT_PEEK) ? MSG_PEEK : 0);
- if (ret < 0) {
+ if (ret < 0)
+ {
req->error = errno;
req->done = TRUE;
break;
}
len = ret;
- if ((len < req->size) && (m_flags & WAITALL)) {
+ if ((len < req->size) && (m_flags & WAITALL))
+ {
req->size -= len;
req->nbytes += len;
req->buffer += len;
break;
case EVT_WRITE:
ret = send(m_fd, req->buffer, req->size, 0);
- if (ret < 0) {
+ if (ret < 0)
+ {
req->error = errno;
req->done = TRUE;
break;
}
len = ret;
- if ((len < req->size) && (m_flags & WAITALL)) {
+ if ((len < req->size) && (m_flags & WAITALL))
+ {
req->size -= len;
req->nbytes += len;
req->buffer += len;
{
int ret = 0;
- switch (evt) {
+ switch (evt)
+ {
case EVT_PEEK:
case EVT_READ:
ret = recv(m_fd, buffer, nbytes,
ret = send(m_fd, buffer, nbytes, 0);
break;
}
- if (ret < 0) {
+ if (ret < 0)
+ {
m_lcount = 0;
m_error = errno;
- } else
+ }
+ else
+ {
m_lcount = ret;
+ m_error = 0;
+ }
}
void wxSocketBase::WantBuffer(char *buffer, size_t nbytes,
- wxRequestEvent evt)
+ wxRequestEvent evt)
{
bool buf_timed_out;
if (m_fd == INVALID_SOCKET || !m_handler || !m_connected)
return;
- if (m_flags & SPEED) {
+ if (m_flags & SPEED)
+ {
WantSpeedBuffer(buffer, nbytes, evt);
return;
}
buf_timed_out = FALSE;
s_wake.Start(m_timeout*1000, TRUE);
- if (m_flags & NOWAIT) {
+ if (m_flags & NOWAIT)
+ {
DoRequests(evt);
- } else {
+ }
+ else
+ {
while (!buf->done && !buf_timed_out)
PROCESS_EVENTS();
}
}
// --------------------------------------------------------------
-// wxSocketServer ///////////////////////////////////////////////
+// wxSocketServer
// --------------------------------------------------------------
-// --------------------------------------------------------------
-// --------- wxSocketServer CONSTRUCTOR -------------------------
-// --------------------------------------------------------------
wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
- wxSockFlags flags) :
+ wxSockFlags flags) :
wxSocketBase(flags, SOCK_SERVER)
{
m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
}
// --------------------------------------------------------------
-// --------- wxSocketServer Accept ------------------------------
+// wxSocketServer Accept
// --------------------------------------------------------------
+
bool wxSocketServer::AcceptWith(wxSocketBase& sock)
{
int fd2;
int flag = 0;
setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
- if (!(sock.m_flags & SPEED)) {
+ if (!(sock.m_flags & SPEED))
+ {
unsigned long flag2 = 1;
ioctl(fd2, FIONBIO, &flag2);
}
}
// --------------------------------------------------------------
-// --------- wxSocketServer callbacks ---------------------------
+// wxSocketServer callbacks
// --------------------------------------------------------------
+
void wxSocketServer::OnRequest(wxRequestEvent evt)
{
- if (evt == EVT_ACCEPT) {
+ if (evt == EVT_ACCEPT)
+ {
OldOnNotify(EVT_ACCEPT);
}
}
// --------------------------------------------------------------
-// wxSocketClient ///////////////////////////////////////////////
+// wxSocketClient
// --------------------------------------------------------------
// --------- wxSocketClient CONSTRUCTOR -------------------------
// --------------------------------------------------------------
wxSocketClient::wxSocketClient(wxSockFlags _flags) :
- wxSocketBase(_flags, SOCK_CLIENT)
+ wxSocketBase(_flags, SOCK_CLIENT)
{
}
if (connect(m_fd, remote, len) != 0)
return FALSE;
- if (!(m_flags & SPEED)) {
+ if (!(m_flags & SPEED))
+ {
flag = 1;
ioctl(m_fd, FIONBIO, &flag);
}
return TRUE;
}
-bool wxSocketClient::WaitOnConnect(long seconds)
+bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
{
- int ret = _Wait(seconds, 0, REQ_CONNECT | REQ_LOST);
+ int ret = _Wait(seconds, microseconds, REQ_CONNECT | REQ_LOST);
if (ret)
m_connected = TRUE;
void wxSocketClient::OnRequest(wxRequestEvent evt)
{
- if (evt == EVT_CONNECT) {
- if (m_connected) {
+ if (evt == EVT_CONNECT)
+ {
+ if (m_connected)
+ {
+#ifndef __WXGTK__
SetNotify(m_neededreq & ~REQ_CONNECT);
+#endif
return;
}
m_waitflags = 0x40;
m_connected = TRUE;
OldOnNotify(EVT_CONNECT);
+#ifndef __WXGTK__
DestroyCallbacks();
+#endif
return;
}
wxSocketBase::OnRequest(evt);
// --------------------------------------------------------------
// --------- wxSocketHandler CONSTRUCTOR ------------------------
// --------------------------------------------------------------
+#ifdef __WXMAC__
+
+extern "C" int updatestatus(int s) ;
+
+void wxMacSocketOnRequestProc( void *refcon , short event )
+{
+ if ( refcon )
+ {
+ wxSocketBase *sock = (wxSocketBase *) refcon ;
+
+ wxSocketBase::wxRequestEvent sk_req;
+
+ int canRead ;
+ int canWrite ;
+ int exception ;
+
+ switch (event) {
+ case FD_READ:
+ sk_req = wxSocketBase::EVT_READ;
+ sock->OnRequest(sk_req);
+ break;
+ case FD_WRITE:
+ sk_req = wxSocketBase::EVT_WRITE;
+ sock->OnRequest(sk_req);
+ break;
+ case FD_CLOSE:
+ sk_req = wxSocketBase::EVT_LOST;
+ sock->OnRequest(sk_req);
+ break;
+ case FD_ACCEPT:
+ sk_req = wxSocketBase::EVT_ACCEPT;
+ sock->OnRequest(sk_req);
+ break;
+ case FD_CONNECT:
+ sk_req = wxSocketBase::EVT_CONNECT;
+ sock->OnRequest(sk_req);
+ break;
+ case FD_READY :
+ break ;
+ }
+ updatestatus ( sock->m_fd ) ;
+ }
+}
+
+void wxMacSocketHandlerProc( void *refcon , short event )
+{
+ wxMacNetEventsReferences[wxMacNetEventsTop] = refcon ;
+ wxMacNetEventsEvents[wxMacNetEventsTop] = event ;
+
+ // clumsy construct in order to never have a incorrect wxMacNetEventsTop (above limits)
+
+ if ( wxMacNetEventsTop + 1 == kwxMacNetEventsMax )
+ wxMacNetEventsTop = 0 ;
+ else
+ wxMacNetEventsTop++ ;
+}
+
+#endif
#ifdef __WINDOWS__
extern char wxPanelClassName[];
LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam)
{
+ if(message==WM_DESTROY)
+ {
+ ::SetWindowLong(hWnd, GWL_WNDPROC, (LONG) DefWindowProc);
+ return DefWindowProc(hWnd, message, wParam, lParam);
+ }
wxSocketHandler *h_sock = (wxSocketHandler *)GetWindowLong(hWnd, GWL_USERDATA);
wxNode *node = h_sock->smsg_list->Find(message);
wxSocketBase *sock;
case FD_CONNECT:
sk_req = wxSocketBase::EVT_CONNECT;
break;
+
+ default:
+ wxFAIL_MSG("invalid socket event");
+ return (LRESULT)0;
}
+
sock->OnRequest(sk_req);
return (LRESULT)0;
wxSocketHandler::wxSocketHandler()
{
#if defined(__WINDOWS__)
- if (!win_initialized) {
+ if (!win_initialized)
+ {
WSADATA wsaData;
WSAStartup((1 << 8) | 1, &wsaData);
}
internal = new wxSockHandlerInternal;
internal->sockWin = ::CreateWindow(wxPanelClassName, NULL, 0,
- 0, 0, 0, 0, NULL, (HMENU) NULL,
- wxhInstance, 0);
+ 0, 0, 0, 0, NULL, (HMENU) NULL,
+ wxhInstance, 0);
// Subclass the window
if (!wxSocketSubClassProc)
{
wxNode *next_node, *node = socks->First();
- while (node) {
+ while (node)
+ {
wxSocketBase* sock = (wxSocketBase*)node->Data();
delete sock;
// --------------------------------------------------------------
// --------- wxSocketHandler registering functions --------------
// --------------------------------------------------------------
+
void wxSocketHandler::Register(wxSocketBase* sock)
{
wxNode *node;
- for (node = socks->First(); node != NULL; node = node->Next()) {
+ for (node = socks->First(); node != NULL; node = node->Next())
+ {
wxSocketBase* s = (wxSocketBase*)node->Data();
if (s == sock)
return;
}
- if (sock) {
+ if (sock)
+ {
socks->Append(sock);
sock->SetHandler(this);
sock->SetupCallbacks();
{
wxNode *node;
- for (node = socks->First(); node; node = node->Next()) {
+ for (node = socks->First(); node; node = node->Next())
+ {
wxSocketBase* s = (wxSocketBase*)node->Data();
- if (s == sock) {
+ if (s == sock)
+ {
delete node;
sock->DestroyCallbacks();
sock->SetHandler(NULL);
// --------- wxSocketHandler "big" wait functions ---------------
// --------------------------------------------------------------
void handler_cbk(wxSocketBase& sock,
- wxSocketBase::wxRequestEvent WXUNUSED(flags),
- char *cdata)
+ wxSocketBase::wxRequestEvent WXUNUSED(flags),
+ char *cdata)
{
int *a_wait = (int *)cdata;
wxSockWakeUp s_wake(NULL, &on_wait, -2);
wxNode *node;
- for (node = socks->First(), i=0; node; node = node->Next(), i++) {
+ for (node = socks->First(), i=0; node; node = node->Next(), i++)
+ {
wxSocketBase *sock = (wxSocketBase *)node->Data();
sock->SaveState();
while (!on_wait)
PROCESS_EVENTS();
- for (node = socks->First(), i=0; node; node = node->Next(), i++) {
+ for (node = socks->First(), i=0; node; node = node->Next(), i++)
+ {
wxSocketBase *sock = (wxSocketBase *)node->Data();
sock->RestoreState();
{
wxNode *node;
- for (node = socks->First(); node; node = node->Next() ) {
+ for (node = socks->First(); node; node = node->Next() )
+ {
wxSocketBase *sock = (wxSocketBase *)node->Data();
sock->SaveState();
// --------- wxSocketHandler: create and register the socket ----
// --------------------------------------------------------------
wxSocketServer *wxSocketHandler::CreateServer(wxSockAddress& addr,
- wxSocketBase::wxSockFlags flags)
+ wxSocketBase::wxSockFlags flags)
{
wxSocketServer *serv = new wxSocketServer(addr, flags);
// --------------------------------------------------------------
// --------- wxSocketHandler: Windows specific methods ----------
// --------------------------------------------------------------
+
UINT wxSocketHandler::NewMessage(wxSocketBase *sock)
{
internal->firstAvailableMsg++;
}
#endif
+
+bool wxSocketModule::OnInit()
+{
+ wxSocketHandler::master = new wxSocketHandler();
+ return TRUE;
+}
+
+void wxSocketModule::OnExit()
+{
+ delete wxSocketHandler::master;
+ wxSocketHandler::master = NULL;
+}
+
+#ifdef __WXMAC__
+void wxMacProcessSocketEvents() ;
+void wxMacProcessEvents()
+{
+ wxMacProcessSocketEvents() ;
+ (*GUSISpin)(SP_MISC, 0) ;
+}
+
+void wxMacProcessSocketEvents()
+{
+ while ( wxMacNetEventsTop != wxMacNetEventsBottom )
+ {
+ // consume event at wxMacNetEventsBottom
+ wxMacSocketOnRequestProc(wxMacNetEventsReferences[wxMacNetEventsBottom] , wxMacNetEventsEvents[wxMacNetEventsBottom] ) ;
+ wxMacNetEventsBottom++ ;
+ if ( wxMacNetEventsBottom == kwxMacNetEventsMax )
+ wxMacNetEventsBottom = 0 ;
+ }
+}
+#endif
+
+#endif
+ // __WXSTUBS__
projects / wxWidgets.git / blobdiff