Added install scripts in missing places

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index aa8a18a6b5725bb2e59f1d5c4c9ed6fc0d789aaa..d6919eb2f02b5c17cbcc1a096fdd74c5c852ba4a 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -9,10 +9,10 @@
 // RCS_ID:     $Id$
 // License:    see wxWindows license
 ////////////////////////////////////////////////////////////////////////////////
 // RCS_ID:     $Id$
 // License:    see wxWindows license
 ////////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__     
+#ifdef __GNUG__

 #pragma implementation "socket.h"
 #pragma implementation "socket.h"

-#pragma interface
-#pragma implementation "socket.cpp"
+// #pragma interface
+// #pragma implementation "socket.cpp"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -31,6 +31,9 @@
 #include <wx/timer.h>
 #include <wx/utils.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>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>


@@ -54,6 +57,10 @@
 #include <sys/time.h>
 #include <unistd.h>
 
 #include <sys/time.h>
 #include <unistd.h>
 

+#ifdef sun
+#include <sys/filio.h>
+#endif
+

 #endif // __UNIX__
 
 #include <signal.h>
 #endif // __UNIX__
 
 #include <signal.h>


@@ -92,6 +99,9 @@
 #ifdef __WINDOWS__
 #define close closesocket
 #define ioctl ioctlsocket
 #ifdef __WINDOWS__
 #define close closesocket
 #define ioctl ioctlsocket

+#ifdef errno
+#undef errno
+#endif

 #define errno WSAGetLastError()
 #ifdef EWOULDBLOCK
 #undef EWOULDBLOCK
 #define errno WSAGetLastError()
 #ifdef EWOULDBLOCK
 #undef EWOULDBLOCK


@@ -107,7 +117,7 @@
 #endif
 
 #ifdef __WXMOTIF__
 #endif
 
 #ifdef __WXMOTIF__

-#define wxAPP_CONTEXT wxTheApp->appContext
+#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())

 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__


@@ -180,7 +190,7 @@ public:
   wxSockWakeUp *auto_wakeup;
   wxSocketBase::wxRequestNotify type;
 };
   wxSockWakeUp *auto_wakeup;
   wxSocketBase::wxRequestNotify type;
 };

- 
+

 
 /////////////////////////////////////////////////////////////////////////////
 // Some internal define
 
 /////////////////////////////////////////////////////////////////////////////
 // Some internal define


