edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhanced Console Prints and dbg_msgs

Browse source
This commit is contained in:
GreYFoXGTi 2010-09-17 17:37:03 +03:00
parent 1eb4441d14
commit f657cb05a5
2 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/engine/server/server.cpp
View file

@ -567,7 +567,7 @@ int CServer::DelClientCallback(int ClientId, const char *pReason, void *pUser)
NETADDR Addr = pThis->m_NetServer.ClientAddr(ClientId); NETADDR Addr = pThis->m_NetServer.ClientAddr(ClientId);
char aBuf[256]; char aBuf[256];
str_format(aBuf, sizeof(aBuf), "client dropped. cid=%d ip=%d.%d.%d.%d reason=\"%s\"", str_format(aBuf, sizeof(aBuf), "%s client dropped. ClientId=%d ip=%d.%d.%d.%d reason=\"%s\"", pThis->ClientName(ClientId),
ClientId, ClientId,
Addr.ip[0], Addr.ip[1], Addr.ip[2], Addr.ip[3], Addr.ip[0], Addr.ip[1], Addr.ip[2], Addr.ip[3],
pReason pReason
@ -902,13 +902,13 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
if(Unpacker.Error() == 0/* && m_aClients[ClientId].m_Authed*/) if(Unpacker.Error() == 0/* && m_aClients[ClientId].m_Authed*/)
{ {
char aBuf[256]; char aBuf[256];
str_format(aBuf, sizeof(aBuf), "ClientId=%d Level=%d Rcon='%s'", ClientId, m_aClients[ClientId].m_Authed, pCmd); str_format(aBuf, sizeof(aBuf), "'%s' ClientId=%d Level=%d Rcon='%s'", ClientName(ClientId), ClientId, m_aClients[ClientId].m_Authed, pCmd);
Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf); Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf);
//Addr = m_NetServer.ClientAddr(ClientId); //Addr = m_NetServer.ClientAddr(ClientId);
if(m_aClients[ClientId].m_Authed > 0) if(m_aClients[ClientId].m_Authed > 0)
{ {
char aBuf[256]; char aBuf[256];
str_format(aBuf, sizeof(aBuf), "ClientId=%d rcon='%s'", ClientId, pCmd); str_format(aBuf, sizeof(aBuf), "'%s' ClientId=%d rcon='%s'", ClientName(ClientId), ClientId, pCmd);
Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf); Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf);
m_RconClientId = ClientId; m_RconClientId = ClientId;
Console()->ExecuteLine(pCmd, m_aClients[ClientId].m_Authed, ClientId); Console()->ExecuteLine(pCmd, m_aClients[ClientId].m_Authed, ClientId);
@ -970,7 +970,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
} }
if(level != -1) if(level != -1)
{ {
char buf[128]="Authentication successful. Remote console access grantedfor cid=%d with level=%d"; char buf[128]="Authentication successful. Remote console access grantedfor ClientId=%d with level=%d";
CMsgPacker Msg(NETMSG_RCON_AUTH_STATUS); CMsgPacker Msg(NETMSG_RCON_AUTH_STATUS);
Msg.AddInt(1); Msg.AddInt(1);
SendMsgEx(&Msg, MSGFLAG_VITAL, ClientId, true); SendMsgEx(&Msg, MSGFLAG_VITAL, ClientId, true);
@ -979,7 +979,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
GameServer()->OnSetAuthed(ClientId, m_aClients[ClientId].m_Authed); GameServer()->OnSetAuthed(ClientId, m_aClients[ClientId].m_Authed);
str_format(buf,sizeof(buf),buf,ClientId,level); str_format(buf,sizeof(buf),buf,ClientId,level);
SendRconLine(ClientId, buf); SendRconLine(ClientId, buf);
dbg_msg("server", "ClientId=%d authed with Level=%d", ClientId, level); dbg_msg("server", "'%s' ClientId=%d authed with Level=%d", ClientName(ClientId), ClientId, level);
m_aClients[ClientId].m_PwTries = 0; m_aClients[ClientId].m_PwTries = 0;
} }
else else
@ -988,7 +988,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
if(++m_aClients[ClientId].m_PwTries > g_Config.m_SvRconTries) if(++m_aClients[ClientId].m_PwTries > g_Config.m_SvRconTries)
{ // rcon Kottizen LemonFace { // rcon Kottizen LemonFace
BanAdd(m_NetServer.ClientAddr(ClientId), g_Config.m_SvRconTriesBantime, "exceeding rcon password tries, Bye"); // bye BanAdd(m_NetServer.ClientAddr(ClientId), g_Config.m_SvRconTriesBantime, "exceeding rcon password tries, Bye"); // bye
dbg_msg("server", "cid=%d banned, wrong rcon pw", ClientId); dbg_msg("server", "'%s' ClientId=%d banned, wrong rcon pw", ClientName(ClientId), ClientId);
} }
} }
} }
@ -1034,7 +1034,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
} }
char aBufMsg[256]; char aBufMsg[256];
str_format(aBufMsg, sizeof(aBufMsg), "strange message ClientId=%d msg=%d data_size=%d", ClientId, Msg, pPacket->m_DataSize); str_format(aBufMsg, sizeof(aBufMsg), "strange message from '%s' ClientId=%d msg=%d data_size=%d", ClientName(ClientId), ClientId, Msg, pPacket->m_DataSize);
Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBufMsg); Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBufMsg);
Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf); Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf);

