Socket sample:

- Test 3 added to test large transfers involving multiple low level calls.
- Stub for datagram socket tests (not yet in place)

IPC sample:
- Client no longer needs to use GetHostName for DDE and LocalHost for IPC;
now it can just use GetHostName for both (because now the IPC server binds to
INADDR_ANY instead of binding to localhost).
- Fixed once again another warning about wxString objects that can't be
passed through '...'

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 99940537f19ba66d23cd090d5ec5e2364a98ee2e..8c184d4d0bfb573f3abcba400b7fc8362642cc46 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -75,11 +75,7 @@ MyClient *my_client ;
 bool MyApp::OnInit()
 {
     wxString server = "4242";
 bool MyApp::OnInit()
 {
     wxString server = "4242";

-#if wxUSE_DDE_FOR_SAMPLE

     wxString hostName = wxGetHostName();
     wxString hostName = wxGetHostName();

-#else
-    wxString hostName = "localhost";
-#endif

 
     if (argc > 1)
         server = argv[1];
 
     if (argc > 1)
         server = argv[1];

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 4763f877e8669bbcbcb599fe49fc4b768a1b164c..3ad14aac9a8cb071229f82f6af9b610fc0a3d0f0 100644 (file)
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -215,7 +215,7 @@ bool MyConnection::OnPoke(const wxString& WXUNUSED(topic),
                           int WXUNUSED(size),
                           wxIPCFormat WXUNUSED(format))
 {
                           int WXUNUSED(size),
                           wxIPCFormat WXUNUSED(format))
 {

-    wxLogStatus("Poke command: %s = %s", item, data);
+    wxLogStatus("Poke command: %s = %s", item.c_str(), data);

     return TRUE;
 }
 
     return TRUE;
 }
 

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 2dba5c91b393b96851e3fc5608618d2c8f4d0c2d..e21a1e2542ef19b355c0a5704538051eb2911159 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -34,10 +34,10 @@
 #  include "wx/wx.h"
 #endif
 
 #  include "wx/wx.h"
 #endif
 

-#  include "wx/socket.h"
-#  include "wx/url.h"
-#  include "wx/protocol/http.h"
-#  include "wx/progdlg.h"
+#include "wx/socket.h"
+#include "wx/url.h"
+#include "wx/protocol/http.h"
+#include "wx/progdlg.h"

 
 // --------------------------------------------------------------------------
 // resources
 
 // --------------------------------------------------------------------------
 // resources


@@ -75,6 +75,7 @@ public:
   void OnTest3(wxCommandEvent& event);
   void OnCloseConnection(wxCommandEvent& event);
   void OnSocketEvent(wxSocketEvent& event);
   void OnTest3(wxCommandEvent& event);
   void OnCloseConnection(wxCommandEvent& event);
   void OnSocketEvent(wxSocketEvent& event);

+  void OnDatagram(wxCommandEvent& event);

 
   // convenience functions
   void UpdateStatusBar();
 
   // convenience functions
   void UpdateStatusBar();


@@ -85,6 +86,7 @@ private:
   wxTextCtrl     *m_text;
   wxMenu         *m_menuFile;
   wxMenu         *m_menuSocket;
   wxTextCtrl     *m_text;
   wxMenu         *m_menuFile;
   wxMenu         *m_menuSocket;

+  wxMenu         *m_menuDatagramSocket;

   wxMenuBar      *m_menuBar;
   bool            m_busy;
 
   wxMenuBar      *m_menuBar;
   bool            m_busy;
 


@@ -107,6 +109,7 @@ enum
   CLIENT_TEST2,
   CLIENT_TEST3,
   CLIENT_CLOSE,
   CLIENT_TEST2,
   CLIENT_TEST3,
   CLIENT_CLOSE,

+  CLIENT_DGRAM,

 
   // id for socket
   SOCKET_ID
 
   // id for socket
   SOCKET_ID


@@ -124,6 +127,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(CLIENT_TEST2, MyFrame::OnTest2)
   EVT_MENU(CLIENT_TEST3, MyFrame::OnTest3)
   EVT_MENU(CLIENT_CLOSE, MyFrame::OnCloseConnection)
   EVT_MENU(CLIENT_TEST2, MyFrame::OnTest2)
   EVT_MENU(CLIENT_TEST3, MyFrame::OnTest3)
   EVT_MENU(CLIENT_CLOSE, MyFrame::OnCloseConnection)

+  EVT_MENU(CLIENT_DGRAM, MyFrame::OnDatagram)

   EVT_SOCKET(SOCKET_ID,  MyFrame::OnSocketEvent)
 END_EVENT_TABLE()
 
   EVT_SOCKET(SOCKET_ID,  MyFrame::OnSocketEvent)
 END_EVENT_TABLE()
 


@@ -177,10 +181,14 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
   m_menuSocket->AppendSeparator();
   m_menuSocket->Append(CLIENT_CLOSE, _T("&Close session"), _T("Close connection"));
 
   m_menuSocket->AppendSeparator();
   m_menuSocket->Append(CLIENT_CLOSE, _T("&Close session"), _T("Close connection"));
 

+  m_menuDatagramSocket = new wxMenu();
+  m_menuDatagramSocket->Append(CLIENT_DGRAM, _T("Send Datagram"), _("Test UDP sockets"));
+

   // Append menus to the menubar
   m_menuBar = new wxMenuBar();
   m_menuBar->Append(m_menuFile, _T("&File"));
   m_menuBar->Append(m_menuSocket, _T("&Socket"));
   // Append menus to the menubar
   m_menuBar = new wxMenuBar();
   m_menuBar->Append(m_menuFile, _T("&File"));
   m_menuBar->Append(m_menuSocket, _T("&Socket"));

+  m_menuBar->Append(m_menuDatagramSocket, _T("&DatagramSocket"));

   SetMenuBar(m_menuBar);
 
   // Status bar
   SetMenuBar(m_menuBar);
 
   // Status bar


@@ -245,8 +253,8 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
 
   // Non-blocking connect
   m_text->AppendText(_T("Trying to connect (timeout = 10 sec) ...\n"));
 
   // Non-blocking connect
   m_text->AppendText(_T("Trying to connect (timeout = 10 sec) ...\n"));

-  m_sock->Connect(addr, FALSE);
-  m_sock->WaitOnConnect(10);
+  m_sock->Connect(addr, TRUE);
+//  m_sock->WaitOnConnect(10);

 
   if (m_sock->IsConnected())
     m_text->AppendText(_T("Succeeded ! Connection established\n"));
 
   if (m_sock->IsConnected())
     m_text->AppendText(_T("Succeeded ! Connection established\n"));


@@ -262,8 +270,9 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {

-  char *buf1, *buf2;
-  char len;
+  char *buf1;
+  char *buf2;
+  unsigned char len;

 
   // Disable socket menu entries (exception: Close Session)
   m_busy = TRUE;
 
   // Disable socket menu entries (exception: Close Session)
   m_busy = TRUE;


@@ -277,24 +286,24 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 
   // Send some data and read it back. We know the size of the
   // buffer, so we can specify the exact number of bytes to be
 
   // Send some data and read it back. We know the size of the
   // buffer, so we can specify the exact number of bytes to be

-  // sent or received and use the WAITALL flag. Also, we have
-  // disabled menu entries which could interfere with the test,
-  // so we can safely avoid the BLOCK (formerly SPEED) flag.
+  // sent or received and use the wxSOCKET_WAITALL flag. Also,
+  // we have disabled menu entries which could interfere with
+  // the test, so we can safely avoid the wxSOCKET_BLOCK flag.

   //
   // First we send a byte with the length of the string, then
   // we send the string itself (do NOT try to send any integral
   //
   // First we send a byte with the length of the string, then
   // we send the string itself (do NOT try to send any integral

-  // value larger than a byte "as is" acrosss the network, or
+  // value larger than a byte "as is" across the network, or

   // you might be in trouble! Ever heard about big and little
   // endian computers?)
   //
   m_sock->SetFlags(wxSOCKET_WAITALL);
 
   // you might be in trouble! Ever heard about big and little
   // endian computers?)
   //
   m_sock->SetFlags(wxSOCKET_WAITALL);
 

-  buf1 = _T("Test string (less than 127 chars!)");
+  buf1 = _T("Test string (less than 256 chars!)");

   len  = wxStrlen(buf1) + 1;
   buf2 = new char[len];
 
   m_text->AppendText(_T("Sending a test buffer to the server ..."));
   len  = wxStrlen(buf1) + 1;
   buf2 = new char[len];
 
   m_text->AppendText(_T("Sending a test buffer to the server ..."));

-  m_sock->Write(&len, 1);
+  m_sock->Write((char *)&len, 1);

   m_sock->Write(buf1, len);
   m_text->AppendText(m_sock->Error() ? _T("failed !\n") : _T("done\n"));
 
   m_sock->Write(buf1, len);
   m_text->AppendText(m_sock->Error() ? _T("failed !\n") : _T("done\n"));
 


@@ -352,7 +361,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
 
   msg1 = (char *)s.c_str();
   len  = wxStrlen(msg1) + 1;
 
   msg1 = (char *)s.c_str();
   len  = wxStrlen(msg1) + 1;

-  msg2 = (char *)malloc(len);
+  msg2 = new char[len];

 
   m_text->AppendText(_T("Sending the string with WriteMsg ..."));
   m_sock->WriteMsg(msg1, len);
 
   m_text->AppendText(_T("Sending the string with WriteMsg ..."));
   m_sock->WriteMsg(msg1, len);


@@ -384,16 +393,67 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
 
   m_text->AppendText(_T("=== Test 2 ends ===\n"));
 
 
   m_text->AppendText(_T("=== Test 2 ends ===\n"));
 

-  free(msg2);
+  delete[] msg2;

   m_busy = FALSE;
   UpdateStatusBar();
 }
 
 void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
 {
   m_busy = FALSE;
   UpdateStatusBar();
 }
 
 void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
 {

+  char *buf1;
+  char *buf2;
+  unsigned char len;
+
+  // Disable socket menu entries (exception: Close Session)
+  m_busy = TRUE;
+  UpdateStatusBar();
+

   m_text->AppendText(_T("\n=== Test 3 begins ===\n"));
   m_text->AppendText(_T("\n=== Test 3 begins ===\n"));

-  m_text->AppendText(_T("Test 3 not implemented\n"));
+
+  // Tell the server which test we are running
+  char c = 0xDE;
+  m_sock->Write(&c, 1);
+
+  // This test also is similar to the first one but it sends a
+  // large buffer so that wxSocket is actually forced to split
+  // it into pieces and take care of sending everything before
+  // returning.
+  //
+  m_sock->SetFlags(wxSOCKET_WAITALL);
+
+  // Note that len is in kbytes here!
+  len  = 32;
+  buf1 = new char[len * 1024];
+  buf2 = new char[len * 1024];
+
+  for (int i = 0; i < len * 1024; i ++)
+    buf1[i] = (char)(i % 256);
+
+  m_text->AppendText(_T("Sending a large buffer (32K) to the server ..."));
+  m_sock->Write((char *)&len, 1);
+  m_sock->Write(buf1, len * 1024);
+  m_text->AppendText(m_sock->Error() ? _T("failed !\n") : _T("done\n"));
+
+  m_text->AppendText(_T("Receiving the buffer back from server ..."));
+  m_sock->Read(buf2, len * 1024);
+  m_text->AppendText(m_sock->Error() ? _T("failed !\n") : _T("done\n"));
+
+  m_text->AppendText(_T("Comparing the two buffers ..."));
+  if (memcmp(buf1, buf2, len) != 0)
+  {
+    m_text->AppendText(_T("failed!\n"));
+    m_text->AppendText(_T("Test 3 failed !\n"));
+  }
+  else
+  {
+    m_text->AppendText(_T("done\n"));
+    m_text->AppendText(_T("Test 3 passed !\n"));
+  }

   m_text->AppendText(_T("=== Test 3 ends ===\n"));
   m_text->AppendText(_T("=== Test 3 ends ===\n"));

+
+  delete[] buf2;
+  m_busy = FALSE;
+  UpdateStatusBar();

 }
 
 void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event))


