mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
RCON improvements (see description)
** SERVER ** * Close redundant connections if max sockets have been reached. * Ban if client keeps spamming without authing first (ignoring message). * Check for whitelisted address before issuing bans (whitelisted address in ConVar 'sv_rcon_whitelist_address' will never get banned or get its connection terminated. * Transmit SQVM and DevMsg logs over the wire to the net console. ** NETCON ** * IPv6 support. * Close connection properly after FIN request. * Prompt user to reconnect after connection has been terminated instead of closing the application. * Add proper quit command. ** SDKLAUNCHER ** * Rename to 'launcher.exe' to describe its purpose better. Our logo gets printed nice and large on the console during startup. ** SDK ** * Cleanup.
This commit is contained in:
Amos
parent
3411c41eac
commit
a5da2e81bf
@ -5,6 +5,8 @@
|
||||
//===========================================================================//
|
||||
#pragma once
|
||||
|
||||
typedef int SocketHandle_t;
|
||||
|
||||
enum class ServerDataRequestType_t : int
|
||||
{
|
||||
SERVERDATA_REQUESTVALUE = 0,
|
||||
@ -31,6 +33,26 @@ enum class ServerDataResponseType_t : int
|
||||
SERVERDATA_RESPONSE_REMOTEBUG,
|
||||
};
|
||||
|
||||
class CConnectedNetConsoleData
|
||||
{
|
||||
public:
|
||||
SocketHandle_t m_hSocket {};
|
||||
int m_nCharsInCommandBuffer {};
|
||||
char m_pszInputCommandBuffer[MAX_NETCONSOLE_INPUT_LEN] {};
|
||||
bool m_bAuthorized {}; // Set to true after netconsole successfully authed.
|
||||
bool m_bInputOnly {}; // If set, don't send spew to this net console.
|
||||
int m_nFailedAttempts {}; // Num failed authentication attempts.
|
||||
int m_nIgnoredMessage {}; // Count how many times client ignored the no-auth message.
|
||||
|
||||
CConnectedNetConsoleData(SocketHandle_t hSocket = -1)
|
||||
{
|
||||
m_nCharsInCommandBuffer = 0;
|
||||
m_bAuthorized = false;
|
||||
m_hSocket = hSocket;
|
||||
m_bInputOnly = false;
|
||||
}
|
||||
};
|
||||
|
||||
/* PACKET FORMAT **********************************
|
||||
|
||||
REQUEST:
|
||||
|
||||
@ -17,7 +17,9 @@
|
||||
#include "squirrel/sqinit.h"
|
||||
#include "public/include/bansystem.h"
|
||||
#include "engine/sys_engine.h"
|
||||
#ifdef DEDICATED
|
||||
#include "engine/sv_rcon.h"
|
||||
#endif // DEDICATED
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Send keep alive request to Pylon Master Server.
|
||||
@ -134,8 +136,6 @@ void HCHostState_FrameUpdate(void* rcx, void* rdx, float time)
|
||||
static bool bInitialized = false;
|
||||
if (!bInitialized)
|
||||
{
|
||||
g_pRConServer = new CRConServer();
|
||||
|
||||
if (!g_pCmdLine->CheckParm("-devsdk"))
|
||||
{
|
||||
IVEngineClient_CommandExecute(NULL, "exec autoexec_server.cfg");
|
||||
@ -158,7 +158,9 @@ void HCHostState_FrameUpdate(void* rcx, void* rdx, float time)
|
||||
}
|
||||
|
||||
g_pConVar->ClearHostNames();
|
||||
#ifdef DEDICATED
|
||||
g_pRConServer->Init();
|
||||
#endif // DEDICATED
|
||||
|
||||
*(bool*)m_bRestrictServerCommands = true; // Restrict commands.
|
||||
ConCommandBase* disconnect = (ConCommandBase*)g_pCVar->FindCommand("disconnect");
|
||||
@ -191,8 +193,9 @@ void HCHostState_FrameUpdate(void* rcx, void* rdx, float time)
|
||||
|
||||
bInitialized = true;
|
||||
}
|
||||
|
||||
#ifdef DEDICATED
|
||||
g_pRConServer->RunFrame();
|
||||
#endif // DEDICATED
|
||||
|
||||
HostStates_t oldState{};
|
||||
void* placeHolder = nullptr;
|
||||
|
||||
@ -12,6 +12,9 @@
|
||||
#include "engine/sys_utils.h"
|
||||
#include "engine/net_chan.h"
|
||||
#include "engine/baseclient.h"
|
||||
#ifdef DEDICATED
|
||||
#include "engine/sv_rcon.h"
|
||||
#endif // DEDICATED
|
||||
#include "server/IVEngineServer.h"
|
||||
|
||||
#ifndef DEDICATED
|
||||
|
||||
@ -17,30 +17,66 @@
|
||||
#include "common/igameserverdata.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Create's listen socket for RCON
|
||||
// Purpose: creates listen socket for RCON
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRConServer::Init(void)
|
||||
{
|
||||
if (std::strlen(rcon_password->GetString()) < 8)
|
||||
{
|
||||
DevMsg(eDLL_T::SERVER, "RCON disabled\n");
|
||||
if (std::strlen(rcon_password->GetString()) != 0)
|
||||
{
|
||||
DevMsg(eDLL_T::SERVER, "Remote server access requires a password of at least 8 characters\n");
|
||||
}
|
||||
|
||||
if (m_pSocket->IsListening())
|
||||
{
|
||||
m_pSocket->CloseListenSocket();
|
||||
}
|
||||
m_bInitialized = false;
|
||||
return;
|
||||
}
|
||||
|
||||
static ConVar* hostport = g_pCVar->FindVar("hostport");
|
||||
|
||||
m_pAdr2 = new CNetAdr2(rcon_address->GetString(), hostport->GetString());
|
||||
m_pSocket->CreateListenSocket(*m_pAdr2, false);
|
||||
|
||||
DevMsg(eDLL_T::SERVER, "Remote server access initialized\n");
|
||||
m_bInitialized = true;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: run tasks for RCON
|
||||
// Purpose: run tasks for the RCON server
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRConServer::Think(void)
|
||||
{
|
||||
int nCount = m_pSocket->GetAcceptedSocketCount();
|
||||
|
||||
// Close redundant sockets if there are too many except for whitelisted and authenticated.
|
||||
if (nCount >= sv_rcon_maxsockets->GetInt())
|
||||
{
|
||||
for (m_nConnIndex = nCount - 1; m_nConnIndex >= 0; m_nConnIndex--)
|
||||
{
|
||||
CNetAdr2 netAdr2 = m_pSocket->GetAcceptedSocketAddress(m_nConnIndex);
|
||||
if (std::strcmp(netAdr2.GetIP(true).c_str(), sv_rcon_whitelist_address->GetString()) != 0)
|
||||
{
|
||||
CConnectedNetConsoleData* pData = m_pSocket->GetAcceptedSocketData(m_nConnIndex);
|
||||
if (!pData->m_bAuthorized)
|
||||
{
|
||||
CloseConnection();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Create a new listen socket if authenticated socket is closed.
|
||||
if (nCount == 0)
|
||||
{
|
||||
if (!m_pSocket->IsListening())
|
||||
{
|
||||
m_pSocket->CreateListenSocket(*m_pAdr2, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -51,14 +87,16 @@ void CRConServer::RunFrame(void)
|
||||
if (m_bInitialized)
|
||||
{
|
||||
m_pSocket->RunFrame();
|
||||
ProcessMessage();
|
||||
this->Think();
|
||||
this->Recv();
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: process incoming packet
|
||||
// Purpose: process outgoing packet
|
||||
// Input : *pszBuf -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRConServer::ProcessMessage(void)
|
||||
void CRConServer::Send(const char* pszBuf)
|
||||
{
|
||||
int nCount = m_pSocket->GetAcceptedSocketCount();
|
||||
|
||||
@ -66,16 +104,34 @@ void CRConServer::ProcessMessage(void)
|
||||
{
|
||||
CConnectedNetConsoleData* pData = m_pSocket->GetAcceptedSocketData(i);
|
||||
|
||||
if (pData->m_bAuthorized)
|
||||
{
|
||||
::send(pData->m_hSocket, pszBuf, strlen(pszBuf), MSG_NOSIGNAL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: process incoming packet
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRConServer::Recv(void)
|
||||
{
|
||||
int nCount = m_pSocket->GetAcceptedSocketCount();
|
||||
|
||||
for (m_nConnIndex = nCount - 1; m_nConnIndex >= 0; m_nConnIndex--)
|
||||
{
|
||||
CConnectedNetConsoleData* pData = m_pSocket->GetAcceptedSocketData(m_nConnIndex);
|
||||
|
||||
{//////////////////////////////////////////////
|
||||
if (CheckForBan(i, pData))
|
||||
if (CheckForBan(pData))
|
||||
{
|
||||
send(pData->m_hSocket, s_pszBannedMessage, strlen(s_pszBannedMessage), MSG_NOSIGNAL);
|
||||
CloseConnection(i);
|
||||
::send(pData->m_hSocket, s_pszBannedMessage, strlen(s_pszBannedMessage), MSG_NOSIGNAL);
|
||||
CloseConnection();
|
||||
continue;
|
||||
}
|
||||
|
||||
char szRecvBuf{};
|
||||
int nPendingLen = recv(pData->m_hSocket, &szRecvBuf, sizeof(szRecvBuf), MSG_PEEK);
|
||||
int nPendingLen = ::recv(pData->m_hSocket, &szRecvBuf, sizeof(szRecvBuf), MSG_PEEK);
|
||||
|
||||
if (nPendingLen == SOCKET_ERROR && m_pSocket->IsSocketBlocking())
|
||||
{
|
||||
@ -84,13 +140,13 @@ void CRConServer::ProcessMessage(void)
|
||||
|
||||
if (nPendingLen <= 0) // EOF or error.
|
||||
{
|
||||
CloseConnection(i);
|
||||
CloseConnection();
|
||||
continue;
|
||||
}
|
||||
}//////////////////////////////////////////////
|
||||
|
||||
u_long nReadLen; // Find out how much we have to read.
|
||||
ioctlsocket(pData->m_hSocket, FIONREAD, &nReadLen);
|
||||
::ioctlsocket(pData->m_hSocket, FIONREAD, &nReadLen);
|
||||
|
||||
while (nReadLen > 0 && nReadLen < MAX_NETCONSOLE_INPUT_LEN -1)
|
||||
{
|
||||
@ -99,7 +155,7 @@ void CRConServer::ProcessMessage(void)
|
||||
|
||||
if (nRecvLen == 0) // Socket was closed.
|
||||
{
|
||||
CloseConnection(i);
|
||||
CloseConnection();
|
||||
break;
|
||||
}
|
||||
|
||||
@ -118,11 +174,12 @@ void CRConServer::ProcessMessage(void)
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: authenticate new connections
|
||||
// Input : *pData -
|
||||
// TODO : implement logic for key exchange instead so we never network our
|
||||
// password in plain text over the wire. create a cvar for this so user could
|
||||
// also opt out and use legacy authentication instead for legacy RCON clients
|
||||
// also opt out and use legacy authentication instead for older RCON clients
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRConServer::Authenticate(CConnectedNetConsoleData* pData)
|
||||
void CRConServer::Auth(CConnectedNetConsoleData* pData)
|
||||
{
|
||||
if (pData->m_bAuthorized)
|
||||
{
|
||||
@ -131,12 +188,15 @@ void CRConServer::Authenticate(CConnectedNetConsoleData* pData)
|
||||
else if (std::memcmp(pData->m_pszInputCommandBuffer, "PASS ", 5) == 0)
|
||||
{
|
||||
if (std::strcmp(pData->m_pszInputCommandBuffer + 5, rcon_password->GetString()) == 0)
|
||||
{ // TODO: Hash password instead!
|
||||
{ // TODO: Hash and compare password with SHA256 instead!
|
||||
pData->m_bAuthorized = true;
|
||||
m_pSocket->CloseListenSocket();
|
||||
this->CloseNonAuthConnection();
|
||||
}
|
||||
else // Bad password.
|
||||
{
|
||||
DevMsg(eDLL_T::SERVER, "Bad password attempt from net console\n");
|
||||
CNetAdr2 netAdr2 = m_pSocket->GetAcceptedSocketAddress(m_nConnIndex);
|
||||
DevMsg(eDLL_T::SERVER, "Bad RCON password attempt from '%s'\n", netAdr2.GetIPAndPort().c_str());
|
||||
::send(pData->m_hSocket, s_pszWrongPwMessage, strlen(s_pszWrongPwMessage), MSG_NOSIGNAL);
|
||||
|
||||
pData->m_bAuthorized = false;
|
||||
@ -146,11 +206,15 @@ void CRConServer::Authenticate(CConnectedNetConsoleData* pData)
|
||||
else
|
||||
{
|
||||
::send(pData->m_hSocket, s_pszNoAuthMessage, strlen(s_pszNoAuthMessage), MSG_NOSIGNAL);
|
||||
pData->m_nIgnoredMessage++;
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: handles input command buffer
|
||||
// Input : *pszIn -
|
||||
// nRecvLen -
|
||||
// *pData -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRConServer::HandleInputChars(const char* pszIn, int nRecvLen, CConnectedNetConsoleData* pData)
|
||||
{
|
||||
@ -164,11 +228,12 @@ void CRConServer::HandleInputChars(const char* pszIn, int nRecvLen, CConnectedNe
|
||||
if (pData->m_nCharsInCommandBuffer)
|
||||
{
|
||||
pData->m_pszInputCommandBuffer[pData->m_nCharsInCommandBuffer] = 0;
|
||||
Authenticate(pData);
|
||||
this->Auth(pData);
|
||||
|
||||
// Only execute if auth was succesfull.
|
||||
if (pData->m_bAuthorized)
|
||||
{
|
||||
Execute(pData);
|
||||
this->Execute(pData);
|
||||
}
|
||||
}
|
||||
pData->m_nCharsInCommandBuffer = 0;
|
||||
@ -189,7 +254,8 @@ void CRConServer::HandleInputChars(const char* pszIn, int nRecvLen, CConnectedNe
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Purpose: execute commands issued from net console
|
||||
// Input : *pData -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRConServer::Execute(CConnectedNetConsoleData* pData)
|
||||
{
|
||||
@ -197,22 +263,33 @@ void CRConServer::Execute(CConnectedNetConsoleData* pData)
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: checks for amount of failed attempts and bans netconsole accordingly
|
||||
// Purpose: checks for amount of failed attempts and bans net console accordingly
|
||||
// Input : *pData -
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CRConServer::CheckForBan(int nIdx, CConnectedNetConsoleData* pData)
|
||||
bool CRConServer::CheckForBan(CConnectedNetConsoleData* pData)
|
||||
{
|
||||
CNetAdr2 netAdr2 = m_pSocket->GetAcceptedSocketAddress(nIdx);
|
||||
CNetAdr2 netAdr2 = m_pSocket->GetAcceptedSocketAddress(m_nConnIndex);
|
||||
|
||||
// Check if IP is in the ban vector.
|
||||
if (std::find(m_vBannedAddress.begin(), m_vBannedAddress.end(),
|
||||
if (std::find(m_vBannedAddress.begin(), m_vBannedAddress.end(),
|
||||
netAdr2.GetIP(true)) != m_vBannedAddress.end())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
// Check if netconsole has reached maximum number of attempts and add to ban vector.
|
||||
if (pData->m_nFailedAttempts >= sv_rcon_maxfailures->GetInt())
|
||||
// Check if net console has reached maximum number of attempts and add to ban vector.
|
||||
if (pData->m_nFailedAttempts >= sv_rcon_maxfailures->GetInt()
|
||||
|| pData->m_nIgnoredMessage >= sv_rcon_maxignores->GetInt())
|
||||
{
|
||||
// Don't add whitelisted address to ban vector.
|
||||
if (std::strcmp(netAdr2.GetIP(true).c_str(), sv_rcon_whitelist_address->GetString()) == 0)
|
||||
{
|
||||
pData->m_nFailedAttempts = 0;
|
||||
pData->m_nIgnoredMessage = 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
DevMsg(eDLL_T::SERVER, "Banned '%s' for RCON hacking attempts\n", netAdr2.GetIPAndPort().c_str());
|
||||
m_vBannedAddress.push_back(netAdr2.GetIP(true));
|
||||
return true;
|
||||
}
|
||||
@ -220,11 +297,29 @@ bool CRConServer::CheckForBan(int nIdx, CConnectedNetConsoleData* pData)
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Purpose: close specific connection
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRConServer::CloseConnection(int nIdx) // NETMGR
|
||||
void CRConServer::CloseConnection(void) // NETMGR
|
||||
{
|
||||
m_pSocket->CloseAcceptedSocket(nIdx);
|
||||
m_pSocket->CloseAcceptedSocket(m_nConnIndex);
|
||||
}
|
||||
|
||||
CRConServer* g_pRConServer = nullptr;
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: close all connections except for authenticated
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRConServer::CloseNonAuthConnection(void)
|
||||
{
|
||||
int nCount = m_pSocket->GetAcceptedSocketCount();
|
||||
|
||||
for (int i = nCount - 1; i >= 0; i--)
|
||||
{
|
||||
CConnectedNetConsoleData* pData = m_pSocket->GetAcceptedSocketData(i);
|
||||
|
||||
if (!pData->m_bAuthorized)
|
||||
{
|
||||
m_pSocket->CloseAcceptedSocket(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
CRConServer* g_pRConServer = new CRConServer();
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
#include "tier1/NetAdr2.h"
|
||||
#include "tier2/socketcreator.h"
|
||||
#include "common/igameserverdata.h"
|
||||
|
||||
constexpr char s_pszNoAuthMessage[] = "This server is password protected for console access. Must send 'PASS <password>' command.\n\r";
|
||||
constexpr char s_pszWrongPwMessage[] = "Password incorrect.\n\r";
|
||||
@ -13,20 +15,23 @@ public:
|
||||
|
||||
void RunFrame(void);
|
||||
|
||||
void ProcessMessage(void);
|
||||
void Authenticate(CConnectedNetConsoleData* pData);
|
||||
void Recv(void);
|
||||
void Send(const char* pszBuf);
|
||||
void Auth(CConnectedNetConsoleData* pData);
|
||||
|
||||
void HandleInputChars(const char* pIn, int recvLen, CConnectedNetConsoleData* pData);
|
||||
void HandleInputChars(const char* pszIn, int nRecvLen, CConnectedNetConsoleData* pData);
|
||||
void Execute(CConnectedNetConsoleData* pData);
|
||||
|
||||
bool CheckForBan(int nIdx, CConnectedNetConsoleData* pData);
|
||||
void CloseConnection(int nIdx);
|
||||
bool CheckForBan(CConnectedNetConsoleData* pData);
|
||||
void CloseConnection(void);
|
||||
void CloseNonAuthConnection(void);
|
||||
|
||||
private:
|
||||
|
||||
bool m_bInitialized = false;
|
||||
CNetAdr2* m_pAdr2 = new CNetAdr2();
|
||||
CSocketCreator* m_pSocket = new CSocketCreator();
|
||||
bool m_bInitialized = false;
|
||||
int m_nConnIndex = 0;
|
||||
CNetAdr2* m_pAdr2 = new CNetAdr2();
|
||||
CSocketCreator* m_pSocket = new CSocketCreator();
|
||||
std::vector<std::string> m_vBannedAddress;
|
||||
};
|
||||
extern CRConServer* g_pRConServer;
|
||||
@ -2,7 +2,9 @@
|
||||
#include "core/logdef.h"
|
||||
#include "tier0/commandline.h"
|
||||
#include "engine/sys_utils.h"
|
||||
#ifndef DEDICATED
|
||||
#ifdef DEDICATED
|
||||
#include "engine/sv_rcon.h"
|
||||
#else
|
||||
#include "vgui/CEngineVGui.h"
|
||||
#include "gameui/IConsole.h"
|
||||
#endif // !DEDICATED
|
||||
@ -84,12 +86,21 @@ void DevMsg(eDLL_T idx, const char* fmt, ...)
|
||||
svOut.append(szBuf);
|
||||
svOut = std::regex_replace(svOut, rxAnsiExp, "");
|
||||
|
||||
if (!g_bSpdLog_UseAnsiClr) { wconsole->debug(svOut); }
|
||||
if (!g_bSpdLog_UseAnsiClr)
|
||||
{
|
||||
wconsole->debug(svOut);
|
||||
#ifdef DEDICATED
|
||||
g_pRConServer->Send(svOut.c_str());
|
||||
#endif // DEDICATED
|
||||
}
|
||||
else
|
||||
{
|
||||
svAnsiOut = sANSI_DLL_T[(int)idx].c_str();
|
||||
svAnsiOut.append(szBuf);
|
||||
wconsole->debug(svAnsiOut);
|
||||
#ifdef DEDICATED
|
||||
g_pRConServer->Send(svAnsiOut.c_str());
|
||||
#endif // DEDICATED
|
||||
}
|
||||
|
||||
sqlogger->debug(svOut);
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="core\termutil.cpp" />
|
||||
<ClCompile Include="engine\net.cpp" />
|
||||
<ClCompile Include="netconsole\netconsole.cpp" />
|
||||
<ClCompile Include="public\utility.cpp" />
|
||||
@ -33,6 +34,7 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="core\stdafx.h" />
|
||||
<ClInclude Include="core\termutil.h" />
|
||||
<ClInclude Include="engine\net.h" />
|
||||
<ClInclude Include="netconsole\netconsole.h" />
|
||||
<ClInclude Include="tier1\NetAdr2.h" />
|
||||
|
||||
@ -40,6 +40,9 @@
|
||||
<ClCompile Include="netconsole\netconsole.cpp">
|
||||
<Filter>core</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="core\termutil.cpp">
|
||||
<Filter>core</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="tier1\NetAdr2.h">
|
||||
@ -57,5 +60,8 @@
|
||||
<ClInclude Include="netconsole\netconsole.h">
|
||||
<Filter>core</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="core\termutil.h">
|
||||
<Filter>core</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -1,105 +1,268 @@
|
||||
//=====================================================================================//
|
||||
//
|
||||
// Purpose: Lightweight netconsole.
|
||||
// Purpose: Lightweight netconsole client.
|
||||
//
|
||||
//=====================================================================================//
|
||||
|
||||
#include "core/stdafx.h"
|
||||
#include "core/termutil.h"
|
||||
#include "tier1/NetAdr2.h"
|
||||
#include "tier2/socketcreator.h"
|
||||
#include "netconsole/netconsole.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: send datagram
|
||||
//-----------------------------------------------------------------------------
|
||||
void CNetCon::Send(void)
|
||||
{
|
||||
static std::string svUserInput;
|
||||
|
||||
do
|
||||
{
|
||||
printf(">");
|
||||
std::getline(std::cin, svUserInput);
|
||||
svUserInput.append("\n\r");
|
||||
|
||||
int nSendResult = ::send(pSocket->GetAcceptedSocketData(0)->m_hSocket, svUserInput.c_str(), svUserInput.size(), MSG_NOSIGNAL);
|
||||
} while (svUserInput.size() > 0);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: receive datagram
|
||||
//-----------------------------------------------------------------------------
|
||||
void CNetCon::Recv(void)
|
||||
{
|
||||
static char szRecvBuf[MAX_NETCONSOLE_INPUT_LEN]{};
|
||||
|
||||
for (;;)
|
||||
{
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||
|
||||
int nRecvLen = ::recv(pSocket->GetAcceptedSocketData(0)->m_hSocket, szRecvBuf, sizeof(szRecvBuf), MSG_NOSIGNAL);
|
||||
if (nRecvLen > 0 && nRecvLen < MAX_NETCONSOLE_INPUT_LEN - 1)
|
||||
{
|
||||
szRecvBuf[nRecvLen + 1] = '\0';
|
||||
printf("%s\n", szRecvBuf);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: WSA and NETCON systems init
|
||||
// Output : true on success, false otherwise
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CNetCon::Init(void)
|
||||
{
|
||||
WSAData wsaData{};
|
||||
int nError = ::WSAStartup(MAKEWORD(2, 2), &wsaData);
|
||||
|
||||
if (nError != 0)
|
||||
{
|
||||
assert(nError != 0 && "Failed to start Winsock via WSAStartup.");
|
||||
std::cerr << "Failed to start Winsock via WSAStartup. Error: " << nError << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (pSocket->ConnectSocket(*pNetAdr2, true) == SOCKET_ERROR)
|
||||
this->TermSetup();
|
||||
|
||||
std::thread tFrame(&CNetCon::RunFrame, this);
|
||||
tFrame.detach();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: connect to specified address and port
|
||||
// Input : svInAdr -
|
||||
// svInPort -
|
||||
// Output : true if connection succeeds, false otherwise
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CNetCon::Connect(std::string svInAdr, std::string svInPort)
|
||||
{
|
||||
if (svInAdr.size() > 0 && svInPort.size() > 0)
|
||||
{
|
||||
assert(nError != 0 && "'pSocket->ConnectSocket()' returned 'SOCKET_ERROR'");
|
||||
return false;
|
||||
// Default is [127.0.0.1]:37015
|
||||
m_pNetAdr2->SetIPAndPort(svInAdr, svInPort);
|
||||
}
|
||||
|
||||
std::thread tRecv(&CNetCon::Recv, this);
|
||||
tRecv.detach();
|
||||
if (m_pSocket->ConnectSocket(*m_pNetAdr2, true) == SOCKET_ERROR)
|
||||
{
|
||||
std::cerr << "Failed to connect. Error: 'SOCKET_ERROR'. Verify IP and PORT." << std::endl;
|
||||
return false;
|
||||
}
|
||||
std::cout << "Connected to: " << m_pNetAdr2->GetIPAndPort() << std::endl;
|
||||
|
||||
m_abConnEstablished = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: WSA and NETCON systems shutdown
|
||||
// Output : true on success, false otherwise
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CNetCon::Shutdown(void)
|
||||
{
|
||||
pSocket->CloseAllAcceptedSockets();
|
||||
m_pSocket->CloseAllAcceptedSockets();
|
||||
m_abConnEstablished = false;
|
||||
|
||||
int nError = ::WSACleanup();
|
||||
if (nError != 0)
|
||||
{
|
||||
assert(nError != 0 && "Failed to stop winsock via WSACleanup.\n");
|
||||
std::cerr << "Failed to stop winsock via WSACleanup. Error: " << nError << std::endl;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: terminal setup
|
||||
//-----------------------------------------------------------------------------
|
||||
void CNetCon::TermSetup(void)
|
||||
{
|
||||
DWORD dwMode = NULL;
|
||||
HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
|
||||
HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||
|
||||
if (!strstr(GetCommandLineA(), "-nocolor"))
|
||||
{
|
||||
GetConsoleMode(hOutput, &dwMode);
|
||||
dwMode |= ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING;
|
||||
|
||||
if (!SetConsoleMode(hOutput, dwMode)) // Some editions of Windows have 'VirtualTerminalLevel' disabled by default.
|
||||
{
|
||||
// Warn the user if 'VirtualTerminalLevel' could not be set on users environment.
|
||||
MessageBox(NULL, "Failed to set console mode 'VirtualTerminalLevel'.\n"
|
||||
"Restart the net console with the '-nocolor'\n"
|
||||
"parameter if output logging appears distorted.", "SDK Warning",
|
||||
MB_ICONEXCLAMATION | MB_OK);
|
||||
}
|
||||
AnsiColors_Init();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_bNoColor = true;
|
||||
}
|
||||
|
||||
CONSOLE_SCREEN_BUFFER_INFOEX sbInfoEx{};
|
||||
COLORREF storedBG = sbInfoEx.ColorTable[0];
|
||||
sbInfoEx.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX);
|
||||
|
||||
GetConsoleScreenBufferInfoEx(hOutput, &sbInfoEx);
|
||||
sbInfoEx.ColorTable[0] = 0x0000;
|
||||
SetConsoleScreenBufferInfoEx(hOutput, &sbInfoEx);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: client's main processing loop
|
||||
//-----------------------------------------------------------------------------
|
||||
void CNetCon::RunFrame(void)
|
||||
{
|
||||
for (;;)
|
||||
{
|
||||
if (m_abConnEstablished)
|
||||
{
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(10));
|
||||
this->Recv();
|
||||
}
|
||||
else if (m_abPromptConnect)
|
||||
{
|
||||
std::cout << "Enter <IP> <PORT>: ";
|
||||
m_abPromptConnect = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: gets input IP and port for initialization
|
||||
//-----------------------------------------------------------------------------
|
||||
void CNetCon::UserInput(void)
|
||||
{
|
||||
std::string svInput;
|
||||
|
||||
if (std::getline(std::cin, svInput))
|
||||
{
|
||||
if (strcmp(svInput.c_str(), "nquit") == 0)
|
||||
{
|
||||
m_bQuitApplication = true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_abConnEstablished)
|
||||
{
|
||||
this->Send(svInput);
|
||||
}
|
||||
else // Setup connection from input.
|
||||
{
|
||||
size_t nPos = svInput.find(" ");
|
||||
if (!svInput.empty() && nPos > 0 && nPos < svInput.size())
|
||||
{
|
||||
std::string svInPort = svInput.substr(nPos + 1);
|
||||
std::string svInAdr = svInput.erase(svInput.find(" "));
|
||||
|
||||
if (!this->Connect(svInAdr, svInPort))
|
||||
{
|
||||
m_abPromptConnect = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
else // Initialize as [127.0.0.1]:37015.
|
||||
{
|
||||
|
||||
if (!this->Connect("", ""))
|
||||
{
|
||||
m_abPromptConnect = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: send message
|
||||
//-----------------------------------------------------------------------------
|
||||
void CNetCon::Send(std::string svMessage)
|
||||
{
|
||||
svMessage.append("\n\r");
|
||||
int nSendResult = ::send(m_pSocket->GetAcceptedSocketData(0)->m_hSocket, svMessage.c_str(), svMessage.size(), MSG_NOSIGNAL);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: receive message
|
||||
//-----------------------------------------------------------------------------
|
||||
void CNetCon::Recv(void)
|
||||
{
|
||||
static char szRecvBuf[MAX_NETCONSOLE_INPUT_LEN]{};
|
||||
static std::regex rxAnsiExp("\\\033\\[.*?m");
|
||||
static std::string svOut;
|
||||
|
||||
{//////////////////////////////////////////////
|
||||
char szRecvBuf{};
|
||||
int nPendingLen = ::recv(m_pSocket->GetAcceptedSocketData(0)->m_hSocket, &szRecvBuf, sizeof(szRecvBuf), MSG_PEEK);
|
||||
|
||||
if (nPendingLen == SOCKET_ERROR && m_pSocket->IsSocketBlocking())
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (nPendingLen <= 0) // EOF or error.
|
||||
{
|
||||
::closesocket(m_pSocket->GetAcceptedSocketHandle(0));
|
||||
std::cout << "Server closed connection." << std::endl;
|
||||
|
||||
m_abPromptConnect = true;
|
||||
m_abConnEstablished = false;
|
||||
return;
|
||||
}
|
||||
}//////////////////////////////////////////////
|
||||
|
||||
u_long nReadLen; // Find out how much we have to read.
|
||||
::ioctlsocket(m_pSocket->GetAcceptedSocketData(0)->m_hSocket, FIONREAD, &nReadLen);
|
||||
|
||||
if (nReadLen > 0 && nReadLen < MAX_NETCONSOLE_INPUT_LEN - 1)
|
||||
{
|
||||
int nRecvLen = ::recv(m_pSocket->GetAcceptedSocketData(0)->m_hSocket, szRecvBuf, sizeof(szRecvBuf), MSG_NOSIGNAL);
|
||||
svOut = szRecvBuf;
|
||||
|
||||
if (m_bNoColor)
|
||||
{
|
||||
svOut = std::regex_replace(svOut, rxAnsiExp, "");
|
||||
}
|
||||
else
|
||||
{
|
||||
svOut.append(g_svReset.c_str());
|
||||
}
|
||||
std::cout << svOut.c_str();
|
||||
memset(szRecvBuf, '\0', sizeof(szRecvBuf));
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// purpose: entrypoint
|
||||
//-----------------------------------------------------------------------------
|
||||
int main(void)
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
CNetCon* pNetCon = new CNetCon();
|
||||
std::cout << "R5Reloaded TCP net console [Version " << NETCON_VERSION << "]" << std::endl;
|
||||
|
||||
if (!pNetCon->Init())
|
||||
{
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
pNetCon->Send();
|
||||
if (argc >= 3) // Get IP and Port from command line.
|
||||
{
|
||||
if (!pNetCon->Connect(argv[1], argv[2]))
|
||||
{
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
while (!pNetCon->m_bQuitApplication)
|
||||
{
|
||||
pNetCon->UserInput();
|
||||
}
|
||||
|
||||
if (!pNetCon->Shutdown())
|
||||
{
|
||||
|
||||
@ -5,15 +5,30 @@
|
||||
//===========================================================================//
|
||||
#pragma once
|
||||
|
||||
constexpr const char* NETCON_VERSION = "2.0.0.1";
|
||||
|
||||
class CNetCon
|
||||
{
|
||||
public:
|
||||
bool Init(void);
|
||||
bool Shutdown(void);
|
||||
|
||||
void Send(void);
|
||||
void TermSetup(void);
|
||||
void UserInput(void);
|
||||
|
||||
void RunFrame(void);
|
||||
|
||||
bool Connect(std::string svInAdr, std::string svInPort);
|
||||
|
||||
void Send(std::string svMessage);
|
||||
void Recv(void);
|
||||
|
||||
CNetAdr2* pNetAdr2 = new CNetAdr2("localhost", "37015");
|
||||
CSocketCreator* pSocket = new CSocketCreator();
|
||||
CNetAdr2* m_pNetAdr2 = new CNetAdr2("localhost", "37015");
|
||||
CSocketCreator* m_pSocket = new CSocketCreator();
|
||||
|
||||
bool m_bInitialized = false;
|
||||
bool m_bNoColor = false;
|
||||
bool m_bQuitApplication = false;
|
||||
std::atomic<bool> m_abPromptConnect{ true };
|
||||
std::atomic<bool> m_abConnEstablished{ false };
|
||||
};
|
||||
@ -41,7 +41,6 @@
|
||||
<ClCompile Include="engine\net.cpp" />
|
||||
<ClCompile Include="engine\net_chan.cpp" />
|
||||
<ClCompile Include="engine\sv_main.cpp" />
|
||||
<ClCompile Include="engine\sv_rcon.cpp" />
|
||||
<ClCompile Include="engine\sys_dll.cpp" />
|
||||
<ClCompile Include="engine\sys_dll2.cpp" />
|
||||
<ClCompile Include="engine\sys_engine.cpp" />
|
||||
@ -245,7 +244,6 @@
|
||||
<ClInclude Include="engine\net.h" />
|
||||
<ClInclude Include="engine\net_chan.h" />
|
||||
<ClInclude Include="engine\sv_main.h" />
|
||||
<ClInclude Include="engine\sv_rcon.h" />
|
||||
<ClInclude Include="engine\sys_dll.h" />
|
||||
<ClInclude Include="engine\sys_dll2.h" />
|
||||
<ClInclude Include="engine\sys_engine.h" />
|
||||
|
||||
@ -423,9 +423,6 @@
|
||||
<ClCompile Include="engine\sys_engine.cpp">
|
||||
<Filter>sdk\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\sv_rcon.cpp">
|
||||
<Filter>sdk\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\cl_rcon.cpp">
|
||||
<Filter>sdk\engine</Filter>
|
||||
</ClCompile>
|
||||
@ -1091,9 +1088,6 @@
|
||||
<ClInclude Include="engine\sys_engine.h">
|
||||
<Filter>sdk\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\sv_rcon.h">
|
||||
<Filter>sdk\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\cl_rcon.h">
|
||||
<Filter>sdk\engine</Filter>
|
||||
</ClInclude>
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
|
||||
<LibraryPath>$(SolutionDir)r5dev\thirdparty\detours\libs;$(LibraryPath);</LibraryPath>
|
||||
<TargetName>r5reloaded</TargetName>
|
||||
<TargetName>launcher</TargetName>
|
||||
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
|
||||
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
@ -92,7 +92,7 @@
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
|
||||
<LibraryPath>$(SolutionDir)r5dev\thirdparty\detours\libs;$(LibraryPath);</LibraryPath>
|
||||
<TargetName>r5reloaded</TargetName>
|
||||
<TargetName>launcher</TargetName>
|
||||
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
|
||||
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -10,6 +10,9 @@
|
||||
#include "tier0/IConVar.h"
|
||||
#include "tier0/commandline.h"
|
||||
#include "engine/sys_utils.h"
|
||||
#ifdef DEDICATED
|
||||
#include "engine/sv_rcon.h"
|
||||
#endif // DEDICATED
|
||||
#include "vgui/CEngineVGui.h"
|
||||
#include "gameui/IConsole.h"
|
||||
#include "squirrel/sqvm.h"
|
||||
@ -53,18 +56,21 @@ void* HSQVM_PrintFunc(void* sqvm, char* fmt, ...)
|
||||
if (!g_bSpdLog_UseAnsiClr)
|
||||
{
|
||||
wconsole->debug(vmStr);
|
||||
#ifdef DEDICATED
|
||||
g_pRConServer->Send(vmStr.c_str());
|
||||
#endif // DEDICATED
|
||||
}
|
||||
else
|
||||
{
|
||||
std::string vmStrAnsi = SQVM_ANSI_LOG_T[vmIdx].c_str();
|
||||
vmStrAnsi.append(buf);
|
||||
wconsole->debug(vmStrAnsi);
|
||||
#ifdef DEDICATED
|
||||
g_pRConServer->Send(vmStrAnsi.c_str());
|
||||
#endif // DEDICATED
|
||||
}
|
||||
|
||||
#ifndef DEDICATED
|
||||
g_spd_sys_w_oss.str("");
|
||||
g_spd_sys_w_oss.clear();
|
||||
|
||||
iconsole->debug(vmStr);
|
||||
|
||||
if (sq_showvmoutput->GetInt() > 2)
|
||||
@ -73,6 +79,9 @@ void* HSQVM_PrintFunc(void* sqvm, char* fmt, ...)
|
||||
|
||||
g_pIConsole->m_ivConLog.push_back(Strdup(s.c_str()));
|
||||
g_pLogSystem.AddLog((LogType_t)vmIdx, s);
|
||||
|
||||
g_spd_sys_w_oss.str("");
|
||||
g_spd_sys_w_oss.clear();
|
||||
}
|
||||
#endif // !DEDICATED
|
||||
}
|
||||
@ -115,12 +124,18 @@ void* HSQVM_WarningFunc(void* sqvm, int a2, int a3, int* nStringSize, void** ppS
|
||||
if (!g_bSpdLog_UseAnsiClr)
|
||||
{
|
||||
wconsole->debug(vmStr);
|
||||
#ifdef DEDICATED
|
||||
g_pRConServer->Send(vmStr.c_str());
|
||||
#endif // DEDICATED
|
||||
}
|
||||
else
|
||||
{
|
||||
std::string vmStrAnsi = SQVM_WARNING_ANSI_LOG_T[vmIdx].c_str();
|
||||
vmStrAnsi.append(svConstructor);
|
||||
wconsole->debug(vmStrAnsi);
|
||||
#ifdef DEDICATED
|
||||
g_pRConServer->Send(vmStrAnsi.c_str());
|
||||
#endif // DEDICATED
|
||||
}
|
||||
|
||||
#ifndef DEDICATED
|
||||
@ -174,7 +189,7 @@ bool HSQVM_LoadScript(void* sqvm, const char* szScriptPath, const char* szScript
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: registers and exposes code functions to target VM's
|
||||
// Purpose: registers and exposes code functions to target context
|
||||
//---------------------------------------------------------------------------------
|
||||
void HSQVM_RegisterFunction(void* sqvm, const char* szName, const char* szHelpString, const char* szRetValType, const char* szArgTypes, void* pFunction)
|
||||
{
|
||||
@ -191,7 +206,7 @@ void HSQVM_RegisterFunction(void* sqvm, const char* szName, const char* szHelpSt
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: registers SERVER script functions
|
||||
// Purpose: registers script functions in SERVER context
|
||||
//---------------------------------------------------------------------------------
|
||||
void RegisterServerScriptFunctions(void* sqvm)
|
||||
{
|
||||
@ -200,7 +215,7 @@ void RegisterServerScriptFunctions(void* sqvm)
|
||||
|
||||
#ifndef DEDICATED
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: registers CLIENT script functions
|
||||
// Purpose: registers script functions in CLIENT context
|
||||
//---------------------------------------------------------------------------------
|
||||
void RegisterClientScriptFunctions(void* sqvm)
|
||||
{
|
||||
@ -208,7 +223,7 @@ void RegisterClientScriptFunctions(void* sqvm)
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: registers UI script functions
|
||||
// Purpose: registers script functions in UI context
|
||||
//---------------------------------------------------------------------------------
|
||||
void RegisterUIScriptFunctions(void* sqvm)
|
||||
{
|
||||
@ -235,7 +250,8 @@ void RegisterUIScriptFunctions(void* sqvm)
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: Origin functions are the last to be registered in the UI VM, we register anything ours below
|
||||
// Purpose: Origin functions are the last to be registered in UI context, we register anything ours below
|
||||
// TODO : Hook 'CreateVM' instead
|
||||
//---------------------------------------------------------------------------------
|
||||
void HSQVM_RegisterOriginFuncs(void* sqvm)
|
||||
{
|
||||
|
||||
@ -54,6 +54,7 @@ void ConVar::Init(void)
|
||||
cm_return_false_cmdquery_cheats = new ConVar("cm_return_false_cmdquery_cheats", "0", FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED, "Returns false on all FCVAR_DEVELOPMENTONLY and FCVAR_CHEAT ConVar/ConCommand queries ( !warning! ).", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
r_debug_overlay_nodecay = new ConVar("r_debug_overlay_nodecay", "0", FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT, "Keeps all debug overlays alive regardless of their lifetime. Use command 'clear_debug_overlays' to clear everything.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
|
||||
// TODO: RconPasswordChanged_f
|
||||
rcon_address = new ConVar("rcon_address", "::", FCVAR_SERVER_CANNOT_QUERY | FCVAR_DONTRECORD | FCVAR_RELEASE, "Remote console address.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
rcon_password = new ConVar("rcon_password", "", FCVAR_SERVER_CANNOT_QUERY | FCVAR_DONTRECORD | FCVAR_RELEASE, "Remote console password, RCON is disabled if empty.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
//-------------------------------------------------------------------------
|
||||
@ -61,13 +62,16 @@ void ConVar::Init(void)
|
||||
sv_showconnecting = new ConVar("sv_showconnecting", "1", FCVAR_RELEASE, "Logs information about the connecting client to the console.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
sv_pylonvisibility = new ConVar("sv_pylonvisibility", "0", FCVAR_RELEASE, "Determines the visiblity to the Pylon Master Server, 0 = Not visible, 1 = Visible, 2 = Hidden BUG BUG: not implemented yet.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
|
||||
//RconPasswordChanged_f
|
||||
sv_rcon_banpenalty = new ConVar("sv_rcon_banpenalty", "10", FCVAR_RELEASE, "Number of minutes to ban users who fail rcon authentication.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
#ifdef DEDICATED
|
||||
sv_rcon_banpenalty = new ConVar("sv_rcon_banpenalty", "10", FCVAR_RELEASE, "Number of minutes to ban users who fail rcon authentication.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
sv_rcon_maxfailures = new ConVar("sv_rcon_maxfailures", "10", FCVAR_RELEASE, "Max number of times a user can fail rcon authentication before being banned.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
sv_rcon_maxignores = new ConVar("sv_rcon_maxignores", "10", FCVAR_RELEASE, "Max number of times a user can ignore the no-auth message before being banned.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
sv_rcon_maxsockets = new ConVar("sv_rcon_maxsockets", "32", FCVAR_RELEASE, "Max number of accepted sockets before the server starts closing redundant sockets.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
sv_rcon_whitelist_address = new ConVar("sv_rcon_whitelist_address", "", FCVAR_RELEASE, "When set, rcon failed authentications will never ban this address, e.g. '127.0.0.1'.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
|
||||
#endif // DEDICATED
|
||||
//-------------------------------------------------------------------------
|
||||
// CLIENT |
|
||||
#ifndef DEDICATED
|
||||
cl_drawconsoleoverlay = new ConVar("cl_drawconsoleoverlay", "0", FCVAR_DEVELOPMENTONLY, "Draw the console overlay at the top of the screen.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
cl_consoleoverlay_lines = new ConVar("cl_consoleoverlay_lines", "3", FCVAR_DEVELOPMENTONLY, "Number of lines of console output to draw.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
cl_consoleoverlay_offset_x = new ConVar("cl_consoleoverlay_offset_x", "10", FCVAR_DEVELOPMENTONLY, "X offset for console overlay.", false, 1.f, false, 50.f, nullptr, nullptr);
|
||||
@ -89,14 +93,17 @@ void ConVar::Init(void)
|
||||
con_max_size_logvector = new ConVar("con_max_size_logvector", "1000", FCVAR_DEVELOPMENTONLY, "Maximum number of logs in the console until cleanup starts.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
con_suggestion_limit = new ConVar("con_suggestion_limit", "120", FCVAR_DEVELOPMENTONLY, "Maximum number of suggestions the autocomplete window will show for the console.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
con_suggestion_helptext = new ConVar("con_suggestion_helptext", "0", FCVAR_DEVELOPMENTONLY, "Show ConVar help text in autocomplete window. Disabled by default to keep window less populated.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
#endif // !DEDICATED
|
||||
//-------------------------------------------------------------------------
|
||||
// FILESYSTEM |
|
||||
fs_warning_level_sdk = new ConVar("fs_warning_level_sdk", "0", FCVAR_DEVELOPMENTONLY, "Set the SDK filesystem warning level.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
fs_show_warning_output = new ConVar("fs_show_warning_output", "0", FCVAR_DEVELOPMENTONLY, "Logs the filesystem warnings to the console, filtered by 'fs_warning_level_native' ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
fs_packedstore_entryblock_stats = new ConVar("fs_packedstore_entryblock_stats", "0", FCVAR_DEVELOPMENTONLY, "If set to 1, prints the stats of each file entry in the VPK during decompression ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
//-------------------------------------------------------------------------
|
||||
// FILESYSTEM |
|
||||
// MATERIALSYSTEM |
|
||||
#ifndef DEDICATED
|
||||
mat_showdxoutput = new ConVar("mat_showdxoutput", "0", FCVAR_DEVELOPMENTONLY, "Shows debug output for the DirectX system.", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
#endif // !DEDICATED
|
||||
//-------------------------------------------------------------------------
|
||||
// SQUIRREL |
|
||||
sq_showrsonloading = new ConVar("sq_showrsonloading", "0", FCVAR_DEVELOPMENTONLY, "Logs all 'rson' files loaded by the SQVM ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr);
|
||||
|
||||
@ -17,11 +17,16 @@ ConVar* rcon_password = new ConVar();
|
||||
ConVar* sv_showconnecting = new ConVar();
|
||||
ConVar* sv_pylonvisibility = new ConVar();
|
||||
|
||||
#ifdef DEDICATED
|
||||
ConVar* sv_rcon_banpenalty = new ConVar(); // TODO
|
||||
ConVar* sv_rcon_maxfailures = new ConVar();
|
||||
ConVar* sv_rcon_whitelist_address = new ConVar(); // TODO
|
||||
ConVar* sv_rcon_maxignores = new ConVar();
|
||||
ConVar* sv_rcon_maxsockets = new ConVar();
|
||||
ConVar* sv_rcon_whitelist_address = new ConVar();
|
||||
#endif // DEDICATED
|
||||
//-----------------------------------------------------------------------------
|
||||
// CLIENT |
|
||||
#ifndef DEDICATED
|
||||
ConVar* cl_drawconsoleoverlay = new ConVar();
|
||||
ConVar* cl_consoleoverlay_lines = new ConVar();
|
||||
ConVar* cl_consoleoverlay_offset_x = new ConVar();
|
||||
@ -42,6 +47,7 @@ ConVar* cl_gpustats_offset_y = new ConVar();
|
||||
ConVar* con_max_size_logvector = new ConVar();
|
||||
ConVar* con_suggestion_limit = new ConVar();
|
||||
ConVar* con_suggestion_helptext = new ConVar();
|
||||
#endif // !DEDICATED
|
||||
//-----------------------------------------------------------------------------
|
||||
// FILESYSTEM |
|
||||
ConVar* fs_warning_level_sdk = new ConVar();
|
||||
@ -49,7 +55,9 @@ ConVar* fs_show_warning_output = new ConVar();
|
||||
ConVar* fs_packedstore_entryblock_stats = new ConVar();
|
||||
//-----------------------------------------------------------------------------
|
||||
// MATERIALSYSTEM |
|
||||
#ifndef DEDICATED
|
||||
ConVar* mat_showdxoutput = new ConVar();
|
||||
#endif // !DEDICATED
|
||||
//-----------------------------------------------------------------------------
|
||||
// SQUIRREL |
|
||||
ConVar* sq_showrsonloading = new ConVar();
|
||||
|
||||
@ -28,12 +28,16 @@ extern ConVar* rcon_password;
|
||||
// SERVER |
|
||||
extern ConVar* sv_showconnecting;
|
||||
extern ConVar* sv_pylonvisibility;
|
||||
|
||||
#ifdef DEDICATED
|
||||
extern ConVar* sv_rcon_banpenalty;
|
||||
extern ConVar* sv_rcon_maxfailures;
|
||||
extern ConVar* sv_rcon_maxignores;
|
||||
extern ConVar* sv_rcon_maxsockets;
|
||||
extern ConVar* sv_rcon_whitelist_address;
|
||||
#endif // DEDICATED
|
||||
//-------------------------------------------------------------------------
|
||||
// CLIENT |
|
||||
#ifndef DEDICATED
|
||||
extern ConVar* cl_drawconsoleoverlay;
|
||||
extern ConVar* cl_consoleoverlay_lines;
|
||||
extern ConVar* cl_consoleoverlay_offset_x;
|
||||
@ -54,6 +58,7 @@ extern ConVar* cl_gpustats_offset_y;
|
||||
extern ConVar* con_max_size_logvector;
|
||||
extern ConVar* con_suggestion_limit;
|
||||
extern ConVar* con_suggestion_helptext;
|
||||
#endif // !DEDICATED
|
||||
//-------------------------------------------------------------------------
|
||||
// FILESYSTEM |
|
||||
extern ConVar* fs_warning_level_sdk;
|
||||
@ -61,7 +66,9 @@ extern ConVar* fs_show_warning_output;
|
||||
extern ConVar* fs_packedstore_entryblock_stats;
|
||||
//-------------------------------------------------------------------------
|
||||
// MATERIALSYSTEM |
|
||||
#ifndef DEDICATED
|
||||
extern ConVar* mat_showdxoutput;
|
||||
#endif // !DEDICATED
|
||||
//-------------------------------------------------------------------------
|
||||
// SQUIRREL |
|
||||
extern ConVar* sq_showrsonloading;
|
||||
|
||||
@ -17,12 +17,12 @@
|
||||
CNetAdr2::CNetAdr2(std::string svInAdr)
|
||||
{
|
||||
SetType(netadrtype_t::NA_IP);
|
||||
if (std::strcmp(svInAdr.c_str(), "loopback") == 0 || std::strcmp(svInAdr.c_str(), "::1") == 0)
|
||||
if (strcmp(svInAdr.c_str(), "loopback") == 0 || strcmp(svInAdr.c_str(), "::1") == 0)
|
||||
{
|
||||
SetType(netadrtype_t::NA_LOOPBACK);
|
||||
svInAdr = "[127.0.0.1" + GetPort(svInAdr);
|
||||
}
|
||||
else if (std::strcmp(svInAdr.c_str(), "localhost"))
|
||||
else if (strcmp(svInAdr.c_str(), "localhost"))
|
||||
{
|
||||
svInAdr = "[127.0.0.1" + GetPort(svInAdr);
|
||||
}
|
||||
@ -50,16 +50,16 @@ CNetAdr2::CNetAdr2(std::string svInAdr, std::string svInPort)
|
||||
{
|
||||
SetType(netadrtype_t::NA_IP);
|
||||
|
||||
if (std::strcmp(svInAdr.c_str(), "loopback") == 0 || std::strcmp(svInAdr.c_str(), "::1") == 0)
|
||||
if (strcmp(svInAdr.c_str(), "loopback") == 0 || strcmp(svInAdr.c_str(), "::1") == 0)
|
||||
{
|
||||
SetType(netadrtype_t::NA_LOOPBACK);
|
||||
}
|
||||
else if (std::strcmp(svInAdr.c_str(), "localhost") == 0)
|
||||
else if (strcmp(svInAdr.c_str(), "localhost") == 0)
|
||||
{
|
||||
svInAdr = "127.0.0.1";
|
||||
}
|
||||
|
||||
if (std::strstr(svInAdr.c_str(), "["))
|
||||
if (strstr(svInAdr.c_str(), "["))
|
||||
{
|
||||
svInAdr = GetBase(svInAdr);
|
||||
}
|
||||
@ -129,7 +129,7 @@ void CNetAdr2::SetVersion(void)
|
||||
{
|
||||
if (inet_pton(reinterpret_cast<sockaddr_in*>(&m_sadr)->sin_family,
|
||||
GetBase().c_str(), &reinterpret_cast<sockaddr_in*>(m_sadr)->sin_addr) &&
|
||||
!std::strstr(GetBase().c_str(), "::"))
|
||||
!strstr(GetBase().c_str(), "::"))
|
||||
{
|
||||
m_version = netadrversion_t::NA_V4;
|
||||
return;
|
||||
@ -342,7 +342,23 @@ int CNetAdr2::GetSize(void) const
|
||||
{
|
||||
return sizeof(sockaddr_in6);
|
||||
}
|
||||
return 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: returns the network family version.
|
||||
//-----------------------------------------------------------------------------
|
||||
int CNetAdr2::GetFamily(void) const
|
||||
{
|
||||
if (GetVersion() == netadrversion_t::NA_V4)
|
||||
{
|
||||
return AF_INET;
|
||||
}
|
||||
else if (GetVersion() == netadrversion_t::NA_V6)
|
||||
{
|
||||
return AF_INET6;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -438,7 +454,7 @@ void CNetAdr2::ToAdrinfo(addrinfo* pHint) const
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CNetAdr2::IsLocalhost(void) const
|
||||
{
|
||||
return (std::strcmp(GetBase().c_str(), "127.0.0.1") == 0);
|
||||
return (strcmp(GetBase().c_str(), "127.0.0.1") == 0);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -503,12 +519,12 @@ bool CNetAdr2::CompareAdr(const CNetAdr2& netAdr2, bool bBaseOnly) const
|
||||
if (GetType() == netadrtype_t::NA_IP)
|
||||
{
|
||||
if (!bBaseOnly &&
|
||||
(std::strcmp(netAdr2.GetPort().c_str(), GetPort().c_str()) != 0))
|
||||
(strcmp(netAdr2.GetPort().c_str(), GetPort().c_str()) != 0))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (std::strcmp(netAdr2.GetBase().c_str(), GetBase().c_str()) == 0)
|
||||
if (strcmp(netAdr2.GetBase().c_str(), GetBase().c_str()) == 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@ -544,8 +560,8 @@ bool CNetAdr2::CompareClassBAdr(const CNetAdr2& netAdr2) const
|
||||
std::vector<std::string> v0 = netAdr2.GetParts();
|
||||
std::vector<std::string> v1 = GetParts();
|
||||
|
||||
if (std::strcmp(v0[0].c_str(), v1[0].c_str()) == 0 &&
|
||||
std::strcmp(v0[1].c_str(), v1[1].c_str()) == 0)
|
||||
if (strcmp(v0[0].c_str(), v1[0].c_str()) == 0 &&
|
||||
strcmp(v0[1].c_str(), v1[1].c_str()) == 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@ -581,9 +597,9 @@ bool CNetAdr2::CompareClassCAdr(const CNetAdr2& netAdr2) const
|
||||
std::vector<std::string> v0 = netAdr2.GetParts();
|
||||
std::vector<std::string> v1 = GetParts();
|
||||
|
||||
if (std::strcmp(v0[0].c_str(), v1[0].c_str()) == 0 &&
|
||||
std::strcmp(v0[1].c_str(), v1[1].c_str()) == 0 &&
|
||||
std::strcmp(v0[2].c_str(), v1[2].c_str()) == 0)
|
||||
if (strcmp(v0[0].c_str(), v1[0].c_str()) == 0 &&
|
||||
strcmp(v0[1].c_str(), v1[1].c_str()) == 0 &&
|
||||
strcmp(v0[2].c_str(), v1[2].c_str()) == 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -66,6 +66,7 @@ public:
|
||||
std::string GetBase(std::string svInAdr) const;
|
||||
std::vector<std::string> GetParts(void) const;
|
||||
int GetSize(void) const;
|
||||
int GetFamily(void) const;
|
||||
|
||||
void ToSockadr(sockaddr_storage* pSadr) const;
|
||||
void ToAdrinfo(addrinfo* pHint) const;
|
||||
|
||||
@ -49,7 +49,7 @@ void CSocketCreator::ProcessAccept(void)
|
||||
{
|
||||
sockaddr_storage inClient{};
|
||||
int nLengthAddr = sizeof(inClient);
|
||||
int newSocket = accept(m_hListenSocket, reinterpret_cast<sockaddr*>(&inClient), &nLengthAddr);
|
||||
int newSocket = ::accept(m_hListenSocket, reinterpret_cast<sockaddr*>(&inClient), &nLengthAddr);
|
||||
if (newSocket == -1)
|
||||
{
|
||||
if (!IsSocketBlocking())
|
||||
@ -65,7 +65,7 @@ void CSocketCreator::ProcessAccept(void)
|
||||
|
||||
if (!ConfigureListenSocket(newSocket))
|
||||
{
|
||||
closesocket(newSocket);
|
||||
::closesocket(newSocket);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -85,11 +85,11 @@ bool CSocketCreator::ConfigureListenSocket(int iSocket)
|
||||
int v6only = 0;
|
||||
u_long opt = 1;
|
||||
|
||||
setsockopt(iSocket, IPPROTO_TCP, TCP_NODELAY, (char*)&nodelay, sizeof(nodelay));
|
||||
setsockopt(iSocket, SOL_SOCKET, SO_REUSEADDR, (char*)&nodelay, sizeof(nodelay));
|
||||
setsockopt(iSocket, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&v6only, sizeof(v6only));
|
||||
::setsockopt(iSocket, IPPROTO_TCP, TCP_NODELAY, (char*)&nodelay, sizeof(nodelay));
|
||||
::setsockopt(iSocket, SOL_SOCKET, SO_REUSEADDR, (char*)&nodelay, sizeof(nodelay));
|
||||
::setsockopt(iSocket, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&v6only, sizeof(v6only));
|
||||
|
||||
int results = ioctlsocket(iSocket, FIONBIO, (u_long*)&opt); // Non-blocking.
|
||||
int results = ::ioctlsocket(iSocket, FIONBIO, (u_long*)&opt); // Non-blocking.
|
||||
if (results == -1)
|
||||
{
|
||||
#ifndef NETCONSOLE
|
||||
@ -110,7 +110,7 @@ bool CSocketCreator::ConfigureConnectSocket(SocketHandle_t hSocket)
|
||||
int opt = 1;
|
||||
int ret = 0;
|
||||
|
||||
ret = ioctlsocket(hSocket, FIONBIO, reinterpret_cast<u_long*>(&opt)); // Non-blocking
|
||||
ret = ::ioctlsocket(hSocket, FIONBIO, reinterpret_cast<u_long*>(&opt)); // Non-blocking
|
||||
if (ret == -1)
|
||||
{
|
||||
#ifndef NETCONSOLE
|
||||
@ -118,13 +118,13 @@ bool CSocketCreator::ConfigureConnectSocket(SocketHandle_t hSocket)
|
||||
#else
|
||||
printf("Socket ioctl(FIONBIO) failed (%s)\n", NET_ErrorString(WSAGetLastError()));
|
||||
#endif // !NETCONSOLE
|
||||
closesocket(hSocket);
|
||||
::closesocket(hSocket);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Disable NAGLE as RCON cmds are small in size.
|
||||
int nodelay = 1;
|
||||
setsockopt(hSocket, IPPROTO_TCP, TCP_NODELAY, (char*)&nodelay, sizeof(nodelay));
|
||||
::setsockopt(hSocket, IPPROTO_TCP, TCP_NODELAY, (char*)&nodelay, sizeof(nodelay));
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -139,7 +139,7 @@ bool CSocketCreator::CreateListenSocket(const CNetAdr2& netAdr2, bool bListenOnA
|
||||
{
|
||||
CloseListenSocket();
|
||||
m_ListenAddress = netAdr2;
|
||||
m_hListenSocket = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
|
||||
m_hListenSocket = ::socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
|
||||
|
||||
if (m_hListenSocket != INVALID_SOCKET)
|
||||
{
|
||||
@ -152,7 +152,7 @@ bool CSocketCreator::CreateListenSocket(const CNetAdr2& netAdr2, bool bListenOnA
|
||||
sockaddr_storage sadr{};
|
||||
m_ListenAddress.ToSockadr(&sadr);
|
||||
|
||||
int results = bind(m_hListenSocket, reinterpret_cast<sockaddr*>(&sadr), m_ListenAddress.GetSize());
|
||||
int results = ::bind(m_hListenSocket, reinterpret_cast<sockaddr*>(&sadr), m_ListenAddress.GetSize());
|
||||
if (results == -1)
|
||||
{
|
||||
#ifndef NETCONSOLE
|
||||
@ -164,7 +164,7 @@ bool CSocketCreator::CreateListenSocket(const CNetAdr2& netAdr2, bool bListenOnA
|
||||
return false;
|
||||
}
|
||||
|
||||
results = listen(m_hListenSocket, SOCKET_TCP_MAX_ACCEPTS);
|
||||
results = ::listen(m_hListenSocket, SOCKET_TCP_MAX_ACCEPTS);
|
||||
if (results == -1)
|
||||
{
|
||||
#ifndef NETCONSOLE
|
||||
@ -186,7 +186,7 @@ void CSocketCreator::CloseListenSocket(void)
|
||||
{
|
||||
if (m_hListenSocket != -1)
|
||||
{
|
||||
closesocket(m_hListenSocket);
|
||||
::closesocket(m_hListenSocket);
|
||||
m_hListenSocket = -1;
|
||||
}
|
||||
}
|
||||
@ -204,7 +204,7 @@ int CSocketCreator::ConnectSocket(const CNetAdr2& netAdr2, bool bSingleSocket)
|
||||
CloseAllAcceptedSockets();
|
||||
}
|
||||
|
||||
SocketHandle_t hSocket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
|
||||
SocketHandle_t hSocket = ::socket(netAdr2.GetFamily(), SOCK_STREAM, IPPROTO_TCP);
|
||||
if (hSocket == SOCKET_ERROR)
|
||||
{
|
||||
#ifndef NETCONSOLE
|
||||
@ -223,7 +223,7 @@ int CSocketCreator::ConnectSocket(const CNetAdr2& netAdr2, bool bSingleSocket)
|
||||
struct sockaddr_storage s{};
|
||||
netAdr2.ToSockadr(&s);
|
||||
|
||||
int results = connect(hSocket, reinterpret_cast<sockaddr*>(&s), sizeof(s));
|
||||
int results = ::connect(hSocket, reinterpret_cast<sockaddr*>(&s), netAdr2.GetSize());
|
||||
if (results == SOCKET_ERROR)
|
||||
{
|
||||
if (!IsSocketBlocking())
|
||||
@ -233,7 +233,7 @@ int CSocketCreator::ConnectSocket(const CNetAdr2& netAdr2, bool bSingleSocket)
|
||||
#else
|
||||
printf("Socket connection failed (%s)\n", NET_ErrorString(WSAGetLastError()));
|
||||
#endif // !NETCONSOLE
|
||||
closesocket(hSocket);
|
||||
::closesocket(hSocket);
|
||||
return SOCKET_ERROR;
|
||||
}
|
||||
|
||||
@ -246,9 +246,9 @@ int CSocketCreator::ConnectSocket(const CNetAdr2& netAdr2, bool bSingleSocket)
|
||||
FD_ZERO(&writefds);
|
||||
FD_SET(static_cast<u_int>(hSocket), &writefds);
|
||||
|
||||
if (select(hSocket + 1, NULL, &writefds, NULL, &tv) < 1) // block for at most 1 second
|
||||
if (::select(hSocket + 1, NULL, &writefds, NULL, &tv) < 1) // block for at most 1 second
|
||||
{
|
||||
closesocket(hSocket); // took too long to connect to, give up
|
||||
::closesocket(hSocket); // took too long to connect to, give up
|
||||
return SOCKET_ERROR;
|
||||
}
|
||||
}
|
||||
@ -300,7 +300,7 @@ void CSocketCreator::CloseAcceptedSocket(int nIndex)
|
||||
}
|
||||
|
||||
AcceptedSocket_t& connected = m_hAcceptedSockets[nIndex];
|
||||
closesocket(connected.m_hSocket);
|
||||
::closesocket(connected.m_hSocket);
|
||||
m_hAcceptedSockets.erase(m_hAcceptedSockets.begin() + nIndex);
|
||||
}
|
||||
|
||||
@ -313,7 +313,7 @@ void CSocketCreator::CloseAllAcceptedSockets(void)
|
||||
for (int i = 0; i < nCount; ++i)
|
||||
{
|
||||
AcceptedSocket_t& connected = m_hAcceptedSockets[i];
|
||||
closesocket(connected.m_hSocket);
|
||||
::closesocket(connected.m_hSocket);
|
||||
}
|
||||
m_hAcceptedSockets.clear();
|
||||
}
|
||||
|
||||
@ -1,26 +1,6 @@
|
||||
#pragma once
|
||||
#include "tier1/netadr2.h"
|
||||
|
||||
typedef int SocketHandle_t;
|
||||
|
||||
class CConnectedNetConsoleData
|
||||
{
|
||||
public:
|
||||
SocketHandle_t m_hSocket {};
|
||||
int m_nCharsInCommandBuffer {};
|
||||
char m_pszInputCommandBuffer[MAX_NETCONSOLE_INPUT_LEN] {};
|
||||
bool m_bAuthorized {}; // If set, this netconsole is authenticated.
|
||||
bool m_bInputOnly {}; // If set, don't send spew to this netconsole.
|
||||
int m_nFailedAttempts {}; // Num failed authentication attempts.
|
||||
|
||||
CConnectedNetConsoleData(SocketHandle_t hSocket = -1)
|
||||
{
|
||||
m_nCharsInCommandBuffer = 0;
|
||||
m_bAuthorized = false;
|
||||
m_hSocket = hSocket;
|
||||
m_bInputOnly = false;
|
||||
}
|
||||
};
|
||||
#include "common/igameserverdata.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: container class to handle network streams
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user