90
src/game/server/gamecontext.cpp
View file

@ -1560,8 +1560,8 @@ void CGameContext::ConGoLeft(IConsole::IResult *pResult, void *pUserData, int Cl
} }
else else
{ {
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
serv->SendRconLine(ClientId,(pSelf->m_apPlayers[ClientId]->m_Authed>1)?"You can't move a player with the same or higher rank":"You can't move others as a helper"); pServ->SendRconLine(ClientId,(pSelf->m_apPlayers[ClientId]->m_Authed>1)?"You can't move a player with the same or higher rank":"You can't move others as a helper");
} }
} }
@ -1596,8 +1596,8 @@ void CGameContext::ConGoRight(IConsole::IResult *pResult, void *pUserData, int
} }
else else
{ {
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
serv->SendRconLine(ClientId,(pSelf->m_apPlayers[ClientId]->m_Authed>1)?"You can't move a player with the same or higher rank":"You can't move others as a helper"); pServ->SendRconLine(ClientId,(pSelf->m_apPlayers[ClientId]->m_Authed>1)?"You can't move a player with the same or higher rank":"You can't move others as a helper");
} }
} }
@ -1632,8 +1632,8 @@ void CGameContext::ConGoDown(IConsole::IResult *pResult, void *pUserData, int C
} }
else else
{ {
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
serv->SendRconLine(ClientId,(pSelf->m_apPlayers[ClientId]->m_Authed>1)?"You can't move a player with the same or higher rank":"You can't move others as a helper"); pServ->SendRconLine(ClientId,(pSelf->m_apPlayers[ClientId]->m_Authed>1)?"You can't move a player with the same or higher rank":"You can't move others as a helper");
} }
} }
@ -1668,8 +1668,8 @@ void CGameContext::ConGoUp(IConsole::IResult *pResult, void *pUserData, int Cli
} }
else else
{ {
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
serv->SendRconLine(ClientId,(pSelf->m_apPlayers[ClientId]->m_Authed>1)?"You can't move a player with the same or higher rank":"You can't move others as a helper"); pServ->SendRconLine(ClientId,(pSelf->m_apPlayers[ClientId]->m_Authed>1)?"You can't move a player with the same or higher rank":"You can't move others as a helper");
} }
} }
@ -1803,10 +1803,10 @@ void CGameContext::ConHammer(IConsole::IResult *pResult, void *pUserData, int Cl
CCharacter* chr = pSelf->GetPlayerChar(Victim); CCharacter* chr = pSelf->GetPlayerChar(Victim);
if (!chr) if (!chr)
return; return;
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
if (type>3 || type<0) if (type>3 || type<0)
{ {
serv->SendRconLine(ClientId, "Select hammer between 0 and 3"); pServ->SendRconLine(ClientId, "Select hammer between 0 and 3");
} }
else else
{ {
@ -1815,8 +1815,8 @@ void CGameContext::ConHammer(IConsole::IResult *pResult, void *pUserData, int Cl
chr->m_HammerType = type; chr->m_HammerType = type;
if(!g_Config.m_SvCheatTime) if(!g_Config.m_SvCheatTime)
chr->m_RaceState = RACE_CHEAT; chr->m_RaceState = RACE_CHEAT;
str_format(buf, sizeof(buf), "Hammer of ClientId=%d setted to %d",Victim,type); str_format(buf, sizeof(buf), "Hammer of '%s' ClientId=%d setted to %d", pServ->ClientName(ClientId), Victim, type);
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
} }
} }
@ -1830,10 +1830,10 @@ void CGameContext::ConHammerMe(IConsole::IResult *pResult, void *pUserData, int
CCharacter* chr = pSelf->GetPlayerChar(ClientId); CCharacter* chr = pSelf->GetPlayerChar(ClientId);
if (!chr) if (!chr)
return; return;
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
if (type>3 || type<0) if (type>3 || type<0)
{ {
serv->SendRconLine(ClientId, "Select hammer between 0 and 3"); pServ->SendRconLine(ClientId, "Select hammer between 0 and 3");
} }
else else
{ {
@ -1841,7 +1841,7 @@ void CGameContext::ConHammerMe(IConsole::IResult *pResult, void *pUserData, int
if(!g_Config.m_SvCheatTime) if(!g_Config.m_SvCheatTime)
chr->m_RaceState = RACE_CHEAT; chr->m_RaceState = RACE_CHEAT;
str_format(buf, sizeof(buf), "Hammer setted to %d",type); str_format(buf, sizeof(buf), "Hammer setted to %d",type);
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
} }
@ -2057,7 +2057,7 @@ void CGameContext::ConTimerStop(IConsole::IResult *pResult, void *pUserData, int
{ {
CGameContext *pSelf = (CGameContext *)pUserData; CGameContext *pSelf = (CGameContext *)pUserData;
char buf[128]; char buf[128];
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
if(!g_Config.m_SvTimer) if(!g_Config.m_SvTimer)
{ {
@ -2068,14 +2068,14 @@ void CGameContext::ConTimerStop(IConsole::IResult *pResult, void *pUserData, int
if (pSelf->m_apPlayers[Victim] && compare_players(pSelf->m_apPlayers[ClientId],pSelf->m_apPlayers[Victim])) if (pSelf->m_apPlayers[Victim] && compare_players(pSelf->m_apPlayers[ClientId],pSelf->m_apPlayers[Victim]))
{ {
chr->m_RaceState=RACE_CHEAT; chr->m_RaceState=RACE_CHEAT;
str_format(buf, sizeof(buf), "Cid=%d Hasn't time now (Timer Stopped)",Victim); str_format(buf, sizeof(buf), "'%s' ClientId=%d Hasn't time now (Timer Stopped)", pServ->ClientName(ClientId), Victim);
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
} }
else else
{ {
serv->SendRconLine(ClientId, "Timer commands are disabled"); pServ->SendRconLine(ClientId, "Timer commands are disabled");
} }
} }
@ -2083,7 +2083,7 @@ void CGameContext::ConTimerStart(IConsole::IResult *pResult, void *pUserData, in
{ {
CGameContext *pSelf = (CGameContext *)pUserData; CGameContext *pSelf = (CGameContext *)pUserData;
char buf[128]; char buf[128];
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
if(!g_Config.m_SvTimer) if(!g_Config.m_SvTimer)
{ {
int Victim = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int Victim = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
@ -2093,14 +2093,14 @@ void CGameContext::ConTimerStart(IConsole::IResult *pResult, void *pUserData, in
if (pSelf->m_apPlayers[Victim] && compare_players(pSelf->m_apPlayers[ClientId],pSelf->m_apPlayers[Victim])) if (pSelf->m_apPlayers[Victim] && compare_players(pSelf->m_apPlayers[ClientId],pSelf->m_apPlayers[Victim]))
{ {
chr->m_RaceState = RACE_STARTED; chr->m_RaceState = RACE_STARTED;
str_format(buf, sizeof(buf), "Cid=%d Has time now (Timer Started)",Victim); str_format(buf, sizeof(buf), "'%s' ClientId=%d Has time now (Timer Started)", pServ->ClientName(ClientId), Victim);
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
} }
else else
{ {
serv->SendRconLine(ClientId, "Timer commands are disabled"); pServ->SendRconLine(ClientId, "Timer commands are disabled");
} }
} }
@ -2110,7 +2110,7 @@ void CGameContext::ConTimerZero(IConsole::IResult *pResult, void *pUserData, int
CGameContext *pSelf = (CGameContext *)pUserData; CGameContext *pSelf = (CGameContext *)pUserData;
if(!pSelf->CheatsAvailable(ClientId)) return; if(!pSelf->CheatsAvailable(ClientId)) return;
char buf[128]; char buf[128];
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
if(!g_Config.m_SvTimer) if(!g_Config.m_SvTimer)
{ {
int Victim = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int Victim = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
@ -2123,15 +2123,15 @@ void CGameContext::ConTimerZero(IConsole::IResult *pResult, void *pUserData, int
chr->m_StartTime = pSelf->Server()->Tick(); chr->m_StartTime = pSelf->Server()->Tick();
chr->m_RefreshTime = pSelf->Server()->Tick(); chr->m_RefreshTime = pSelf->Server()->Tick();
chr->m_RaceState=RACE_CHEAT; chr->m_RaceState=RACE_CHEAT;
str_format(buf, sizeof(buf), "Cid=%d time has been reset & stopped.",Victim); str_format(buf, sizeof(buf), "'%s' ClientId=%d time has been reset & stopped.", pServ->ClientName(ClientId), Victim);
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
} }
else else
{ {
serv->SendRconLine(ClientId, "Timer commands are disabled"); pServ->SendRconLine(ClientId, "Timer commands are disabled");
} }
} }
@ -2140,7 +2140,7 @@ void CGameContext::ConTimerReStart(IConsole::IResult *pResult, void *pUserData,
CGameContext *pSelf = (CGameContext *)pUserData; CGameContext *pSelf = (CGameContext *)pUserData;
if(!pSelf->CheatsAvailable(ClientId)) return; if(!pSelf->CheatsAvailable(ClientId)) return;
char buf[128]; char buf[128];
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
if(!g_Config.m_SvTimer) if(!g_Config.m_SvTimer)
{ {
int Victim = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1); int Victim = clamp(pResult->GetInteger(0), 0, (int)MAX_CLIENTS-1);
@ -2153,15 +2153,15 @@ void CGameContext::ConTimerReStart(IConsole::IResult *pResult, void *pUserData,
chr->m_StartTime = pSelf->Server()->Tick(); chr->m_StartTime = pSelf->Server()->Tick();
chr->m_RefreshTime = pSelf->Server()->Tick(); chr->m_RefreshTime = pSelf->Server()->Tick();
chr->m_RaceState=RACE_STARTED; chr->m_RaceState=RACE_STARTED;
str_format(buf, sizeof(buf), "Cid=%d time has been reset & stopped.",Victim); str_format(buf, sizeof(buf), "'%s' ClientId=%d time has been reset & stopped.", pServ->ClientName(ClientId), Victim);
CServer* serv = (CServer*)pSelf->Server(); CServer* pServ = (CServer*)pSelf->Server();
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
} }
else else
{ {
serv->SendRconLine(ClientId, "Timer commands are disabled"); pServ->SendRconLine(ClientId, "Timer commands are disabled");
} }
} }
@ -2181,9 +2181,9 @@ void CGameContext::ConFreeze(IConsole::IResult *pResult, void *pUserData, int Cl
{ {
chr->Freeze(((time!=0&&time!=-1)?(pSelf->Server()->TickSpeed()*time):(-1))); chr->Freeze(((time!=0&&time!=-1)?(pSelf->Server()->TickSpeed()*time):(-1)));
chr->m_pPlayer->m_RconFreeze = true; chr->m_pPlayer->m_RconFreeze = true;
str_format(buf, sizeof(buf), "Cid=%d has been Frozen.",Victim); CServer* pServ = (CServer*)pSelf->Server();
CServer* serv = (CServer*)pSelf->Server(); str_format(buf, sizeof(buf), "'%s' ClientId=%d has been Frozen.", pServ->ClientName(ClientId), Victim);
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
} }
@ -2199,9 +2199,9 @@ void CGameContext::ConUnFreeze(IConsole::IResult *pResult, void *pUserData, int
return; return;
chr->m_FreezeTime=2; chr->m_FreezeTime=2;
chr->m_pPlayer->m_RconFreeze = false; chr->m_pPlayer->m_RconFreeze = false;
str_format(buf, sizeof(buf), "Cid=%d has been UnFreezed.",Victim); CServer* pServ = (CServer*)pSelf->Server();
CServer* serv = (CServer*)pSelf->Server(); str_format(buf, sizeof(buf), "'%s' ClientId=%d has been UnFreezed.", pServ->ClientName(ClientId), Victim);
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
@ -2233,9 +2233,9 @@ void CGameContext::ConInvis(IConsole::IResult *pResult, void *pUserData, int Cli
if (pSelf->m_apPlayers[Victim] && compare_players(pSelf->m_apPlayers[ClientId],pSelf->m_apPlayers[Victim])) if (pSelf->m_apPlayers[Victim] && compare_players(pSelf->m_apPlayers[ClientId],pSelf->m_apPlayers[Victim]))
{ {
pSelf->m_apPlayers[Victim]->m_Invisible = true; pSelf->m_apPlayers[Victim]->m_Invisible = true;
str_format(buf, sizeof(buf), "Cid=%d is now invisible.",Victim); CServer* pServ = (CServer*)pSelf->Server();
CServer* serv = (CServer*)pSelf->Server(); str_format(buf, sizeof(buf), "'%s' ClientId=%d is now invisible.", pServ->ClientName(ClientId), Victim);
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
} }
@ -2249,9 +2249,9 @@ void CGameContext::ConVis(IConsole::IResult *pResult, void *pUserData, int Clien
if (pSelf->m_apPlayers[Victim] && compare_players(pSelf->m_apPlayers[ClientId],pSelf->m_apPlayers[Victim])) if (pSelf->m_apPlayers[Victim] && compare_players(pSelf->m_apPlayers[ClientId],pSelf->m_apPlayers[Victim]))
{ {
pSelf->m_apPlayers[Victim]->m_Invisible = false; pSelf->m_apPlayers[Victim]->m_Invisible = false;
str_format(buf, sizeof(buf), "Cid=%d is visible.",Victim); CServer* pServ = (CServer*)pSelf->Server();
CServer* serv = (CServer*)pSelf->Server(); str_format(buf, sizeof(buf), "'%s' ClientId=%d is visible.", pServ->ClientName(ClientId), Victim);
serv->SendRconLine(ClientId, buf); pServ->SendRconLine(ClientId, buf);
} }
} }