corrected a type in the constructor from two points

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 9b7fbe2ecdc16cd299b098af653f872ead6ce8a0..4f3b8085e5cda925c57a111978f9128c9fe0fe21 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -11,8 +11,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 #ifdef __GNUG__
 #pragma implementation "socket.h"
-// #pragma interface
-// #pragma implementation "socket.cpp"
 #endif
 
 #ifdef __MWERKS__
@@ -26,6 +24,8 @@ typedef int socklen_t ;
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 /////////////////////////////////////////////////////////////////////////////
 // wxWindows headers
 /////////////////////////////////////////////////////////////////////////////
@@ -97,7 +97,7 @@ void wxMacProcessEvents() ;
 #include <signal.h>
 #include <errno.h>
 
-#ifdef _MSC_VER
+#ifdef __VISUALC__
 #include <io.h>
 #endif
 
@@ -157,7 +157,7 @@ void wxMacProcessEvents() ;
 // 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;
@@ -185,6 +185,10 @@ int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
 // Some patch ///// END
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+
 // --------------------------------------------------------------
 // Module
 // --------------------------------------------------------------
@@ -353,30 +357,42 @@ bool wxSocketBase::Close()
 
 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;
 }
@@ -435,6 +451,11 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
 {
   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;
@@ -458,6 +479,10 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
   Write((char *)&msg, sizeof(msg));
 
   return *this;
+
+#ifdef __VISUALC__
+    #pragma warning(default: 4310)
+#endif // __VISUALC__
 }
 
 wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
@@ -518,11 +543,10 @@ void wxSocketBase::Discard()
 // Meanwhile, if your compiler complains about socklen_t,
 // switch lines below.
 
-#if defined(__LINUX__)
-// #if 0
-#define wxSOCKET_INT socklen_t
+#if wxHAVE_GLIBC2
+#   define wxSOCKET_INT socklen_t
 #else
-#define wxSOCKET_INT int
+#   define wxSOCKET_INT int
 #endif
 
 // --------------------------------------------------------------
@@ -661,6 +685,20 @@ bool wxSocketBase::WaitForLost(long seconds, long microseconds)
 // --------- 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,
@@ -688,6 +726,15 @@ static void wx_socket_read(gpointer client, gint fd,
   {
     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;
     }
 
@@ -1099,7 +1146,10 @@ void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
 {
   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);
@@ -1114,9 +1164,10 @@ void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t 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;
 }
@@ -1132,7 +1183,7 @@ size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek)
 
   if (!peek) {
     m_unrd_size -= size;
-    if (!m_unrd_size) {
+    if (m_unrd_size == 0) {
       free(m_unread);
       m_unread = NULL;
     }
@@ -1599,7 +1650,12 @@ LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message,
   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;
@@ -1868,3 +1924,6 @@ void wxMacProcessSocketEvents()
 
 #endif
   // __WXSTUBS__
+
+#endif
+  // wxUSE_SOCKETS