@@ -402,6 +462,10 @@ void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event))
   UpdateStatusBar();
 }
 
   UpdateStatusBar();
 }
 

+void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event))
+{
+}
+

 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
   wxString s = _T("OnSocketEvent: ");
 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
   wxString s = _T("OnSocketEvent: ");

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 817c15657b65774b063f28287970dbb5f2f5a964..f24529f16cacca2bdf1c61eaf0fcd1722dd3fe06 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -119,8 +119,8 @@ END_EVENT_TABLE()
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 
 

-// To append sockets for delayed deletion
-extern wxList wxPendingDelete;
+// To append sockets for delayed deletion [XXX: this should be removed]
+extern WXDLLEXPORT wxList wxPendingDelete;

 
 
 // ==========================================================================
 
 
 // ==========================================================================


@@ -177,10 +177,9 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
                            wxPoint(0, 0), m_panel->GetClientSize(),
                            wxTE_MULTILINE | wxTE_READONLY);
 
                            wxPoint(0, 0), m_panel->GetClientSize(),
                            wxTE_MULTILINE | wxTE_READONLY);
 

-  // Create the socket
+  // Create the socket - defaults to localhost:0

   wxIPV4address addr;
   addr.Service(3000);
   wxIPV4address addr;
   addr.Service(3000);