@@ -266,7 +276,7 @@ bool wxSocketBase::Close()
       while (node) {
         SockRequest *req = (SockRequest *)node->Data();
         req->done = TRUE;
       while (node) {
         SockRequest *req = (SockRequest *)node->Data();
         req->done = TRUE;

-        
+

         n = node->Next();
         delete node;
         node = n;
         n = node->Next();
         delete node;
         node = n;


@@ -325,7 +335,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
 {
   SockMsg msg;
   size_t len, len2, sig;
 {
   SockMsg msg;
   size_t len, len2, sig;

-  
+

   Read((char *)&msg, sizeof(msg));
   if (m_lcount != sizeof(msg))
     return *this;
   Read((char *)&msg, sizeof(msg));
   if (m_lcount != sizeof(msg))
     return *this;


@@ -368,27 +378,27 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
 wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
 {
   SockMsg msg;
 wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
 {
   SockMsg msg;

-  
-  msg.sig[0] = 0xad;
-  msg.sig[1] = 0xde;
-  msg.sig[2] = 0xed;
-  msg.sig[3] = 0xfe;

 
 

-  msg.len[0] = nbytes & 0xff;
-  msg.len[1] = (nbytes >> 8) & 0xff;
-  msg.len[2] = (nbytes >> 16) & 0xff;
-  msg.len[3] = (nbytes >> 24) & 0xff;
+  msg.sig[0] = (char) 0xad;
+  msg.sig[1] = (char) 0xde;
+  msg.sig[2] = (char) 0xed;
+  msg.sig[3] = (char) 0xfe;
+
+  msg.len[0] = (char) nbytes & 0xff;
+  msg.len[1] = (char) (nbytes >> 8) & 0xff;
+  msg.len[2] = (char) (nbytes >> 16) & 0xff;
+  msg.len[3] = (char) (nbytes >> 24) & 0xff;

 
   if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
     return *this;
   if (Write(buffer, nbytes).LastCount() < nbytes)
 
   if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
     return *this;
   if (Write(buffer, nbytes).LastCount() < nbytes)

-    return *this; 
+    return *this;

 
 

-  msg.sig[0] = 0xed;
-  msg.sig[1] = 0xfe;
-  msg.sig[2] = 0xad;
-  msg.sig[3] = 0xde;
-  msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = 0; 
+  msg.sig[0] = (char) 0xed;
+  msg.sig[1] = (char) 0xfe;
+  msg.sig[2] = (char) 0xad;
+  msg.sig[3] = (char) 0xde;
+  msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;

   Write((char *)&msg, sizeof(msg));
 
   return *this;
   Write((char *)&msg, sizeof(msg));
 
   return *this;


@@ -415,7 +425,7 @@ bool wxSocketBase::IsData() const
   FD_ZERO(&sock_set);
   FD_SET(m_fd, &sock_set);
   select(FD_SETSIZE, &sock_set, NULL, NULL, &tv);
   FD_ZERO(&sock_set);
   FD_SET(m_fd, &sock_set);
   select(FD_SETSIZE, &sock_set, NULL, NULL, &tv);

-  return FD_ISSET(m_fd, &sock_set);
+  return (FD_ISSET(m_fd, &sock_set) != 0);

 }
 
 // ---------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------


@@ -429,7 +439,7 @@ void wxSocketBase::Discard()
 
   SaveState();
   SetFlags((wxSockFlags)(NOWAIT | SPEED));
 
   SaveState();
   SetFlags((wxSockFlags)(NOWAIT | SPEED));

-  
+

   while (recv_size == MAX_BUFSIZE) {
     recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
   }
   while (recv_size == MAX_BUFSIZE) {
     recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
   }


@@ -451,12 +461,8 @@ bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
   if (m_fd < 0)
     return FALSE;
 
   if (m_fd < 0)
     return FALSE;
 

-#ifdef __WINDOWS__

   if (getpeername(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)
   if (getpeername(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)

-#else
-  if (getpeername(m_fd, (struct sockaddr *)&my_addr, (unsigned int *)&len_addr) < 0)
-#endif
-    return FALSE; 
+    return FALSE;

 
   addr_man.Disassemble(&my_addr, len_addr);
   return TRUE;
 
   addr_man.Disassemble(&my_addr, len_addr);
   return TRUE;


@@ -470,11 +476,7 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
   if (m_fd < 0)
     return FALSE;
 
   if (m_fd < 0)
     return FALSE;
 

-#ifdef __WINDOWS__

   if (getsockname(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)
   if (getsockname(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)

-#else
-  if (getsockname(m_fd, (struct sockaddr *)&my_addr, (unsigned int *)&len_addr) < 0)
-#endif

     return FALSE;
 
   addr_man.Disassemble(&my_addr, len_addr);
     return FALSE;
 
   addr_man.Disassemble(&my_addr, len_addr);


@@ -507,7 +509,7 @@ void wxSocketBase::RestoreState()
     return;
 
   wxSockState *state = (wxSockState *)node->Data();
     return;
 
   wxSockState *state = (wxSockState *)node->Data();

- 
+

   SetFlags(state->flags);
   m_neededreq = state->cbk_set;
   m_cbk       = state->cbk;
   SetFlags(state->flags);
   m_neededreq = state->cbk_set;
   m_cbk       = state->cbk;


@@ -539,7 +541,7 @@ bool wxSocketBase::_Wait(long seconds, long microseconds, int type)
 
   if (seconds != -1)
     wakeup.Start((int)(seconds*1000 + (microseconds / 1000)), TRUE);
 
   if (seconds != -1)
     wakeup.Start((int)(seconds*1000 + (microseconds / 1000)), TRUE);

-  
+

   m_waitflags = 0x80 | type;
   while (m_waitflags & 0x80)
     PROCESS_EVENTS();
   m_waitflags = 0x80 | type;
   while (m_waitflags & 0x80)
     PROCESS_EVENTS();


@@ -1017,22 +1019,25 @@ bool wxSocketBase::DoRequests(wxRequestEvent req_flag)
 void wxSocketBase::WantSpeedBuffer(char *buffer, size_t nbytes,
                                    wxRequestEvent evt)
 {
 void wxSocketBase::WantSpeedBuffer(char *buffer, size_t nbytes,
                                    wxRequestEvent evt)
 {

-  int ret;
+  int ret = 0;

 
   switch (evt) {
   case EVT_PEEK:
   case EVT_READ:
 
   switch (evt) {
   case EVT_PEEK:
   case EVT_READ:

-    ret = read(m_fd, buffer, nbytes);
+    ret = recv(m_fd, buffer, nbytes,
+               (evt == EVT_PEEK) ? MSG_PEEK : 0);

     break;
   case EVT_WRITE:
     break;
   case EVT_WRITE:

-    ret = write(m_fd, buffer, nbytes);
+    ret = send(m_fd, buffer, nbytes, 0);

     break;
   }
   if (ret < 0) {
     m_lcount = 0;
     m_error = errno;
     break;
   }
   if (ret < 0) {
     m_lcount = 0;
     m_error = errno;

-  } else
+  } else {

     m_lcount = ret;
     m_lcount = ret;

+    m_error = 0;
+  }

 }
 
 void wxSocketBase::WantBuffer(char *buffer, size_t nbytes,
 }
 
 void wxSocketBase::WantBuffer(char *buffer, size_t nbytes,


@@ -1050,7 +1055,7 @@ void wxSocketBase::WantBuffer(char *buffer, size_t nbytes,
 
   SockRequest *buf = new SockRequest;
   wxSockWakeUp s_wake(NULL, (int *)&buf_timed_out, (int)TRUE);
 
   SockRequest *buf = new SockRequest;
   wxSockWakeUp s_wake(NULL, (int *)&buf_timed_out, (int)TRUE);

-  
+

   m_wantbuf++;
   req_list[evt].Append(buf);
 
   m_wantbuf++;
   req_list[evt].Append(buf);
 


@@ -1099,17 +1104,17 @@ wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
 
   if (m_fd == INVALID_SOCKET)
     return;
 
   if (m_fd == INVALID_SOCKET)
     return;

-  
+

   int flag = 1;
   setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int));
   int flag = 1;
   setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int));

-  
+

   struct sockaddr *myaddr;
   size_t len;
   struct sockaddr *myaddr;
   size_t len;

-  
+

   addr_man.Build(myaddr, len);
   if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0)
     return;
   addr_man.Build(myaddr, len);
   if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0)
     return;

-  
+

   if (listen(m_fd, 5) < 0) {
     m_fd = INVALID_SOCKET;
     return;
   if (listen(m_fd, 5) < 0) {
     m_fd = INVALID_SOCKET;
     return;


@@ -1122,24 +1127,24 @@ wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
 bool wxSocketServer::AcceptWith(wxSocketBase& sock)
 {
   int fd2;
 bool wxSocketServer::AcceptWith(wxSocketBase& sock)
 {
   int fd2;

-  
+

   if ((fd2 = accept(m_fd, 0, 0)) < 0)
     return FALSE;
 
   struct linger linger;
   linger.l_onoff = 0;
   linger.l_linger = 1;
   if ((fd2 = accept(m_fd, 0, 0)) < 0)
     return FALSE;
 
   struct linger linger;
   linger.l_onoff = 0;
   linger.l_linger = 1;

-  
+

   setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
   setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));

-  
+

   int flag = 0;
   setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
   int flag = 0;
   setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));

-  
+

   if (!(sock.m_flags & SPEED)) {
     unsigned long flag2 = 1;
     ioctl(fd2, FIONBIO, &flag2);
   }
   if (!(sock.m_flags & SPEED)) {
     unsigned long flag2 = 1;
     ioctl(fd2, FIONBIO, &flag2);
   }

- 
+

   sock.m_type = SOCK_INTERNAL;
   sock.m_fd = fd2;
   sock.m_connected = TRUE;
   sock.m_type = SOCK_INTERNAL;
   sock.m_fd = fd2;
   sock.m_connected = TRUE;


@@ -1193,7 +1198,7 @@ wxSocketClient::~wxSocketClient()
 // --------------------------------------------------------------
 // --------- wxSocketClient Connect functions -------------------
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // --------- wxSocketClient Connect functions -------------------
 // --------------------------------------------------------------

-bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
+bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) )

 {
   struct linger linger;
 
 {
   struct linger linger;
 


@@ -1201,21 +1206,21 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
     Close();
 
   m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
     Close();
 
   m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);

-  
+

   if (m_fd < 0)
     return FALSE;
   if (m_fd < 0)
     return FALSE;

-  
+

   m_connected = FALSE;
 
   linger.l_onoff = 1;
   m_connected = FALSE;
 
   linger.l_onoff = 1;

-  linger.l_linger = 5;  
+  linger.l_linger = 5;

   setsockopt(m_fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
   setsockopt(m_fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));

-  
+

   // Stay in touch with the state of things...
   // Stay in touch with the state of things...

-  
+

   unsigned long flag = 1;
   setsockopt(m_fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
   unsigned long flag = 1;
   setsockopt(m_fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));

-  
+

   // Disable the nagle algorithm, which delays sends till the
   // buffer is full (or a certain time period has passed?)...
 
   // Disable the nagle algorithm, which delays sends till the
   // buffer is full (or a certain time period has passed?)...
 


@@ -1223,7 +1228,7 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
   flag = 1;
   setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int));
 #endif
   flag = 1;
   setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int));
 #endif

-  
+

   struct sockaddr *remote;
   size_t len;
 
   struct sockaddr *remote;
   size_t len;
 


@@ -1236,21 +1241,21 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
     flag = 1;
     ioctl(m_fd, FIONBIO, &flag);
   }
     flag = 1;
     ioctl(m_fd, FIONBIO, &flag);
   }

