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

Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace-Server

Browse source
This commit is contained in:
btd 2010-08-25 18:34:21 +04:00
parent 091a1125a3 e37992ae56
commit ecdcf09456
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -894,7 +894,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
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), "ClientId=%d Level=%d Rcon='%s'", ClientId, m_aClients[ClientId].m_Authed, pCmd);
Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf); Console()->Print(IConsole::OUTPUT_LEVEL_ADDINFO, "server", aBuf);
Console()->ExecuteLine(pCmd); Console()->ExecuteLine(pCmd, m_aClients[ClientId].m_Authed, ClientId);
//Addr = m_NetServer.ClientAddr(ClientId); //Addr = m_NetServer.ClientAddr(ClientId);
if(m_aClients[ClientId].m_Authed > 0) if(m_aClients[ClientId].m_Authed > 0)
{ {
@ -977,7 +977,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
} }
} }
} }
else if(str_comp(pPw, g_Config.m_SvRconPassword) == 0) /*else if(str_comp(pPw, g_Config.m_SvRconPassword) == 0)
{ {
CMsgPacker Msg(NETMSG_RCON_AUTH_STATUS); CMsgPacker Msg(NETMSG_RCON_AUTH_STATUS);
Msg.AddInt(1); Msg.AddInt(1);
@ -988,7 +988,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
char aBuf[256]; char aBuf[256];
str_format(aBuf, sizeof(aBuf), "ClientId=%d authed", ClientId); str_format(aBuf, sizeof(aBuf), "ClientId=%d authed", ClientId);
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf); Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
} }*/
else else
{ {
SendRconLine(ClientId, "Wrong password."); SendRconLine(ClientId, "Wrong password.");

2
src/engine/shared/console.cpp
View file

@ -234,7 +234,7 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, const int Client
} else { } else {
str_format(aBuf, sizeof(aBuf), "You have low level to use command: %s. Your level: %d. Need level: %d", pCommand->m_pName, ClientLevel, pCommand->m_Level); str_format(aBuf, sizeof(aBuf), "You have low level to use command: %s. Your level: %d. Need level: %d", pCommand->m_pName, ClientLevel, pCommand->m_Level);
} }
Print(aBuf); Print(OUTPUT_LEVEL_STANDARD, "Console",aBuf);
} }
} }
} }

6
src/engine/shared/network_server.cpp
View file

@ -89,8 +89,8 @@ int CNetServer::Drop(int ClientID, const char *pReason)
m_pfnDelClient(ClientID, pReason, m_UserPtr); m_pfnDelClient(ClientID, pReason, m_UserPtr);
if(m_pfnDelClient) /* if(m_pfnDelClient)
m_pfnDelClient(ClientID, m_UserPtr); m_pfnDelClient(ClientID, m_UserPtr);*/
m_aSlots[ClientID].m_Connection.Disconnect(pReason); m_aSlots[ClientID].m_Connection.Disconnect(pReason);
BanAddNoDrop(Addr, g_Config.m_SvReconnectTime); BanAddNoDrop(Addr, g_Config.m_SvReconnectTime);
return 0; return 0;
@ -524,4 +524,4 @@ void CNetServer::SetMaxClientsPerIP(int Max)
Max = NET_MAX_CLIENTS; Max = NET_MAX_CLIENTS;
m_MaxClientsPerIP = Max; m_MaxClientsPerIP = Max;
} }