// Author: Lukasz Michalski
// Modified by:
// Created: 27.06.2005
-// RCS-ID: $Id$
// Copyright: (c) 2005 Lukasz Michalski <lmichalski@user.sourceforge.net>
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
}
}
-// outputs log message with IP and TCP port number prepended
-void
-LogWorker(const wxIPV4address& addr,
- const wxString& msg,
- wxLogLevel level = wxLOG_Info)
-{
- wxLogGeneric(level, "%s:%d %s", addr.IPAddress(), addr.Service(), msg);
-}
-
//event sent by workers to server class
//after client is served
const wxEventType wxEVT_WORKER = wxNewEventType();
//and list of two type worker classes that serve clients
class Server : public wxApp
{
- DECLARE_EVENT_TABLE();
+ DECLARE_EVENT_TABLE()
public:
Server() : m_maxConnections(-1) {}
~Server() {}
long int m_maxConnections;
- long m_port;
+ unsigned short m_port;
wxTimer mTimer;
};
DECLARE_APP(Server);
+// just some common things shared between ThreadWorker and EventWorker
+class WorkerBase
+{
+protected:
+ // outputs log message with IP and TCP port number prepended
+ void LogWorker(const wxString& msg, wxLogLevel level = wxLOG_Info)
+ {
+ wxLogGeneric(level,
+ "%s:%d %s", m_peer.IPAddress(), m_peer.Service(), msg);
+ }
+
+ wxIPV4address m_peer;
+};
+
//thread based worker reads signature and all data first from connected client
//and resends data to client after reading
-class ThreadWorker : public wxThread
+class ThreadWorker : public wxThread, private WorkerBase
{
public:
ThreadWorker(wxSocketBase* pSocket);
virtual ExitCode Entry();
+
private:
wxSocketBase* m_socket;
- wxIPV4address m_peer;
};
//event based worker reads signature and creates buffer for incoming data.
//When part of data arrives this worker resends it as soon as possible.
-class EventWorker : public wxEvtHandler
+class EventWorker : public wxEvtHandler, private WorkerBase
{
- DECLARE_EVENT_TABLE();
public:
EventWorker(wxSocketBase* pSock);
- ~EventWorker();
+ virtual ~EventWorker();
+
private:
wxSocketBase* m_socket;
- wxIPV4address m_peer;
unsigned char m_signature[2];
char* m_inbuf;
void OnSocketEvent(wxSocketEvent& pEvent);
void DoWrite();
void DoRead();
+
+ DECLARE_EVENT_TABLE()
};
/******************* Implementation ******************/
Server::OnInitCmdLine(wxCmdLineParser& pParser)
{
wxApp::OnInitCmdLine(pParser);
- pParser.AddSwitch("t","threads",_("Use thread based workers only"));
- pParser.AddSwitch("e","events",_("Use event based workers only"));
- pParser.AddOption("m","max",_("Exit after <n> connections"),wxCMD_LINE_VAL_NUMBER,wxCMD_LINE_PARAM_OPTIONAL);
- pParser.AddOption("p","port",_("listen on given port (default 3000)"),wxCMD_LINE_VAL_NUMBER,wxCMD_LINE_PARAM_OPTIONAL);
+ pParser.AddSwitch("t","threads","Use thread based workers only");
+ pParser.AddSwitch("e","events","Use event based workers only");
+ pParser.AddOption("m","max","Exit after <n> connections",
+ wxCMD_LINE_VAL_NUMBER);
+ pParser.AddOption("p","port","listen on given port (default 3000)",
+ wxCMD_LINE_VAL_NUMBER);
}
void
switch(m_workMode)
{
case EVENTS:
- mode = _("Event based workers");
+ mode = "Event based workers";
break;
case THREADS:
- mode = _("Thread based workers");
+ mode = "Thread based workers";
break;
case MIXED:
- mode = _("Event and thread based workers");
+ mode = "Event and thread based workers";
break;
}
wxLogMessage("Server mode: %s",mode);
if ((int)(m_threadWorkersDone+m_eventWorkersDone) == m_maxConnections)
{
- wxLogMessage("%d connection(s) served, exiting",m_maxConnections);
+ wxLogMessage("%ld connection(s) served, exiting",m_maxConnections);
ExitMainLoop();
}
}
bool
Server::OnCmdLineParsed(wxCmdLineParser& pParser)
{
- if (pParser.Found(_("verbose")))
+ if (pParser.Found("verbose"))
{
wxLog::AddTraceMask("wxSocket");
wxLog::AddTraceMask("epolldispatcher");
if (pParser.Found("m",&m_maxConnections))
{
- wxLogMessage("%d connection(s) to exit",m_maxConnections);
+ wxLogMessage("%ld connection(s) to exit",m_maxConnections);
}
- if (pParser.Found("p",&m_port))
+ long port;
+ if (pParser.Found("p", &port))
{
- wxLogMessage("%d connection(s) to exit",m_maxConnections);
+ if ( port <= 0 || port > USHRT_MAX )
+ {
+ wxLogError("Invalid port number %ld, must be in 0..%u range.",
+ port, USHRT_MAX);
+ return false;
+ }
+
+ m_port = static_cast<unsigned short>(port);
+ wxLogMessage("Will listen on port %u", m_port);
}
if (pParser.Found("t"))
m_listeningSocket->SetEventHandler(*this);
m_listeningSocket->SetNotify(wxSOCKET_CONNECTION_FLAG);
m_listeningSocket->Notify(true);
- if (!m_listeningSocket->Ok())
+ if (!m_listeningSocket->IsOk())
{
wxLogError("Cannot bind listening socket");
return false;
m_eventWorkersFailed = 0;
m_maxEventWorkers = 0;
- wxLogMessage("Server listening at port %d, waiting for connections", m_port);
+ wxLogMessage("Server listening at port %u, waiting for connections", m_port);
return true;
}
{
if (it->GetData() == pEvent.m_sender)
{
- wxLogVerbose("Deleting thread worker (%d left)",
- m_threadWorkers.GetCount());
+ wxLogVerbose("Deleting thread worker (%lu left)",
+ static_cast<unsigned long>( m_threadWorkers.GetCount() ));
it->GetData()->Wait();
delete it->GetData();
m_threadWorkers.DeleteNode(it);
{
if (it2->GetData() == pEvent.m_sender)
{
- wxLogVerbose("Deleting event worker (%d left)",
- m_eventWorkers.GetCount());
+ wxLogVerbose("Deleting event worker (%lu left)",
+ static_cast<unsigned long>( m_eventWorkers.GetCount() ));
delete it2->GetData();
m_eventWorkers.DeleteNode(it2);
if (!pEvent.m_workerFailed)
WorkerEvent e(this);
if (!m_socket->IsConnected())
{
- LogWorker(m_peer,"ThreadWorker: not connected",wxLOG_Error);
+ LogWorker("ThreadWorker: not connected",wxLOG_Error);
return 0;
}
int to_process = -1;
if (m_socket->IsConnected())
{
unsigned char signature[2];
- LogWorker(m_peer,"ThreadWorker: reading for data");
+ LogWorker("ThreadWorker: reading for data");
to_process = 2;
do
{
m_socket->Read(&signature,to_process);
if (m_socket->Error())
{
- LogWorker(m_peer,"ThreadWorker: Read error",wxLOG_Error);
+ LogWorker("ThreadWorker: Read error",wxLOG_Error);
wxGetApp().AddPendingEvent(e);
return 0;
}
to_process -= m_socket->LastCount();
- LogWorker(m_peer,wxString::Format("to_process: %d",to_process));
+ LogWorker(wxString::Format("to_process: %d",to_process));
}
while (!m_socket->Error() && to_process != 0);
if (signature[0] == 0xCE)
{
- LogWorker(m_peer,_("This server does not support test2 from GUI client"),wxLOG_Error);
+ LogWorker("This server does not support test2 from GUI client",wxLOG_Error);
e.m_workerFailed = true;
e.m_exit = true;
return 0;
}
int size = signature[1] * (signature[0] == 0xBE ? 1 : 1024);
char* buf = new char[size];
- LogWorker(m_peer,wxString::Format("Message signature: chunks: %d, kilobytes: %d, size: %d (bytes)",signature[0],signature[1],size));
+ LogWorker(wxString::Format("Message signature: chunks: %d, kilobytes: %d, size: %d (bytes)",signature[0],signature[1],size));
to_process = size;
- LogWorker(m_peer,wxString::Format("ThreadWorker: reading %d bytes of data",to_process));
+ LogWorker(wxString::Format("ThreadWorker: reading %d bytes of data",to_process));
do
{
m_socket->Read(buf,to_process);
if (m_socket->Error())
{
- LogWorker(m_peer,"ThreadWorker: Read error",wxLOG_Error);
+ LogWorker("ThreadWorker: Read error",wxLOG_Error);
wxGetApp().AddPendingEvent(e);
return 0;
}
to_process -= m_socket->LastCount();
- LogWorker(m_peer,wxString::Format("ThreadWorker: %d bytes readed, %d todo",m_socket->LastCount(),to_process));
+ LogWorker(wxString::Format("ThreadWorker: %d bytes readed, %d todo",m_socket->LastCount(),to_process));
}
while(!m_socket->Error() && to_process != 0);
m_socket->Write(buf,to_process);
if (m_socket->Error())
{
- LogWorker(m_peer,"ThreadWorker: Write error",wxLOG_Error);
+ LogWorker("ThreadWorker: Write error",wxLOG_Error);
break;
}
to_process -= m_socket->LastCount();
- LogWorker(m_peer,wxString::Format("ThreadWorker: %d bytes written, %d todo",m_socket->LastCount(),to_process));
+ LogWorker(wxString::Format("ThreadWorker: %d bytes written, %d todo",m_socket->LastCount(),to_process));
}
while(!m_socket->Error() && to_process != 0);
}
- LogWorker(m_peer,"ThreadWorker: done");
+ LogWorker("ThreadWorker: done");
e.m_workerFailed = to_process != 0;
m_socket->Destroy();
wxGetApp().AddPendingEvent(e);
//read message header
do
{
- m_socket->Read(m_signature,2 - m_infill);
+ m_socket->Read(m_signature + m_infill, 2 - m_infill);
if (m_socket->Error())
{
if (m_socket->LastError() != wxSOCKET_WOULDBLOCK)
{
- LogWorker(m_peer,wxString::Format("Read error (%d): %s",m_socket->LastError(),GetSocketErrorMsg(m_socket->LastError())),wxLOG_Error);
+ LogWorker(wxString::Format("Read error (%d): %s",m_socket->LastError(),GetSocketErrorMsg(m_socket->LastError())),wxLOG_Error);
m_socket->Close();
}
}
unsigned char type = m_signature[0];
if (type == 0xCE)
{
- LogWorker(m_peer,_("This server does not support test2 from GUI client"),wxLOG_Error);
+ LogWorker("This server does not support test2 from GUI client",wxLOG_Error);
m_written = -1; //wxSOCKET_LOST will interpret this as failure
m_socket->Close();
}
m_infill = 0;
m_outfill = 0;
m_written = 0;
- LogWorker(m_peer,wxString::Format("Message signature: len: %d, type: %s, size: %d (bytes)",chunks,type == 0xBE ? "b" : "kB",m_size));
+ LogWorker(wxString::Format("Message signature: len: %d, type: %s, size: %d (bytes)",chunks,type == 0xBE ? "b" : "kB",m_size));
break;
- } else
+ }
+ else
{
- LogWorker(m_peer,wxString::Format("Unknown test type %x",type));
+ LogWorker(wxString::Format("Unknown test type %x",type));
m_socket->Close();
}
}
if (m_size == m_infill)
{
m_signature[0] = m_signature[1] = 0x0;
- delete [] m_inbuf;
- m_inbuf = NULL;
+ wxDELETEA(m_inbuf);
m_infill = 0;
return;
}
{
if (m_socket->LastError() != wxSOCKET_WOULDBLOCK)
{
- LogWorker(
- m_peer,
- wxString::Format("Read error (%d): %s",
- m_socket->LastError(),
- GetSocketErrorMsg(m_socket->LastError())
- ),
- wxLOG_Error);
+ LogWorker(wxString::Format("Read error (%d): %s",
+ m_socket->LastError(),
+ GetSocketErrorMsg(m_socket->LastError())),
+ wxLOG_Error);
m_socket->Close();
}
break;
case wxSOCKET_OUTPUT:
- if (m_inbuf != NULL)
+ if ( m_outbuf )
DoWrite();
break;
case wxSOCKET_CONNECTION:
- LogWorker(m_peer,wxString::Format("Unexpected wxSOCKET_CONNECTION in EventWorker"),wxLOG_Error);
+ LogWorker("Unexpected wxSOCKET_CONNECTION in EventWorker", wxLOG_Error);
break;
case wxSOCKET_LOST:
{
- LogWorker(m_peer,wxString::Format("Connection lost"));
+ LogWorker("Connection lost");
WorkerEvent e(this);
e.m_workerFailed = m_written != m_size;
wxGetApp().AddPendingEvent(e);
{
if (m_written == m_size)
{
- delete [] m_outbuf;
- m_outbuf = NULL;
+ wxDELETEA(m_outbuf);
m_outfill = 0;
- LogWorker(m_peer, "All data written");
+ LogWorker( "All data written");
return;
}
if (m_outfill - m_written == 0)
{
if (m_socket->LastError() != wxSOCKET_WOULDBLOCK)
{
- LogWorker(m_peer,
+ LogWorker(
wxString::Format("Write error (%d): %s",
m_socket->LastError(),
GetSocketErrorMsg(m_socket->LastError())
}
else
{
- LogWorker(m_peer,"Write would block, waiting for OUTPUT event");
+ LogWorker("Write would block, waiting for OUTPUT event");
}
}
else
memmove(m_outbuf,m_outbuf+m_socket->LastCount(),m_outfill-m_socket->LastCount());
m_written += m_socket->LastCount();
}
- LogWorker(m_peer,wxString::Format("Written %d of %d bytes, todo %d",m_socket->LastCount(),m_size,m_size - m_written));
+ LogWorker(wxString::Format("Written %d of %d bytes, todo %d",
+ m_socket->LastCount(),m_size,m_size - m_written));
}
while (!m_socket->Error());
}
projects / wxWidgets.git / blobdiff