-  
+

   Notify(TRUE);
 
   m_connected = TRUE;
   return TRUE;
 }
 
   Notify(TRUE);
 
   m_connected = TRUE;
   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;
   if (ret)
     m_connected = TRUE;

-  
-  return m_connected; 
+
+  return m_connected;

 }
 
 void wxSocketClient::OnRequest(wxRequestEvent evt)
 }
 
 void wxSocketClient::OnRequest(wxRequestEvent evt)


@@ -1261,7 +1266,7 @@ void wxSocketClient::OnRequest(wxRequestEvent evt)
       return;
     }
     m_waitflags = 0x40;
       return;
     }
     m_waitflags = 0x40;

-    m_connected = TRUE; 
+    m_connected = TRUE;

     OldOnNotify(EVT_CONNECT);
     DestroyCallbacks();
     return;
     OldOnNotify(EVT_CONNECT);
     DestroyCallbacks();
     return;


@@ -1412,7 +1417,7 @@ void wxSocketHandler::UnRegister(wxSocketBase* sock)
 
   for (node = socks->First(); node; node = node->Next()) {
     wxSocketBase* s = (wxSocketBase*)node->Data();
 
   for (node = socks->First(); node; node = node->Next()) {
     wxSocketBase* s = (wxSocketBase*)node->Data();

-    
+

     if (s == sock) {
       delete node;
       sock->DestroyCallbacks();
     if (s == sock) {
       delete node;
       sock->DestroyCallbacks();


@@ -1537,3 +1542,6 @@ HWND wxSocketHandler::GetHWND() const
 }
 
 #endif
 }
 
 #endif

+
+#endif
+  // __WXSTUBS__