X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..cc699de848bcead97528901420ee975df1b9442a:/samples/sockets/server.cpp diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp index 2702c113c4..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 -// Modified by: // Created: 1999/09/19 // RCS-ID: $Id$ // Copyright: (c) 1999 Guillermo Rodriguez Garcia +// (c) 2009 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -29,15 +29,24 @@ # 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 -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) -# include "mondrian.xpm" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" #endif // -------------------------------------------------------------------------- @@ -59,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); @@ -83,6 +94,24 @@ private: DECLARE_EVENT_TABLE() }; +// simple helper class to log start and end of each test +class TestLogger +{ +public: + TestLogger(const wxString& name) : m_name(name) + { + wxLogMessage("=== %s begins ===", m_name); + } + + ~TestLogger() + { + wxLogMessage("=== %s ends ===", m_name); + } + +private: + const wxString m_name; +}; + // -------------------------------------------------------------------------- // constants // -------------------------------------------------------------------------- @@ -91,6 +120,8 @@ private: enum { // menu items + SERVER_UDPTEST = 10, + SERVER_WAITFORACCEPT, SERVER_QUIT = wxID_EXIT, SERVER_ABOUT = wxID_ABOUT, @@ -106,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() @@ -123,12 +156,14 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // 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; @@ -145,11 +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_ABOUT, _("&About...\tCtrl-A"), _("Show about dialog")); + 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")); @@ -168,23 +206,33 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY, _("Welcome to wxSocket demo: Server\n"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY); + delete wxLog::SetActiveTarget(new wxLogTextCtrl(m_text)); // Create the address - defaults to localhost:0 initially - wxIPV4address addr; + IPaddress addr; addr.Service(3000); + wxLogMessage("Creating server at %s:%u", addr.IPAddress(), addr.Service()); + // 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()) { - m_text->AppendText(_("Could not listen at the specified port !\n\n")); + 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 { - m_text->AppendText(_("Server listening.\n\n")); + wxLogMessage("Server listening at %s:%u", + addrReal.IPAddress(), addrReal.Service()); } // Setup the event handler and subscribe to connection events @@ -218,12 +266,56 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) wxOK | wxICON_INFORMATION, this); } -void MyFrame::Test1(wxSocketBase *sock) +void MyFrame::OnUDPTest(wxCommandEvent& WXUNUSED(event)) { - unsigned char len; - char *buf; + TestLogger logtest("UDP test"); + + IPaddress addr; + addr.Service(3000); + wxDatagramSocket sock(addr); - m_text->AppendText(_("Test 1 begins\n")); + 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"); // Receive data from socket and send it back. We will first // get a byte with the buffer size, so we can specify the @@ -234,54 +326,45 @@ void MyFrame::Test1(wxSocketBase *sock) sock->SetFlags(wxSOCKET_WAITALL); // Read the size + unsigned char len; sock->Read(&len, 1); - buf = new char[len]; + wxCharBuffer buf(len); // Read the data - sock->Read(buf, len); - m_text->AppendText(_("Got the data, sending it back\n")); + sock->Read(buf.data(), len); + wxLogMessage("Got the data, sending it back"); // Write it back sock->Write(buf, len); - delete[] buf; - - m_text->AppendText(_("Test 1 ends\n\n")); } void MyFrame::Test2(wxSocketBase *sock) { -#define MAX_MSG_SIZE 10000 - - wxString s; - wxChar *buf = new wxChar[MAX_MSG_SIZE]; - wxUint32 len; + char buf[4096]; - m_text->AppendText(_("Test 2 begins\n")); + TestLogger logtest("Test 2"); // We don't need to set flags because ReadMsg and WriteMsg // are not affected by them anyway. // Read the message - len = sock->ReadMsg(buf, MAX_MSG_SIZE * sizeof(wxChar)).LastCount(); - s.Printf(_("Client says: %s\n"), buf); - m_text->AppendText(s); - m_text->AppendText(_("Sending the data back\n")); + wxUint32 len = sock->ReadMsg(buf, sizeof(buf)).LastCount(); + if ( !len ) + { + wxLogError("Failed to read message."); + return; + } + + wxLogMessage("Got \"%s\" from client.", wxString::FromUTF8(buf, len)); + wxLogMessage("Sending the data back"); // Write it back sock->WriteMsg(buf, len); - delete[] buf; - - m_text->AppendText(_("Test 2 ends\n\n")); - -#undef MAX_MSG_SIZE } void MyFrame::Test3(wxSocketBase *sock) { - unsigned char len; - char *buf; - - m_text->AppendText(_("Test 3 begins\n")); + TestLogger logtest("Test 3"); // This test is similar to the first one, but the len is // expressed in kbytes - this tests large data transfers. @@ -289,18 +372,16 @@ void MyFrame::Test3(wxSocketBase *sock) sock->SetFlags(wxSOCKET_WAITALL); // Read the size + unsigned char len; sock->Read(&len, 1); - buf = new char[len * 1024]; + wxCharBuffer buf(len*1024); // Read the data - sock->Read(buf, len * 1024); - m_text->AppendText(_("Got the data, sending it back\n")); + sock->Read(buf.data(), len * 1024); + wxLogMessage("Got the data, sending it back"); // Write it back sock->Write(buf, len * 1024); - delete[] buf; - - m_text->AppendText(_("Test 3 ends\n\n")); } void MyFrame::OnServerEvent(wxSocketEvent& event) @@ -325,11 +406,20 @@ void MyFrame::OnServerEvent(wxSocketEvent& event) if (sock) { - m_text->AppendText(_("New client connection accepted\n\n")); + 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 { - m_text->AppendText(_("Error: couldn't accept a new connection\n\n")); + wxLogMessage("Error: couldn't accept a new connection"); return; } @@ -375,7 +465,7 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event) case 0xCE: Test2(sock); break; case 0xDE: Test3(sock); break; default: - m_text->AppendText(_("Unknown test id received from client\n\n")); + wxLogMessage("Unknown test id received from client"); } // Enable input events again. @@ -395,7 +485,7 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event) // middle of a test or something. Destroy() takes care of all // this for us. - m_text->AppendText(_("Deleting socket.\n\n")); + wxLogMessage("Deleting socket."); sock->Destroy(); break; }