Fixed a endianness stupidity in the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
52fbdb5892
commit
f4d5e0098a
@ -345,7 +345,7 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
|
||||
m_text->AppendText(_("\n=== Test 1 begins ===\n"));
|
||||
|
||||
// Tell the server which test we are running
|
||||
int c = 0xBE;
|
||||
unsigned char c = 0xBE;
|
||||
m_sock->Write(&c, 1);
|
||||
|
||||
// Send some data and read it back. We know the size of the
|
||||
@ -406,7 +406,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
|
||||
m_text->AppendText(_("\n=== Test 2 begins ===\n"));
|
||||
|
||||
// Tell the server which test we are running
|
||||
int c = 0xCE;
|
||||
unsigned char c = 0xCE;
|
||||
m_sock->Write(&c, 1);
|
||||
|
||||
// Here we use ReadMsg and WriteMsg to send messages with
|
||||
@ -475,7 +475,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
|
||||
m_text->AppendText(_("\n=== Test 3 begins ===\n"));
|
||||
|
||||
// Tell the server which test we are running
|
||||
int c = 0xDE;
|
||||
unsigned char c = 0xDE;
|
||||
m_sock->Write(&c, 1);
|
||||
|
||||
// This test also is similar to the first one but it sends a
|
||||
@ -487,7 +487,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
// Note that len is in kbytes here!
|
||||
// Also note that Linux kernel 2.0.36 gives up at len > 27.
|
||||
len = 28;
|
||||
len = 32;
|
||||
buf1 = new char[len * 1024];
|
||||
buf2 = new char[len * 1024];
|
||||
|
||||
|
@ -334,6 +334,7 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
|
||||
else
|
||||
{
|
||||
m_text->AppendText(_("Error: couldn't accept a new connection\n\n"));
|
||||
sock->Destroy();
|
||||
return;
|
||||
}
|
||||
|
||||
@ -347,15 +348,15 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
|
||||
|
||||
void MyFrame::OnSocketEvent(wxSocketEvent& event)
|
||||
{
|
||||
wxSocketBase *sock = event.GetSocket();
|
||||
wxString s = _("OnSocketEvent: ");
|
||||
wxSocketBase *sock = event.GetSocket();
|
||||
|
||||
// We first print a msg
|
||||
// First, print a message
|
||||
switch(event.GetSocketEvent())
|
||||
{
|
||||
case wxSOCKET_INPUT: s.Append(_("wxSOCKET_INPUT\n")); break;
|
||||
case wxSOCKET_LOST: s.Append(_("wxSOCKET_LOST\n")); break;
|
||||
default: s.Append(_("unexpected event !\n"));
|
||||
case wxSOCKET_INPUT : s.Append(_("wxSOCKET_INPUT\n")); break;
|
||||
case wxSOCKET_LOST : s.Append(_("wxSOCKET_LOST\n")); break;
|
||||
default : s.Append(_("Unexpected event !\n")); break;
|
||||
}
|
||||
|
||||
m_text->AppendText(s);
|
||||
@ -369,16 +370,19 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
|
||||
// wxSocketEvent again.
|
||||
sock->SetNotify(wxSOCKET_LOST_FLAG);
|
||||
|
||||
m_text->AppendText();
|
||||
|
||||
// Which test are we going to run?
|
||||
unsigned char c;
|
||||
sock->Read(&c ,1);
|
||||
sock->Read(&c, 1);
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case 0xBE: Test1(sock); break;
|
||||
case 0xCE: Test2(sock); break;
|
||||
case 0xDE: Test3(sock); break;
|
||||
default: s.Append(_("Unknown test id received from client\n\n"));
|
||||
default:
|
||||
m_text->AppendText(_("Unknown test id received from client\n\n"));
|
||||
}
|
||||
|
||||
// Enable input events again.
|
||||
|
Loading…
Reference in New Issue
Block a user