Get rid of useless temporaries in wxAffineMatrix2D unit test.

[wxWidgets.git] / samples / sockets / server.cpp

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index b7063e93d041871a22d9ebe2336730795d1fd2e9..a57137cbede9bad612b41333c6da95212dfccc37 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -2,10 +2,10 @@
 // Name:        server.cpp
 // Purpose:     Server for wxSocket demo
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
-// Modified by:
 // Created:     1999/09/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
+//              (c) 2009 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -29,14 +29,25 @@
 #  include "wx/wx.h"
 #endif
 
+#include "wx/busyinfo.h"
 #include "wx/socket.h"
 
+// this example is currently written to use only IP or only IPv6 sockets, it
+// should be extended to allow using either in the future
+#if wxUSE_IPV6
+    typedef wxIPV6address IPaddress;
+#else
+    typedef wxIPV4address IPaddress;
+#endif
+
 // --------------------------------------------------------------------------
 // resources
 // --------------------------------------------------------------------------
 
 // the application icon
-#include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
 
 // --------------------------------------------------------------------------
 // classes
@@ -57,6 +68,8 @@ public:
   ~MyFrame();
 
   // event handlers (these functions should _not_ be virtual)
+  void OnUDPTest(wxCommandEvent& event);
+  void OnWaitForAccept(wxCommandEvent& event);
   void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);
   void OnServerEvent(wxSocketEvent& event);
@@ -107,6 +120,8 @@ private:
 enum
 {
   // menu items
+  SERVER_UDPTEST = 10,
+  SERVER_WAITFORACCEPT,
   SERVER_QUIT = wxID_EXIT,
   SERVER_ABOUT = wxID_ABOUT,
 
@@ -122,6 +137,8 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(SERVER_QUIT,  MyFrame::OnQuit)
   EVT_MENU(SERVER_ABOUT, MyFrame::OnAbout)
+  EVT_MENU(SERVER_UDPTEST, MyFrame::OnUDPTest)
+  EVT_MENU(SERVER_WAITFORACCEPT, MyFrame::OnWaitForAccept)
   EVT_SOCKET(SERVER_ID,  MyFrame::OnServerEvent)
   EVT_SOCKET(SOCKET_ID,  MyFrame::OnSocketEvent)
 END_EVENT_TABLE()
@@ -145,9 +162,8 @@ bool MyApp::OnInit()
   // Create the main application window
   MyFrame *frame = new MyFrame();
 
-  // Show it and tell the application that it's our main window
+  // Show it
   frame->Show(true);
-  SetTopWindow(frame);
 
   // Success
   return true;
@@ -164,10 +180,13 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
                              wxDefaultPosition, wxSize(300, 200))
 {
   // Give the frame an icon
-  SetIcon(wxICON(mondrian));
+  SetIcon(wxICON(sample));
 
   // Make menus
   m_menuFile = new wxMenu();
+  m_menuFile->Append(SERVER_WAITFORACCEPT, "&Wait for connection\tCtrl-W");
+  m_menuFile->Append(SERVER_UDPTEST, "&UDP test\tCtrl-U");
+  m_menuFile->AppendSeparator();
   m_menuFile->Append(SERVER_ABOUT, _("&About...\tCtrl-A"), _("Show about dialog"));
   m_menuFile->AppendSeparator();
   m_menuFile->Append(SERVER_QUIT, _("E&xit\tAlt-X"), _("Quit server"));
@@ -190,13 +209,11 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
   delete wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
 
   // Create the address - defaults to localhost:0 initially
-#if wxUSE_IPV6
-  wxIPV6address addr;
-#else
-  wxIPV4address addr;
-#endif
+  IPaddress addr;
   addr.Service(3000);
 
+  wxLogMessage("Creating server at %s:%u", addr.IPAddress(), addr.Service());
+
   // Create the socket
   m_server = new wxSocketServer(addr);
 
@@ -206,9 +223,16 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
     wxLogMessage("Could not listen at the specified port !");
     return;
   }
+
+  IPaddress addrReal;
+  if ( !m_server->GetLocal(addrReal) )
+  {
+    wxLogMessage("ERROR: couldn't get the address we bound to");
+  }
   else
   {
-    wxLogMessage("Server listening.");
+    wxLogMessage("Server listening at %s:%u",
+                 addrReal.IPAddress(), addrReal.Service());
   }
 
   // Setup the event handler and subscribe to connection events
@@ -242,6 +266,53 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
                wxOK | wxICON_INFORMATION, this);
 }
 
+void MyFrame::OnUDPTest(wxCommandEvent& WXUNUSED(event))
+{
+    TestLogger logtest("UDP test");
+
+    IPaddress addr;
+    addr.Service(3000);
+    wxDatagramSocket sock(addr);
+
+    char buf[1024];
+    size_t n = sock.RecvFrom(addr, buf, sizeof(buf)).LastCount();
+    if ( !n )
+    {
+        wxLogMessage("ERROR: failed to receive data");
+        return;
+    }
+
+    wxLogMessage("Received \"%s\" from %s:%u.",
+                 wxString::From8BitData(buf, n),
+                 addr.IPAddress(), addr.Service());
+
+    for ( size_t i = 0; i < n; i++ )
+    {
+        char& c = buf[i];
+        if ( (c >= 'A' && c <= 'M') || (c >= 'a' && c <= 'm') )
+            c += 13;
+        else if ( (c >= 'N' && c <= 'Z') || (c >= 'n' && c <= 'z') )
+            c -= 13;
+    }
+
+    if ( sock.SendTo(addr, buf, n).LastCount() != n )
+    {
+        wxLogMessage("ERROR: failed to send data");
+        return;
+    }
+}
+
+void MyFrame::OnWaitForAccept(wxCommandEvent& WXUNUSED(event))
+{
+    TestLogger logtest("WaitForAccept() test");
+
+    wxBusyInfo("Waiting for connection for 10 seconds...", this);
+    if ( m_server->WaitForAccept(10) )
+        wxLogMessage("Accepted client connection.");
+    else
+        wxLogMessage("Connection error or timeout expired.");
+}
+
 void MyFrame::Test1(wxSocketBase *sock)
 {
   TestLogger logtest("Test 1");
@@ -335,7 +406,16 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
 
   if (sock)
   {
-    wxLogMessage("New client connection accepted");
+    IPaddress addr;
+    if ( !sock->GetPeer(addr) )
+    {
+      wxLogMessage("New connection from unknown client accepted.");
+    }
+    else
+    {
+      wxLogMessage("New client connection from %s:%u accepted",
+                   addr.IPAddress(), addr.Service());
+    }
   }
   else
   {