-  addr.LocalHost();

 
   m_server = new wxSocketServer(addr);
   m_server->SetEventHandler(*this, SERVER_ID);
 
   m_server = new wxSocketServer(addr);
   m_server->SetEventHandler(*this, SERVER_ID);


@@ -228,18 +227,18 @@ void MyFrame::Test1(wxSocketBase *sock)
 
   // Receive data from socket and send it back. We will first
   // get a byte with the buffer size, so we can specify the
 
   // Receive data from socket and send it back. We will first
   // get a byte with the buffer size, so we can specify the

-  // exact size and use the WAITALL flag. Also, we disabled
-  // input events so we won't have unwanted reentrance. This
-  // way we can avoid the infamous BLOCK (formerly SPEED) flag.
+  // exact size and use the wxSOCKET_WAITALL flag. Also, we
+  // disabled input events so we won't have unwanted reentrance.
+  // This way we can avoid the infamous wxSOCKET_BLOCK flag.

   //
   sock->SetFlags(wxSOCKET_WAITALL);
 
   sock->Read((char *)&len, 1);
 
   //
   sock->SetFlags(wxSOCKET_WAITALL);
 
   sock->Read((char *)&len, 1);
 

-  buf = (char *)malloc(len);
+  buf = new char[len];

   sock->Read(buf, len);
   sock->Write(buf, len);
   sock->Read(buf, len);
   sock->Write(buf, len);

