X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46b11427d6c54d4b3ed9cd40b6770876b9eb94da..c4239f1920f34dd26e30550bbc7e7d3e6f3f2926:/samples/sockets/server.cpp

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 12ca047bf3..04b4ce33f2 100644
--- 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,6 +29,7 @@
 #  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
@@ -44,7 +45,9 @@
 // --------------------------------------------------------------------------
 
 // the application icon
-#include "mondrian.xpm"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
+#endif
 
 // --------------------------------------------------------------------------
 // classes
@@ -66,6 +69,7 @@ public:
 
   // 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);
@@ -117,6 +121,7 @@ enum
 {
   // menu items
   SERVER_UDPTEST = 10,
+  SERVER_WAITFORACCEPT,
   SERVER_QUIT = wxID_EXIT,
   SERVER_ABOUT = wxID_ABOUT,
 
@@ -133,6 +138,7 @@ 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()
@@ -156,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;
@@ -175,13 +180,14 @@ 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->Append(SERVER_ABOUT, _("&About\tCtrl-A"), _("Show about dialog"));
   m_menuFile->AppendSeparator();
   m_menuFile->Append(SERVER_QUIT, _("E&xit\tAlt-X"), _("Quit server"));
 
@@ -211,8 +217,8 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
   // Create the socket
   m_server = new wxSocketServer(addr);
 
-  // We use Ok() here to see if the server is really listening
-  if (! m_server->Ok())
+  // We use IsOk() here to see if the server is really listening
+  if (! m_server->IsOk())
   {
     wxLogMessage("Could not listen at the specified port !");
     return;
@@ -220,10 +226,14 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
 
   IPaddress addrReal;
   if ( !m_server->GetLocal(addrReal) )
+  {
     wxLogMessage("ERROR: couldn't get the address we bound to");
+  }
   else
+  {
     wxLogMessage("Server listening at %s:%u",
                  addrReal.IPAddress(), addrReal.Service());
+  }
 
   // Setup the event handler and subscribe to connection events
   m_server->SetEventHandler(*this, SERVER_ID);
@@ -292,6 +302,17 @@ void MyFrame::OnUDPTest(wxCommandEvent& WXUNUSED(event))
     }
 }
 
+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");
@@ -387,10 +408,14 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
   {
     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
   {