X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4080f02e3b624be72914c9d25f4e12b163d2ac..fa699cbaaf217af186cd04dd10d6ec67c8667136:/samples/sockets/client.cpp?ds=sidebyside diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp index e0604c063c..b3389bd4eb 100644 --- a/samples/sockets/client.cpp +++ b/samples/sockets/client.cpp @@ -32,7 +32,6 @@ #include "wx/socket.h" #include "wx/url.h" #include "wx/sstream.h" -#include "wx/scopeguard.h" #include // -------------------------------------------------------------------------- @@ -40,7 +39,9 @@ // -------------------------------------------------------------------------- // the application icon -#include "mondrian.xpm" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" +#endif // -------------------------------------------------------------------------- // classes @@ -104,6 +105,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 test begins ===", m_name); + } + + ~TestLogger() + { + wxLogMessage("=== %s test ends ===", m_name); + } + +private: + const wxString m_name; +}; + // -------------------------------------------------------------------------- // constants // -------------------------------------------------------------------------- @@ -171,9 +190,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; @@ -189,28 +207,28 @@ 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(CLIENT_ABOUT, _("&About...\tCtrl-A"), _("Show about dialog")); + m_menuFile->Append(CLIENT_ABOUT, _("&About\tCtrl-A"), _("Show about dialog")); m_menuFile->AppendSeparator(); m_menuFile->Append(CLIENT_QUIT, _("E&xit\tAlt-X"), _("Quit client")); m_menuSocket = new wxMenu(); - m_menuSocket->Append(CLIENT_OPEN, _("&Open session"), _("Connect to server")); + m_menuSocket->Append(CLIENT_OPEN, _("&Open session\tCtrl-O"), _("Connect to server")); #if wxUSE_IPV6 - m_menuSocket->Append(CLIENT_OPENIPV6, _("&Open session(IPv6)"), _("Connect to server(IPv6)")); + m_menuSocket->Append(CLIENT_OPENIPV6, _("&Open session(IPv6)\tShift-Ctrl-O"), _("Connect to server(IPv6)")); #endif m_menuSocket->AppendSeparator(); - m_menuSocket->Append(CLIENT_TEST1, _("Test &1"), _("Test basic functionality")); - m_menuSocket->Append(CLIENT_TEST2, _("Test &2"), _("Test ReadMsg and WriteMsg")); - m_menuSocket->Append(CLIENT_TEST3, _("Test &3"), _("Test large data transfer")); + m_menuSocket->Append(CLIENT_TEST1, _("Test &1\tCtrl-F1"), _("Test basic functionality")); + m_menuSocket->Append(CLIENT_TEST2, _("Test &2\tCtrl-F2"), _("Test ReadMsg and WriteMsg")); + m_menuSocket->Append(CLIENT_TEST3, _("Test &3\tCtrl-F3"), _("Test large data transfer")); m_menuSocket->AppendSeparator(); - m_menuSocket->Append(CLIENT_CLOSE, _("&Close session"), _("Close connection")); + m_menuSocket->Append(CLIENT_CLOSE, _("&Close session\tCtrl-Q"), _("Close connection")); m_menuDatagramSocket = new wxMenu(); - m_menuDatagramSocket->Append(CLIENT_DGRAM, _("Send Datagram"), _("Test UDP sockets")); + m_menuDatagramSocket->Append(CLIENT_DGRAM, _("&Datagram test\tCtrl-D"), _("Test UDP sockets")); #if wxUSE_URL m_menuProtocols = new wxMenu(); @@ -221,8 +239,8 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY, // Append menus to the menubar m_menuBar = new wxMenuBar(); m_menuBar->Append(m_menuFile, _("&File")); - m_menuBar->Append(m_menuSocket, _("&SocketClient")); - m_menuBar->Append(m_menuDatagramSocket, _("&DatagramSocket")); + m_menuBar->Append(m_menuSocket, _("&TCP")); + m_menuBar->Append(m_menuDatagramSocket, _("&UDP")); #if wxUSE_URL m_menuBar->Append(m_menuProtocols, _("&Protocols")); #endif @@ -311,73 +329,20 @@ void MyFrame::OpenConnection(wxSockAddress::Family family) _("Enter the address of the wxSocket demo server:"), _("Connect ..."), _("localhost")); + if ( hostname.empty() ) + return; addr->Hostname(hostname); addr->Service(3000); - // Mini-tutorial for Connect() :-) - // --------------------------- - // - // There are two ways to use Connect(): blocking and non-blocking, - // depending on the value passed as the 'wait' (2nd) parameter. - // - // Connect(addr, true) will wait until the connection completes, - // returning true on success and false on failure. This call blocks - // the GUI (this might be changed in future releases to honour the - // wxSOCKET_BLOCK flag). - // - // Connect(addr, false) will issue a nonblocking connection request - // and return immediately. If the return value is true, then the - // connection has been already successfully established. If it is - // false, you must wait for the request to complete, either with - // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST - // events (please read the documentation). - // - // WaitOnConnect() itself never blocks the GUI (this might change - // in the future to honour the wxSOCKET_BLOCK flag). This call will - // return false on timeout, or true if the connection request - // completes, which in turn might mean: + // we connect asynchronously and will get a wxSOCKET_CONNECTION event when + // the connection is really established // - // a) That the connection was successfully established - // b) That the connection request failed (for example, because - // it was refused by the peer. - // - // Use IsConnected() to distinguish between these two. - // - // So, in a brief, you should do one of the following things: - // - // For blocking Connect: - // - // bool success = client->Connect(addr, true); - // - // For nonblocking Connect: - // - // client->Connect(addr, false); - // - // bool waitmore = true; - // while (! client->WaitOnConnect(seconds, millis) && waitmore ) - // { - // // possibly give some feedback to the user, - // // update waitmore if needed. - // } - // bool success = client->IsConnected(); - // - // And that's all :-) + // if you want to make sure that connection is established right here you + // could call WaitOnConnect(timeout) instead + wxLogMessage("Trying to connect to %s:%d", hostname, addr->Service()); - m_text->AppendText(_("\nTrying to connect (timeout = 10 sec) ...\n")); m_sock->Connect(*addr, false); - m_sock->WaitOnConnect(10); - - if (m_sock->IsConnected()) - m_text->AppendText(_("Succeeded ! Connection established\n")); - else - { - m_sock->Close(); - m_text->AppendText(_("Failed ! Unable to connect\n")); - wxMessageBox(_("Can't connect to the specified host"), _("Alert !")); - } - - UpdateStatusBar(); } void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) @@ -406,9 +371,9 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) m_sock->SetFlags(wxSOCKET_WAITALL); - const wxChar *buf1 = _T("Test string (less than 256 chars!)"); - unsigned char len = (unsigned char)((wxStrlen(buf1) + 1)*sizeof(wxChar)); - wxChar *buf2 = new wxChar[wxStrlen(buf1) + 1]; + const char *buf1 = "Test string (less than 256 chars!)"; + unsigned char len = (unsigned char)(wxStrlen(buf1) + 1); + wxCharBuffer buf2(wxStrlen(buf1)); m_text->AppendText(_("Sending a test buffer to the server ...")); m_sock->Write(&len, 1); @@ -416,7 +381,7 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n")); m_text->AppendText(_("Receiving the buffer back from server ...")); - m_sock->Read(buf2, len); + m_sock->Read(buf2.data(), len); m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n")); m_text->AppendText(_("Comparing the two buffers ...")); @@ -432,17 +397,12 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) } m_text->AppendText(_("=== Test 1 ends ===\n")); - delete[] buf2; m_busy = false; UpdateStatusBar(); } void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) { - const wxChar *msg1; - wxChar *msg2; - size_t len; - // Disable socket menu entries (exception: Close Session) m_busy = true; UpdateStatusBar(); @@ -467,9 +427,9 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) _("Test 2 ..."), _("Yes I like wxWidgets!")); - msg1 = s.c_str(); - len = (wxStrlen(msg1) + 1) * sizeof(wxChar); - msg2 = new wxChar[wxStrlen(msg1) + 1]; + const wxScopedCharBuffer msg1(s.utf8_str()); + size_t len = wxStrlen(msg1) + 1; + wxCharBuffer msg2(wxStrlen(msg1)); m_text->AppendText(_("Sending the string with WriteMsg ...")); m_sock->WriteMsg(msg1, len); @@ -482,7 +442,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) if (m_sock->IsData()) { m_text->AppendText(_("Reading the string back with ReadMsg ...")); - m_sock->ReadMsg(msg2, len); + m_sock->ReadMsg(msg2.data(), len); m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n")); m_text->AppendText(_("Comparing the two buffers ...")); if (memcmp(msg1, msg2, len) != 0) @@ -501,17 +461,12 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("=== Test 2 ends ===\n")); - delete[] msg2; 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(); @@ -530,12 +485,12 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) m_sock->SetFlags(wxSOCKET_WAITALL); // Note that len is in kbytes here! - len = 32; - buf1 = new char[len * 1024]; - buf2 = new char[len * 1024]; + const unsigned char len = 32; + wxCharBuffer buf1(len * 1024), + buf2(len * 1024); - for (int i = 0; i < len * 1024; i ++) - buf1[i] = (char)(i % 256); + for (size_t i = 0; i < len * 1024; i ++) + buf1.data()[i] = (char)(i % 256); m_text->AppendText(_("Sending a large buffer (32K) to the server ...")); m_sock->Write(&len, 1); @@ -543,7 +498,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n")); m_text->AppendText(_("Receiving the buffer back from server ...")); - m_sock->Read(buf2, len * 1024); + m_sock->Read(buf2.data(), len * 1024); m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n")); m_text->AppendText(_("Comparing the two buffers ...")); @@ -559,7 +514,6 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) } m_text->AppendText(_("=== Test 3 ends ===\n")); - delete[] buf2; m_busy = false; UpdateStatusBar(); } @@ -572,9 +526,52 @@ void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event)) { - m_text->AppendText(_("\n=== Datagram test begins ===\n")); - m_text->AppendText(_("Sorry, not implemented\n")); - m_text->AppendText(_("=== Datagram test ends ===\n")); + wxString hostname = wxGetTextFromUser + ( + "Enter the address of the wxSocket demo server:", + "UDP peer", + "localhost" + ); + if ( hostname.empty() ) + return; + + TestLogger logtest("UDP"); + + wxIPV4address addrLocal; + addrLocal.Hostname(); + wxDatagramSocket sock(addrLocal); + if ( !sock.IsOk() ) + { + wxLogMessage("ERROR: failed to create UDP socket"); + return; + } + + wxLogMessage("Created UDP socket at %s:%u", + addrLocal.IPAddress(), addrLocal.Service()); + + wxIPV4address addrPeer; + addrPeer.Hostname(hostname); + addrPeer.Service(3000); + + wxLogMessage("Testing UDP with peer at %s:%u", + addrPeer.IPAddress(), addrPeer.Service()); + + char buf[] = "Uryyb sebz pyvrag!"; + if ( sock.SendTo(addrPeer, buf, sizeof(buf)).LastCount() != sizeof(buf) ) + { + wxLogMessage("ERROR: failed to send data"); + return; + } + + if ( sock.RecvFrom(addrPeer, buf, sizeof(buf)).LastCount() != sizeof(buf) ) + { + wxLogMessage("ERROR: failed to receive data"); + return; + } + + wxLogMessage("Received \"%s\" from %s:%u.", + wxString::From8BitData(buf, sock.LastCount()), + addrPeer.IPAddress(), addrPeer.Service()); } #if wxUSE_URL @@ -595,8 +592,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) s_urlname = urlname; - wxLogMessage("=== URL test begins ==="); - wxON_BLOCK_EXIT1( wxLogMessage, "=== URL test ends ===" ); + TestLogger logtest("URL"); // Parse the URL wxURL url(urlname); @@ -616,14 +612,16 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) } // Print the contents type and file size - wxLogMessage("Contents type: %s\nFile size: %i\nStarting to download...", + wxLogMessage("Contents type: %s\nFile size: %lu\nStarting to download...", url.GetProtocol().GetContentType(), - data->GetSize()); + static_cast( data->GetSize() )); // Get the data wxStringOutputStream sout; if ( data->Read(sout).GetLastError() != wxSTREAM_EOF ) + { wxLogError("Error reading the input stream."); + } wxLogMessage("Text retrieved from URL \"%s\" follows:\n%s", urlname, sout.GetString()); @@ -633,29 +631,38 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSocketEvent(wxSocketEvent& event) { - wxString s = _("OnSocketEvent: "); - - switch(event.GetSocketEvent()) - { - case wxSOCKET_INPUT : s.Append(_("wxSOCKET_INPUT\n")); break; - case wxSOCKET_LOST : s.Append(_("wxSOCKET_LOST\n")); break; - case wxSOCKET_CONNECTION : s.Append(_("wxSOCKET_CONNECTION\n")); break; - default : s.Append(_("Unexpected event !\n")); break; - } - - m_text->AppendText(s); - UpdateStatusBar(); + switch ( event.GetSocketEvent() ) + { + case wxSOCKET_INPUT: + wxLogMessage("Input available on the socket"); + break; + + case wxSOCKET_LOST: + wxLogMessage("Socket connection was unexpectedly lost."); + UpdateStatusBar(); + break; + + case wxSOCKET_CONNECTION: + wxLogMessage("... socket is now connected."); + UpdateStatusBar(); + break; + + default: + wxLogMessage("Unknown socket event!!!"); + break; + } } // convenience functions void MyFrame::UpdateStatusBar() { +#if wxUSE_STATUSBAR wxString s; if (!m_sock->IsConnected()) { - s.Printf(_("Not connected")); + s = "Not connected"; } else { @@ -666,10 +673,9 @@ void MyFrame::UpdateStatusBar() #endif m_sock->GetPeer(addr); - s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service()); + s.Printf("%s : %d", addr.Hostname(), addr.Service()); } -#if wxUSE_STATUSBAR SetStatusText(s, 1); #endif // wxUSE_STATUSBAR