GuilhermeStrice/VoidNet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New configuration variable, log_to_file

Browse Source 
Shutdown function added to TcpClient
Shutdown function added to TcpServer
Renamed socket to server_tcp_socket in TcpServer
Implemented ConfigReader class
This commit is contained in:
xX-TheDoctor-Xx
2016-07-23 12:35:20 +01:00
parent 6fa7872a6d
commit c83b4101d0
11 changed files with 66 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Config.cpp
View File

@ -9,3 +9,13 @@ bool Config::GetUsingConsole()
{
return using_console;
}
void Config::SetLogToFile(bool value)
{
log_to_file = value;
}
bool Config::GetLogToFile()
{
return log_to_file;
}

13
src/TcpClientWindows.cpp
View File

@ -67,6 +67,19 @@ TcpClient::~TcpClient()
Utility::Delete(result);
}
void TcpClient::Shutdown()
{
uint16 code = shutdown(tcp_socket, SD_SEND);
if (code == SOCKET_ERROR)
{
if (Config::GetUsingConsole())
std::cerr << WSAGetLastError() << std::endl; // display more info
}
closesocket(tcp_socket);
WSACleanup();
}
const std::string &TcpClient::GetIP()
{
return ip;

22
src/TcpServerWindows.cpp
View File

@ -25,9 +25,9 @@ bool TcpServer::initialize(uint16 port)
return false;
}
socket = ::socket(result->ai_family, result->ai_socktype, result->ai_protocol);
server_tcp_socket = ::socket(result->ai_family, result->ai_socktype, result->ai_protocol);
if (socket == INVALID_SOCKET)
if (server_tcp_socket == INVALID_SOCKET)
{
if (Config::GetUsingConsole())
std::cerr << WSAGetLastError() << std::endl; // display more info
@ -36,13 +36,13 @@ bool TcpServer::initialize(uint16 port)
return false;
}
code = bind(socket, result->ai_addr, result->ai_addrlen);
code = bind(server_tcp_socket, result->ai_addr, result->ai_addrlen);
if (code == SOCKET_ERROR)
{
if (Config::GetUsingConsole())
std::cerr << WSAGetLastError() << std::endl; // display more info
freeaddrinfo(result);
closesocket(socket);
closesocket(server_tcp_socket);
WSACleanup();
return false;
}
@ -68,13 +68,19 @@ TcpServer::~TcpServer()
Utility::Delete(result);
}
void TcpServer::Shutdown()
{
for (std::vector<TcpClient>::iterator it = clients.begin(); it != clients.end(); ++it)
(*it).Shutdown();
}
bool TcpServer::StartServer(bool accept_connections)
{
if (listen(socket, SOMAXCONN) == SOCKET_ERROR)
if (listen(server_tcp_socket, SOMAXCONN) == SOCKET_ERROR)
{
if (Config::GetUsingConsole())
std::cerr << WSAGetLastError() << std::endl;
closesocket(socket);
closesocket(server_tcp_socket);
WSACleanup();
return false;
}
@ -96,12 +102,12 @@ void TcpServer::accept_connections(TcpServer *server)
std::async(std::launch::async, &process_client_received_data, server);
while (server->running)
{
SOCKET client_socket = accept(server->socket, 0, 0);
SOCKET client_socket = accept(server->server_tcp_socket, 0, 0);
if (client_socket == INVALID_SOCKET)
{
if (Config::GetUsingConsole())
std::cerr << WSAGetLastError() << std::endl;
closesocket(server->socket);
closesocket(server->server_tcp_socket);
WSACleanup();
server->running = false;
break;