X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd4d918f36b7df736e63f9aa934d479e4f3ff346..89b3361ec25cf1e6d255b14c7633d8375646e4fb:/samples/sockets/client.cpp diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp index 0fdd4fff83..b3389bd4eb 100644 --- a/samples/sockets/client.cpp +++ b/samples/sockets/client.cpp @@ -17,11 +17,6 @@ // headers // -------------------------------------------------------------------------- -#ifdef __GNUG__ -# pragma implementation "client.cpp" -# pragma interface "client.cpp" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -29,22 +24,23 @@ # pragma hdrstop #endif -// for all others, include the necessary headers +// for all others, include the necessary headers #ifndef WX_PRECOMP # include "wx/wx.h" #endif #include "wx/socket.h" #include "wx/url.h" -#include "wx/wfstream.h" +#include "wx/sstream.h" +#include // -------------------------------------------------------------------------- // resources // -------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) -# include "mondrian.xpm" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" #endif // -------------------------------------------------------------------------- @@ -76,8 +72,15 @@ public: void OnTest3(wxCommandEvent& event); void OnCloseConnection(wxCommandEvent& event); +#if wxUSE_URL // event handlers for Protocols menu void OnTestURL(wxCommandEvent& event); +#endif +#if wxUSE_IPV6 + void OnOpenConnectionIPv6(wxCommandEvent& event); +#endif + + void OpenConnection(wxSockAddress::Family family); // event handlers for DatagramSocket menu (stub) void OnDatagram(wxCommandEvent& event); @@ -98,10 +101,28 @@ private: wxMenuBar *m_menuBar; bool m_busy; - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro 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 // -------------------------------------------------------------------------- @@ -110,14 +131,19 @@ private: enum { // menu items - CLIENT_QUIT = 1000, - CLIENT_ABOUT, - CLIENT_OPEN, + CLIENT_QUIT = wxID_EXIT, + CLIENT_ABOUT = wxID_ABOUT, + CLIENT_OPEN = 100, +#if wxUSE_IPV6 + CLIENT_OPENIPV6, +#endif CLIENT_TEST1, CLIENT_TEST2, CLIENT_TEST3, CLIENT_CLOSE, +#if wxUSE_URL CLIENT_TESTURL, +#endif CLIENT_DGRAM, // id for socket @@ -125,19 +151,24 @@ enum }; // -------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // -------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(CLIENT_QUIT, MyFrame::OnQuit) EVT_MENU(CLIENT_ABOUT, MyFrame::OnAbout) EVT_MENU(CLIENT_OPEN, MyFrame::OnOpenConnection) +#if wxUSE_IPV6 + EVT_MENU(CLIENT_OPENIPV6, MyFrame::OnOpenConnectionIPv6) +#endif EVT_MENU(CLIENT_TEST1, MyFrame::OnTest1) EVT_MENU(CLIENT_TEST2, MyFrame::OnTest2) EVT_MENU(CLIENT_TEST3, MyFrame::OnTest3) EVT_MENU(CLIENT_CLOSE, MyFrame::OnCloseConnection) EVT_MENU(CLIENT_DGRAM, MyFrame::OnDatagram) +#if wxUSE_URL EVT_MENU(CLIENT_TESTURL, MyFrame::OnTestURL) +#endif EVT_SOCKET(SOCKET_ID, MyFrame::OnSocketEvent) END_EVENT_TABLE() @@ -153,15 +184,17 @@ 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 - frame->Show(TRUE); - SetTopWindow(frame); + // Show it + frame->Show(true); // success - return TRUE; + return true; } // -------------------------------------------------------------------------- @@ -169,51 +202,61 @@ bool MyApp::OnInit() // -------------------------------------------------------------------------- // frame constructor -MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1, +MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY, _("wxSocket demo: Client"), 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)\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(); - m_menuProtocols->Append(CLIENT_TESTURL, _("Test URL"), _("Get data from the specified URL")); + m_menuProtocols->Append(CLIENT_TESTURL, _("Test URL\tCtrl-U"), + _("Get data from the specified URL")); +#endif // 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 SetMenuBar(m_menuBar); +#if wxUSE_STATUSBAR // Status bar CreateStatusBar(2); +#endif // wxUSE_STATUSBAR // Make a textctrl for logging - m_text = new wxTextCtrl(this, -1, - _("Welcome to wxSocket demo: Client\n" - "Client ready\n"), + m_text = new wxTextCtrl(this, wxID_ANY, + _("Welcome to wxSocket demo: Client\nClient ready\n"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY); + delete wxLog::SetActiveTarget(new wxLogTextCtrl(m_text)); // Create the socket m_sock = new wxSocketClient(); @@ -223,9 +266,9 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1, m_sock->SetNotify(wxSOCKET_CONNECTION_FLAG | wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG); - m_sock->Notify(TRUE); + m_sock->Notify(true); - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } @@ -239,113 +282,79 @@ MyFrame::~MyFrame() void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_("wxSocket demo: Client\n" - "(c) 1999 Guillermo Rodriguez Garcia\n"), + wxMessageBox(_("wxSocket demo: Client\n(c) 1999 Guillermo Rodriguez Garcia\n"), _("About Client"), wxOK | wxICON_INFORMATION, this); } void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) { - wxIPV4address addr; + OpenConnection(wxSockAddress::IPV4); +} +#if wxUSE_IPV6 +void MyFrame::OnOpenConnectionIPv6(wxCommandEvent& WXUNUSED(event)) +{ + OpenConnection(wxSockAddress::IPV6); +} +#endif // wxUSE_IPV6 + +void MyFrame::OpenConnection(wxSockAddress::Family family) +{ + wxUnusedVar(family); // unused in !wxUSE_IPV6 case + + wxIPaddress * addr; + wxIPV4address addr4; +#if wxUSE_IPV6 + wxIPV6address addr6; + if ( family == wxSockAddress::IPV6 ) + addr = &addr6; + else +#endif + addr = &addr4; - m_menuSocket->Enable(CLIENT_OPEN, FALSE); - m_menuSocket->Enable(CLIENT_CLOSE, FALSE); + m_menuSocket->Enable(CLIENT_OPEN, false); +#if wxUSE_IPV6 + m_menuSocket->Enable(CLIENT_OPENIPV6, false); +#endif + m_menuSocket->Enable(CLIENT_CLOSE, false); // Ask user for server address wxString hostname = wxGetTextFromUser( _("Enter the address of the wxSocket demo server:"), _("Connect ..."), _("localhost")); + if ( hostname.empty() ) + return; - addr.Hostname(hostname); - addr.Service(3000); + 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 succesfully 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). + // we connect asynchronously and will get a wxSOCKET_CONNECTION event when + // the connection is really established // - // 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: - // - // 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 = Connect(addr, TRUE); - // - // For nonblocking Connect: - // - // Connect(addr, FALSE); - // - // bool waitmore; - // while (!WaitOnConnect(seconds, millis) && waitmore) - // { - // // possibly give some feedback to the user, - // // update waitmore if needed. - // } - // bool success = IsConnected(); - // - // And that's all :-) - - 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(); + // 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_sock->Connect(*addr, false); } void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) { - const char *buf1; - char *buf2; - unsigned char len; - // Disable socket menu entries (exception: Close Session) - m_busy = TRUE; + m_busy = true; UpdateStatusBar(); m_text->AppendText(_("\n=== Test 1 begins ===\n")); // Tell the server which test we are running - char c = 0xBE; + unsigned char c = 0xBE; m_sock->Write(&c, 1); // Send some data and read it back. We know the size of the @@ -362,17 +371,17 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) m_sock->SetFlags(wxSOCKET_WAITALL); - buf1 = _("Test string (less than 256 chars!)"); - len = wxStrlen(buf1) + 1; - buf2 = new char[len]; + 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((char *)&len, 1); + m_sock->Write(&len, 1); m_sock->Write(buf1, len); 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 ...")); @@ -388,25 +397,20 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) } m_text->AppendText(_("=== Test 1 ends ===\n")); - delete[] buf2; - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) { - char *msg1; - char *msg2; - size_t len; - // Disable socket menu entries (exception: Close Session) - m_busy = TRUE; + m_busy = true; UpdateStatusBar(); m_text->AppendText(_("\n=== Test 2 begins ===\n")); // Tell the server which test we are running - char c = 0xCE; + unsigned char c = 0xCE; m_sock->Write(&c, 1); // Here we use ReadMsg and WriteMsg to send messages with @@ -421,11 +425,11 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) wxString s = wxGetTextFromUser( _("Enter an arbitrary string to send to the server:"), _("Test 2 ..."), - _("Yes I like wxWindows!")); + _("Yes I like wxWidgets!")); - msg1 = (char *)s.c_str(); - len = wxStrlen(msg1) + 1; - msg2 = new char[len]; + 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); @@ -438,12 +442,12 @@ 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) { - m_text->AppendText(_("failed!\n")); + m_text->AppendText(_("failed!\n")); m_text->AppendText(_("Test 2 failed !\n")); } else @@ -457,25 +461,20 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("=== Test 2 ends ===\n")); - delete[] msg2; - m_busy = FALSE; + 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; + m_busy = true; UpdateStatusBar(); m_text->AppendText(_("\n=== Test 3 begins ===\n")); // Tell the server which test we are running - char c = 0xDE; + unsigned char c = 0xDE; m_sock->Write(&c, 1); // This test also is similar to the first one but it sends a @@ -486,20 +485,20 @@ 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((char *)&len, 1); + m_sock->Write(&len, 1); m_sock->Write(buf1, len * 1024); 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 ...")); @@ -515,8 +514,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) } m_text->AppendText(_("=== Test 3 ends ===\n")); - delete[] buf2; - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } @@ -528,106 +526,163 @@ void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event)) { - m_text->AppendText(_("=== Datagram test begins ===")); - m_text->AppendText(_("Sorry, not implemented")); - m_text->AppendText(_("=== Datagram test ends ===")); + 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 + void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) { - // Note that we are creating a new socket here, so this - // won't mess with the client/server demo. - - // Ask for the URL - m_text->AppendText(_("\n=== URL test begins ===\n")); - wxString urlname = wxGetTextFromUser(_("Enter an URL to get"), - _("URL:"), - _("http://localhost")); - - // Parse the URL - wxURL url(urlname); - if (url.GetError() != wxURL_NOERR) - { - m_text->AppendText(_("Error: couldn't parse URL\n")); - m_text->AppendText(_("=== URL test ends ===\n")); - return; - } + // Ask for the URL + static wxString s_urlname("http://www.google.com/"); + wxString urlname = wxGetTextFromUser + ( + _("Enter an URL to get"), + _("URL:"), + s_urlname + ); + if ( urlname.empty() ) + return; // cancelled by user - // Try to get the input stream (connects to the given URL) - m_text->AppendText(_("Trying to establish connection...\n")); - wxYield(); - wxInputStream *data = url.GetInputStream(); - if (!data) - { - m_text->AppendText(_("Error: couldn't read from URL\n")); - m_text->AppendText(_("=== URL test ends ===\n")); - return; - } + s_urlname = urlname; - // Print the contents type and file size - wxString s; - s.Printf(_("Contents type: %s\n" - "File size: %i\n" - "Starting to download...\n"), - url.GetProtocol().GetContentType().c_str(), - data->GetSize()); - m_text->AppendText(s); - wxYield(); - - // Get the data - wxFileOutputStream sout(wxString("test.url")); - if (!sout.Ok()) - { - m_text->AppendText(_("Error: couldn't open file for output\n")); - m_text->AppendText(_("=== URL test ends ===\n")); - return; - } - data->Read(sout); - m_text->AppendText(_("Results written to file: test.url\n")); - m_text->AppendText(_("Done.\n")); - m_text->AppendText(_("=== URL test ends ===\n")); + TestLogger logtest("URL"); + + // Parse the URL + wxURL url(urlname); + if ( url.GetError() != wxURL_NOERR ) + { + wxLogError("Failed to parse URL \"%s\"", urlname); + return; + } + + // Try to get the input stream (connects to the given URL) + wxLogMessage("Establishing connection to \"%s\"...", urlname); + const std::auto_ptr data(url.GetInputStream()); + if ( !data.get() ) + { + wxLogError("Failed to retrieve URL \"%s\"", urlname); + return; + } + + // Print the contents type and file size + wxLogMessage("Contents type: %s\nFile size: %lu\nStarting to download...", + url.GetProtocol().GetContentType(), + static_cast( data->GetSize() )); - delete data; + // 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()); } +#endif // wxUSE_URL + void MyFrame::OnSocketEvent(wxSocketEvent& event) { - wxString s = _("OnSocketEvent: "); - - switch(event.SocketEvent()) - { - 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 { +#if wxUSE_IPV6 + wxIPV6address addr; +#else wxIPV4address addr; +#endif m_sock->GetPeer(addr); - s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service()); + s.Printf("%s : %d", addr.Hostname(), addr.Service()); } SetStatusText(s, 1); +#endif // wxUSE_STATUSBAR m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy); +#if wxUSE_IPV6 + m_menuSocket->Enable(CLIENT_OPENIPV6, !m_sock->IsConnected() && !m_busy); +#endif m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy); m_menuSocket->Enable(CLIENT_TEST2, m_sock->IsConnected() && !m_busy); m_menuSocket->Enable(CLIENT_TEST3, m_sock->IsConnected() && !m_busy);