First rough outline of the network client thread. More to be done soon.
This commit is contained in:
@@ -111,3 +111,10 @@ Thread::ShouldTerminate() const
|
||||
return lock.locked();
|
||||
}
|
||||
|
||||
bool
|
||||
Thread::IsRunning() const
|
||||
{
|
||||
boost::mutex::scoped_lock threadLock(m_threadObjMutex);
|
||||
return (m_threadObj.get() != NULL);
|
||||
}
|
||||
|
||||
|
||||
@@ -50,6 +50,9 @@ protected:
|
||||
// Checks whether termination has been requested.
|
||||
bool ShouldTerminate() const;
|
||||
|
||||
// Checks whether the thread is running.
|
||||
bool IsRunning() const;
|
||||
|
||||
private:
|
||||
|
||||
// Flag specifying whether the application code within the
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007 by Lothar May *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
/* Network client thread. */
|
||||
|
||||
#include <core/thread.h>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
class ClientData;
|
||||
|
||||
class ClientThread : public Thread
|
||||
{
|
||||
public:
|
||||
ClientThread();
|
||||
virtual ~ClientThread();
|
||||
|
||||
// Set the parameters. Does not do any error checking.
|
||||
// Error checking will be done during connect
|
||||
// (i.e. after starting the thread).
|
||||
void Init(const std::string &serverAddress, unsigned serverPort, bool ipv6, const std::string &pwd);
|
||||
|
||||
protected:
|
||||
|
||||
// Main function of the thread.
|
||||
virtual void Main();
|
||||
|
||||
private:
|
||||
|
||||
std::auto_ptr<ClientData> m_data;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007 by Lothar May *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
|
||||
#include <net/clientthread.h>
|
||||
#include <net/socket_helper.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
class ClientData
|
||||
{
|
||||
public:
|
||||
ClientData()
|
||||
: sockfd(INVALID_SOCKET), addrFamily(AF_INET), serverPort(0) {}
|
||||
int GetServerAddrSize() const
|
||||
{
|
||||
return addrFamily == AF_INET6 ? sizeof(sockaddr_in6) : sizeof(sockaddr_in);
|
||||
}
|
||||
|
||||
SOCKET sockfd;
|
||||
int addrFamily;
|
||||
string serverAddr;
|
||||
unsigned serverPort;
|
||||
string password;
|
||||
};
|
||||
|
||||
ClientThread::ClientThread()
|
||||
{
|
||||
m_data.reset(new ClientData);
|
||||
}
|
||||
|
||||
ClientThread::~ClientThread()
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
ClientThread::Init(const string &serverAddress, unsigned serverPort, bool ipv6, const string &pwd)
|
||||
{
|
||||
if (IsRunning())
|
||||
return; // TODO: throw exception
|
||||
m_data->addrFamily = ipv6 ? AF_INET6 : AF_INET;
|
||||
m_data->serverAddr = serverAddress;
|
||||
m_data->serverPort = serverPort;
|
||||
m_data->password = pwd;
|
||||
}
|
||||
|
||||
void
|
||||
ClientThread::Main()
|
||||
{
|
||||
while (!this->ShouldTerminate())
|
||||
{
|
||||
// TODO.
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user