pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-05 11:26:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Post merge Log.Out converts and header/linker fixes

Browse Source
This commit is contained in:
Akkadius
2015-02-03 00:10:49 -06:00
parent dd6d1d5511
commit 3448dd1a9e
14 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/console.cpp
+1 -1
View File
@@ -268,7 +268,7 @@ bool Console::Process() {
}
else if (tcpc->GetPacketMode() == EmuTCPConnection::packetModeWebInterface)
{
_log(WORLD__CONSOLE, "New WI Connection from %s:%d", inet_ntoa(in), GetPort());
Log.Out(Logs::Detail, Logs::World_Server, "New WI Connection from %s:%d", inet_ntoa(in), GetPort());
WILink.SetConnection(tcpc);
tcpc = 0;
}
world/net.cpp
+2
View File
@@ -108,6 +108,8 @@ uint32 numclients = 0;
uint32 numzones = 0;
bool holdzones = false;
EQEmuLogSys Log;
extern ConsoleList console_list;
void CatchSignal(int sig_num);
world/remote_call.cpp
+2 -3
View File
@@ -1,8 +1,7 @@
#include <string>
#include "../common/debug.h"
#include "../common/logsys.h"
#include "../common/logtypes.h"
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "../common/md5.h"
#include "../common/emu_tcp_connection.h"
#include "../common/packet_dump.h"
world/web_interface.cpp
+8 -9
View File
@@ -1,12 +1,11 @@
#include "../common/debug.h"
#include "../common/global_define.h"
#include "web_interface.h"
#include "world_config.h"
#include "clientlist.h"
#include "zonelist.h"
#include "zoneserver.h"
#include "remote_call.h"
#include "../common/logsys.h"
#include "../common/logtypes.h"
#include "../common/eqemu_logsys.h"
#include "../common/md5.h"
#include "../common/emu_tcp_connection.h"
#include "../common/packet_dump.h"
@@ -25,7 +24,7 @@ void WebInterfaceConnection::SetConnection(EmuTCPConnection *inStream)
{
if(stream)
{
_log(WEB_INTERFACE__ERROR, "Incoming WebInterface Connection while we were already connected to a WebInterface.");
Log.Out(Logs::General, Logs::WebInterface_Server, "Incoming WebInterface Connection while we were already connected to a WebInterface.");
stream->Disconnect();
}
@@ -59,7 +58,7 @@ bool WebInterfaceConnection::Process()
{
struct in_addr in;
in.s_addr = GetIP();
_log(WEB_INTERFACE__ERROR, "WebInterface authorization failed.");
Log.Out(Logs::General, Logs::Error, "WebInterface authorization failed.");
ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed);
SendPacket(pack);
delete pack;
@@ -71,7 +70,7 @@ bool WebInterfaceConnection::Process()
{
struct in_addr in;
in.s_addr = GetIP();
_log(WEB_INTERFACE__ERROR, "WebInterface authorization failed.");
Log.Out(Logs::General, Logs::Error, "WebInterface authorization failed.");
ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed);
SendPacket(pack);
delete pack;
@@ -81,7 +80,7 @@ bool WebInterfaceConnection::Process()
}
else
{
_log(WEB_INTERFACE__ERROR, "**WARNING** You have not configured a world shared key in your config file. You should add a <key>STRING</key> element to your <world> element to prevent unauthorized zone access.");
Log.Out(Logs::General, Logs::Error, "**WARNING** You have not configured a world shared key in your config file. You should add a <key>STRING</key> element to your <world> element to prevent unauthorized zone access.");
authenticated = true;
}
delete pack;
@@ -99,7 +98,7 @@ bool WebInterfaceConnection::Process()
}
case ServerOP_ZAAuth:
{
_log(WEB_INTERFACE__ERROR, "Got authentication from WebInterface when they are already authenticated.");
Log.Out(Logs::General, Logs::Error, "Got authentication from WebInterface when they are already authenticated.");
break;
}
case ServerOP_WIRemoteCall:
@@ -159,7 +158,7 @@ bool WebInterfaceConnection::Process()
}
default:
{
_log(WEB_INTERFACE__ERROR, "Unknown ServerOPcode from WebInterface 0x%04x, size %d", pack->opcode, pack->size);
Log.Out(Logs::General, Logs::Error, "Unknown ServerOPcode from WebInterface 0x%04x, size %d", pack->opcode, pack->size);
DumpPacket(pack->pBuffer, pack->size);
break;
}