-  free(buf);
+  delete[] buf;

 
   m_text->AppendText(_T("Test 1 ends\n"));
 }
 
   m_text->AppendText(_T("Test 1 ends\n"));
 }


@@ -249,7 +248,7 @@ void MyFrame::Test2(wxSocketBase *sock)
 #define MAX_MSG_SIZE 10000
 
   wxString s;
 #define MAX_MSG_SIZE 10000
 
   wxString s;

-  char *buf = (char *)malloc(MAX_MSG_SIZE);
+  char *buf = new char[MAX_MSG_SIZE];

   wxUint32 len;
 
   m_text->AppendText(_T("Test 2 begins\n"));
   wxUint32 len;
 
   m_text->AppendText(_T("Test 2 begins\n"));


@@ -263,7 +262,7 @@ void MyFrame::Test2(wxSocketBase *sock)
   m_text->AppendText(s);
 
   sock->WriteMsg(buf, len);
   m_text->AppendText(s);
 
   sock->WriteMsg(buf, len);

-  free(buf);
+  delete[] buf;

 
   m_text->AppendText(_T("Test 2 ends\n"));
 
 
   m_text->AppendText(_T("Test 2 ends\n"));
 


@@ -272,8 +271,22 @@ void MyFrame::Test2(wxSocketBase *sock)
 
 void MyFrame::Test3(wxSocketBase *sock)
 {
 
 void MyFrame::Test3(wxSocketBase *sock)
 {

+  unsigned char len;
+  char *buf;
+

   m_text->AppendText(_T("Test 3 begins\n"));
   m_text->AppendText(_T("Test 3 begins\n"));

-  m_text->AppendText(_T("(not implemented)\n"));
+
+  // This test is similar to the first one, but the len is   
+  // expressed in kbytes - this tests large data transfers.
+  //
+  sock->SetFlags(wxSOCKET_WAITALL);
+
+  sock->Read((char *)&len, 1);
+  buf = new char[len * 1024];
+  sock->Read(buf, len * 1024);
+  sock->Write(buf, len * 1024);
+  delete[] buf;
+

   m_text->AppendText(_T("Test 3 ends\n"));
 }
 
   m_text->AppendText(_T("Test 3 ends\n"));
 }