Logging Convar
This commit is contained in:
parent
fcf1d95fba
commit
f0731ceee2
@ -85,6 +85,7 @@ SMEXT_LINK(&g_Connect);
|
|||||||
ConVar g_ConnectVersion("connect_version", SMEXT_CONF_VERSION, FCVAR_REPLICATED|FCVAR_NOTIFY, SMEXT_CONF_DESCRIPTION " Version");
|
ConVar g_ConnectVersion("connect_version", SMEXT_CONF_VERSION, FCVAR_REPLICATED|FCVAR_NOTIFY, SMEXT_CONF_DESCRIPTION " Version");
|
||||||
ConVar g_SvNoSteam("sv_nosteam", "0", FCVAR_NOTIFY, "Disable steam validation and force steam authentication.");
|
ConVar g_SvNoSteam("sv_nosteam", "0", FCVAR_NOTIFY, "Disable steam validation and force steam authentication.");
|
||||||
ConVar g_SvForceSteam("sv_forcesteam", "0", FCVAR_NOTIFY, "Force steam authentication.");
|
ConVar g_SvForceSteam("sv_forcesteam", "0", FCVAR_NOTIFY, "Force steam authentication.");
|
||||||
|
ConVar g_SvLogging("sv_connect_logging", "1", FCVAR_NOTIFY, "Log connection checks");
|
||||||
ConVar *g_pSvVisibleMaxPlayers;
|
ConVar *g_pSvVisibleMaxPlayers;
|
||||||
ConVar *g_pSvTags;
|
ConVar *g_pSvTags;
|
||||||
|
|
||||||
@ -353,6 +354,7 @@ DETOUR_DECL_MEMBER1(CSteam3Server__OnValidateAuthTicketResponse, int, ValidateAu
|
|||||||
bool SteamLegal = pResponse->m_eAuthSessionResponse == k_EAuthSessionResponseOK;
|
bool SteamLegal = pResponse->m_eAuthSessionResponse == k_EAuthSessionResponseOK;
|
||||||
bool force = g_SvNoSteam.GetInt() || g_SvForceSteam.GetInt() || !BLoggedOn();
|
bool force = g_SvNoSteam.GetInt() || g_SvForceSteam.GetInt() || !BLoggedOn();
|
||||||
|
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "%s SteamLegal: %d (%d)", aSteamID, SteamLegal, pResponse->m_eAuthSessionResponse);
|
g_pSM->LogMessage(myself, "%s SteamLegal: %d (%d)", aSteamID, SteamLegal, pResponse->m_eAuthSessionResponse);
|
||||||
|
|
||||||
if(!SteamLegal && force)
|
if(!SteamLegal && force)
|
||||||
@ -477,6 +479,7 @@ DETOUR_DECL_MEMBER9(CBaseServer__ConnectClient, IClient *, netadr_t &, address,
|
|||||||
pchPassword = passwordBuffer;
|
pchPassword = passwordBuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "%s SteamAuthFailed: %d (%d) | retVal = %d", aSteamID, SteamAuthFailed, result, retVal);
|
g_pSM->LogMessage(myself, "%s SteamAuthFailed: %d (%d) | retVal = %d", aSteamID, SteamAuthFailed, result, retVal);
|
||||||
|
|
||||||
// k_OnClientPreConnectEx_Reject
|
// k_OnClientPreConnectEx_Reject
|
||||||
@ -989,9 +992,13 @@ cell_t ClientPreConnectEx(IPluginContext *pContext, const cell_t *params)
|
|||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
bool force = g_SvNoSteam.GetInt() || g_SvForceSteam.GetInt() || !BLoggedOn();
|
bool force = g_SvNoSteam.GetInt() || g_SvForceSteam.GetInt() || !BLoggedOn();
|
||||||
|
|
||||||
|
|
||||||
if(Storage.SteamAuthFailed && force && !Storage.GotValidateAuthTicketResponse)
|
if(Storage.SteamAuthFailed && force && !Storage.GotValidateAuthTicketResponse)
|
||||||
{
|
{
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "%s Force ValidateAuthTicketResponse", pSteamID);
|
g_pSM->LogMessage(myself, "%s Force ValidateAuthTicketResponse", pSteamID);
|
||||||
|
|
||||||
Storage.ValidateAuthTicketResponse.m_SteamID = CSteamID(Storage.ullSteamID);
|
Storage.ValidateAuthTicketResponse.m_SteamID = CSteamID(Storage.ullSteamID);
|
||||||
Storage.ValidateAuthTicketResponse.m_eAuthSessionResponse = k_EAuthSessionResponseOK;
|
Storage.ValidateAuthTicketResponse.m_eAuthSessionResponse = k_EAuthSessionResponseOK;
|
||||||
Storage.ValidateAuthTicketResponse.m_OwnerSteamID = Storage.ValidateAuthTicketResponse.m_SteamID;
|
Storage.ValidateAuthTicketResponse.m_OwnerSteamID = Storage.ValidateAuthTicketResponse.m_SteamID;
|
||||||
@ -1001,7 +1008,9 @@ cell_t ClientPreConnectEx(IPluginContext *pContext, const cell_t *params)
|
|||||||
// Make sure this is always called in order to verify the client on the server
|
// Make sure this is always called in order to verify the client on the server
|
||||||
if(Storage.GotValidateAuthTicketResponse)
|
if(Storage.GotValidateAuthTicketResponse)
|
||||||
{
|
{
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "%s Replay ValidateAuthTicketResponse", pSteamID);
|
g_pSM->LogMessage(myself, "%s Replay ValidateAuthTicketResponse", pSteamID);
|
||||||
|
|
||||||
DETOUR_MEMBER_MCALL_ORIGINAL(CSteam3Server__OnValidateAuthTicketResponse, g_pSteam3Server)(&Storage.ValidateAuthTicketResponse);
|
DETOUR_MEMBER_MCALL_ORIGINAL(CSteam3Server__OnValidateAuthTicketResponse, g_pSteam3Server)(&Storage.ValidateAuthTicketResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1016,11 +1025,14 @@ cell_t SteamClientAuthenticated(IPluginContext *pContext, const cell_t *params)
|
|||||||
ConnectClientStorage Storage;
|
ConnectClientStorage Storage;
|
||||||
if(g_ConnectClientStorage.retrieve(pSteamID, &Storage))
|
if(g_ConnectClientStorage.retrieve(pSteamID, &Storage))
|
||||||
{
|
{
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "%s SteamClientAuthenticated: %d", pSteamID, Storage.SteamLegal);
|
g_pSM->LogMessage(myself, "%s SteamClientAuthenticated: %d", pSteamID, Storage.SteamLegal);
|
||||||
|
|
||||||
return Storage.SteamLegal;
|
return Storage.SteamLegal;
|
||||||
}
|
}
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "%s SteamClientAuthenticated: FALSE!", pSteamID);
|
g_pSM->LogMessage(myself, "%s SteamClientAuthenticated: FALSE!", pSteamID);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1183,6 +1195,9 @@ void ConnectEvents::FireGameEvent(IGameEvent *event)
|
|||||||
const bool bot = event->GetBool("bot");
|
const bool bot = event->GetBool("bot");
|
||||||
const char *name = event->GetString("name");
|
const char *name = event->GetString("name");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "player_connect(client=%d, userid=%d, bot=%d, name=%s)", client, userid, bot, name);
|
g_pSM->LogMessage(myself, "player_connect(client=%d, userid=%d, bot=%d, name=%s)", client, userid, bot, name);
|
||||||
|
|
||||||
if(client >= 1 && client <= SM_MAXPLAYERS)
|
if(client >= 1 && client <= SM_MAXPLAYERS)
|
||||||
@ -1204,6 +1219,7 @@ void ConnectEvents::FireGameEvent(IGameEvent *event)
|
|||||||
|
|
||||||
g_UserIDtoClientMap[userid] = client;
|
g_UserIDtoClientMap[userid] = client;
|
||||||
|
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "\tCPlayer(active=%d, fake=%d, pClient=%p, name=%s)", player.active, player.fake, player.pClient, player.name);
|
g_pSM->LogMessage(myself, "\tCPlayer(active=%d, fake=%d, pClient=%p, name=%s)", player.active, player.fake, player.pClient, player.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1214,12 +1230,13 @@ void ConnectEvents::FireGameEvent(IGameEvent *event)
|
|||||||
const int client = g_UserIDtoClientMap[userid];
|
const int client = g_UserIDtoClientMap[userid];
|
||||||
g_UserIDtoClientMap[userid] = 0;
|
g_UserIDtoClientMap[userid] = 0;
|
||||||
|
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "player_disconnect(userid=%d, client=%d)", userid, client);
|
g_pSM->LogMessage(myself, "player_disconnect(userid=%d, client=%d)", userid, client);
|
||||||
|
|
||||||
if(client >= 1 && client <= SM_MAXPLAYERS)
|
if(client >= 1 && client <= SM_MAXPLAYERS)
|
||||||
{
|
{
|
||||||
CQueryCache::CPlayer &player = g_QueryCache.players[client];
|
CQueryCache::CPlayer &player = g_QueryCache.players[client];
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "\tCPlayer(active=%d, fake=%d, pClient=%p, name=%s)", player.active, player.fake, player.pClient, player.name);
|
g_pSM->LogMessage(myself, "\tCPlayer(active=%d, fake=%d, pClient=%p, name=%s)", player.active, player.fake, player.pClient, player.name);
|
||||||
|
|
||||||
if(player.active)
|
if(player.active)
|
||||||
@ -1237,7 +1254,9 @@ void ConnectEvents::FireGameEvent(IGameEvent *event)
|
|||||||
char *pSteamID = g_ClientSteamIDMap[client];
|
char *pSteamID = g_ClientSteamIDMap[client];
|
||||||
if(*pSteamID)
|
if(*pSteamID)
|
||||||
{
|
{
|
||||||
|
if (g_SvLogging.GetInt())
|
||||||
g_pSM->LogMessage(myself, "%s OnClientDisconnecting: %d", pSteamID, client);
|
g_pSM->LogMessage(myself, "%s OnClientDisconnecting: %d", pSteamID, client);
|
||||||
|
|
||||||
g_ConnectClientStorage.remove(pSteamID);
|
g_ConnectClientStorage.remove(pSteamID);
|
||||||
*pSteamID = 0;
|
*pSteamID = 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user