////////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "socket.h"
-// #pragma interface
-// #pragma implementation "socket.cpp"
#endif
#ifdef __MWERKS__
#pragma hdrstop
#endif
+#if wxUSE_SOCKETS
+
/////////////////////////////////////////////////////////////////////////////
// wxWindows headers
/////////////////////////////////////////////////////////////////////////////
#endif
#if defined(__WINDOWS__)
-#include <winsock.h>
+ #include <winsock.h>
#endif // __WINDOWS__
#if defined(__UNIX__)
#ifdef VMS
-#include <socket.h>
-#else
-#include <sys/socket.h>
-#endif
+ #include <socket.h>
+#else // !VMS
+ #include <sys/socket.h>
+#endif // VMS/!VMS
+
#include <sys/ioctl.h>
#include <sys/time.h>
#include <unistd.h>
#ifdef sun
-#include <sys/filio.h>
+ #include <sys/filio.h>
#endif
#endif // __UNIX__
#include <signal.h>
#include <errno.h>
-#ifdef _MSC_VER
-#include <io.h>
+#ifdef __VISUALC__
+ #include <io.h>
#endif
#if defined(__WXMOTIF__) || defined(__WXXT__)
-#include <X11/Intrinsic.h>
+ #include <X11/Intrinsic.h>
-/////////////////////////////
-// Needs internal variables
-/////////////////////////////
-#ifdef __WXXT__
-#define Uses_XtIntrinsic
-#endif
-
-#endif
+ /////////////////////////////
+ // Needs internal variables
+ /////////////////////////////
+ #ifdef __WXXT__
+ #define Uses_XtIntrinsic
+ #endif
+#endif // Motif or Xt
#if defined(__WXGTK__)
-#include <gtk/gtk.h>
+ #include <gtk/gtk.h>
#endif
/////////////////////////////////////////////////////////////////////////////
// wxSocket headers
/////////////////////////////////////////////////////////////////////////////
#include "wx/module.h"
+
#define WXSOCK_INTERNAL
+
#include "wx/sckaddr.h"
#include "wx/socket.h"
// implementations (such as PC-NFS) will require you to include this
// or a similar routine (see appendix in WinSock doc or help file).
-#if defined( NEED_WSAFDIsSet ) || defined( _MSC_VER )
+#if defined( NEED_WSAFDIsSet ) || defined( __VISUALC__ )
int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
{
int i = set->fd_count;
#endif
#if defined(__WINDOWS__)
-#define PROCESS_EVENTS() wxYield()
+ #define PROCESS_EVENTS() wxYield()
#elif defined(__WXXT__) || defined(__WXMOTIF__)
-#define PROCESS_EVENTS() XtAppProcessEvent(wxAPP_CONTEXT, XtIMAll)
+ #define PROCESS_EVENTS() XtAppProcessEvent(wxAPP_CONTEXT, XtIMAll)
#elif defined(__WXGTK__)
-#define PROCESS_EVENTS() gtk_main_iteration()
+ #define PROCESS_EVENTS() gtk_main_iteration()
#endif
/////////////////////////////////////////////////////////////////////////////
// Some patch ///// END
/////////////////////////////////////////////////////////////////////////////
+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+
// --------------------------------------------------------------
// Module
// --------------------------------------------------------------
// ClassInfos
// --------------------------------------------------------------
#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxSocketBase, wxObject)
-IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketHandler, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
+ IMPLEMENT_CLASS(wxSocketBase, wxObject)
+ IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
+ IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
+ IMPLEMENT_CLASS(wxSocketHandler, wxObject)
+ IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
#endif
class wxSockWakeUp : public wxTimer
wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
{
- m_lcount = GetPushback(buffer, nbytes, FALSE);
+ size_t count;
+
+ count = GetPushback(buffer, nbytes, FALSE);
+ nbytes -= count;
+ buffer += count;
// If we have got the whole needed buffer or if we don't want to
// wait then it returns immediately.
- if (!nbytes || (m_lcount && !(m_flags & WAITALL)) )
+ if (!nbytes || (count && !(m_flags & WAITALL)) ) {
+ m_lcount = count;
return *this;
+ }
+ m_lcount = 0;
WantBuffer(buffer, nbytes, EVT_READ);
+ m_lcount += count;
return *this;
}
wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes)
{
- size_t nbytes_old = nbytes;
+ size_t count;
- nbytes -= GetPushback(buffer, nbytes, TRUE);
- if (!nbytes)
+ count = GetPushback(buffer, nbytes, TRUE);
+ if (nbytes-count == 0)
{
- m_lcount = nbytes_old;
+ m_lcount = nbytes;
return *this;
}
+ buffer += count;
+ nbytes -= count;
+ m_lcount = 0;
WantBuffer(buffer, nbytes, EVT_PEEK);
+ m_lcount += count;
return *this;
}
{
SockMsg msg;
+ // warning about 'cast truncates constant value'
+#ifdef __VISUALC__
+ #pragma warning(disable: 4310)
+#endif // __VISUALC__
+
msg.sig[0] = (char) 0xad;
msg.sig[1] = (char) 0xde;
msg.sig[2] = (char) 0xed;
Write((char *)&msg, sizeof(msg));
return *this;
+
+#ifdef __VISUALC__
+ #pragma warning(default: 4310)
+#endif // __VISUALC__
}
wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
#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*.
-#if 0
-#define wxSOCKET_INT unsigned int
-#else
-#define wxSOCKET_INT int
-#endif
+// this is normally defined by configure, but if it wasn't try to do it here
+#ifndef SOCKLEN_T
+ #if wxHAVE_GLIBC2
+ typedef socklen_t SOCKLEN_T;
+ #else
+ typedef int SOCKLEN_T;
+ #endif
+#endif // SOCKLEN_T
// --------------------------------------------------------------
// wxSocketBase socket info functions
bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
{
struct sockaddr my_addr;
- wxSOCKET_INT len_addr = sizeof(my_addr);
+ SOCKLEN_T len_addr = (SOCKLEN_T)sizeof(my_addr);
if (m_fd < 0)
return FALSE;
bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
{
struct sockaddr my_addr;
- wxSOCKET_INT len_addr = sizeof(my_addr);
+ SOCKLEN_T len_addr = (SOCKLEN_T)sizeof(my_addr);
if (m_fd < 0)
return FALSE;
if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0)
-
return FALSE;
addr_man.Disassemble(&my_addr, len_addr);
// --------- wxSocketBase callback management -------------------
// --------------------------------------------------------------
+#ifdef __WXGTK__
+void wxPrereadSocket(wxSocketBase *sock)
+{
+ char tmp_buf[1024];
+ int got = 0;
+
+ do {
+ got = recv(sock->m_fd, tmp_buf, 1024, 0);
+ if (got > 0)
+ sock->CreatePushbackAfter(tmp_buf, got);
+ } while (got > 0);
+}
+#endif
+
#if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
#if defined(__WXMOTIF__) || defined(__WXXT__)
static void wx_socket_read(XtPointer client, int *fid,
{
if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
{
+#ifdef __WXGTK__
+ // We can't exit from the GDK main loop because it doesn't accept
+ // destroying input event while we are in a event dispatch.
+ // So we will preread socket and we put the data in the pushback.
+ wxPrereadSocket(sock);
+ // Then we set the socket as BLOCKING
+ int flag = 0;
+ ioctl(fd, FIONBIO, &flag);
+#endif
return;
}
{
char *curr_pos;
- m_unread = (char *) realloc(m_unread, m_unrd_size+size);
+ if (m_unread != NULL)
+ m_unread = (char *) realloc(m_unread, m_unrd_size+size);
+ else
+ m_unread = (char *) malloc(size);
curr_pos = m_unread + m_unrd_size;
memcpy(curr_pos, buffer, size);
curr_pos = new_buf + size;
memcpy(new_buf, buffer, size);
- memcpy(curr_pos, m_unread, m_unrd_size);
-
- free(m_unread);
+ if (m_unrd_size != 0) {
+ memcpy(curr_pos, m_unread, m_unrd_size);
+ free(m_unread);
+ }
m_unread = new_buf;
m_unrd_size += size;
}
if (!peek) {
m_unrd_size -= size;
- if (!m_unrd_size) {
+ if (m_unrd_size == 0) {
free(m_unread);
m_unread = NULL;
}
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;
#endif
// __WXSTUBS__
+
+#endif
+ // wxUSE_SOCKETS
projects / wxWidgets.git / blobdiff