pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 08:21:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into shared_mem

Browse Source
This commit is contained in:
KimLS 2013-02-21 08:58:53 -08:00
commit 543ef3fb32
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/EQStream.cpp
View File

@ -438,11 +438,11 @@ if(NextSequencedSend > SequencedQueue.size()) {
#ifndef COLLECTOR #ifndef COLLECTOR
SessionStats *Stats=(SessionStats *)p->pBuffer; SessionStats *Stats=(SessionStats *)p->pBuffer;
_log(NET__NET_TRACE, _L "Received Stats: %lu packets received, %lu packets sent, Deltas: local %lu, (%lu <- %lu -> %lu) remote %lu" __L, _log(NET__NET_TRACE, _L "Received Stats: %lu packets received, %lu packets sent, Deltas: local %lu, (%lu <- %lu -> %lu) remote %lu" __L,
(unsigned long)ntohl(Stats->packets_recieved), (unsigned long)ntohl(Stats->packets_sent), (unsigned long)ntohl(Stats->last_local_delta), (unsigned long)ntohl(Stats->packets_received), (unsigned long)ntohl(Stats->packets_sent), (unsigned long)ntohl(Stats->last_local_delta),
(unsigned long)ntohl(Stats->low_delta), (unsigned long)ntohl(Stats->average_delta), (unsigned long)ntohl(Stats->low_delta), (unsigned long)ntohl(Stats->average_delta),
(unsigned long)ntohl(Stats->high_delta), (unsigned long)ntohl(Stats->last_remote_delta)); (unsigned long)ntohl(Stats->high_delta), (unsigned long)ntohl(Stats->last_remote_delta));
uint64 x=Stats->packets_recieved; uint64 x=Stats->packets_received;
Stats->packets_recieved=Stats->packets_sent; Stats->packets_received=Stats->packets_sent;
Stats->packets_sent=x; Stats->packets_sent=x;
NonSequencedPush(new EQProtocolPacket(OP_SessionStatResponse,p->pBuffer,p->size)); NonSequencedPush(new EQProtocolPacket(OP_SessionStatResponse,p->pBuffer,p->size));
AdjustRates(ntohl(Stats->average_delta)); AdjustRates(ntohl(Stats->average_delta));

2
common/EQStream.h
View File

@ -52,7 +52,7 @@ struct SessionStats {
/*014*/ uint32 high_delta; /*014*/ uint32 high_delta;
/*018*/ uint32 last_remote_delta; /*018*/ uint32 last_remote_delta;
/*022*/ uint64 packets_sent; /*022*/ uint64 packets_sent;
/*030*/ uint64 packets_recieved; /*030*/ uint64 packets_received;
/*038*/ /*038*/
}; };

20
loginserver/Client.cpp
View File

@ -41,7 +41,7 @@ bool Client::Process()
{ {
if(server.options.IsTraceOn()) if(server.options.IsTraceOn())
{ {
server_log->Log(log_network, "Application packet recieved from client (size %u)", app->Size()); server_log->Log(log_network, "Application packet received from client (size %u)", app->Size());
} }
if(server.options.IsDumpInPacketsOn()) if(server.options.IsDumpInPacketsOn())
@ -55,7 +55,7 @@ bool Client::Process()
{ {
if(server.options.IsTraceOn()) if(server.options.IsTraceOn())
{ {
server_log->Log(log_network, "Session ready recieved from client."); server_log->Log(log_network, "Session ready received from client.");
} }
Handle_SessionReady((const char*)app->pBuffer, app->Size()); Handle_SessionReady((const char*)app->pBuffer, app->Size());
break; break;
@ -64,13 +64,13 @@ bool Client::Process()
{ {
if(app->Size() < 20) if(app->Size() < 20)
{ {
server_log->Log(log_network_error, "Login recieved but it is too small, discarding."); server_log->Log(log_network_error, "Login received but it is too small, discarding.");
break; break;
} }
if(server.options.IsTraceOn()) if(server.options.IsTraceOn())
{ {
server_log->Log(log_network, "Login recieved from client."); server_log->Log(log_network, "Login received from client.");
} }
Handle_Login((const char*)app->pBuffer, app->Size()); Handle_Login((const char*)app->pBuffer, app->Size());
@ -80,7 +80,7 @@ bool Client::Process()
{ {
if(server.options.IsTraceOn()) if(server.options.IsTraceOn())
{ {
server_log->Log(log_network, "Server list request recieved from client."); server_log->Log(log_network, "Server list request received from client.");
} }
SendServerListPacket(); SendServerListPacket();
@ -90,7 +90,7 @@ bool Client::Process()
{ {
if(app->Size() < sizeof(PlayEverquestRequest_Struct)) if(app->Size() < sizeof(PlayEverquestRequest_Struct))
{ {
server_log->Log(log_network_error, "Play recieved but it is too small, discarding."); server_log->Log(log_network_error, "Play received but it is too small, discarding.");
break; break;
} }
@ -116,7 +116,7 @@ void Client::Handle_SessionReady(const char* data, unsigned int size)
{ {
if(status != cs_not_sent_session_ready) if(status != cs_not_sent_session_ready)
{ {
server_log->Log(log_network_error, "Session ready recieved again after already being recieved."); server_log->Log(log_network_error, "Session ready received again after already being received.");
return; return;
} }
@ -177,13 +177,13 @@ void Client::Handle_Login(const char* data, unsigned int size)
{ {
if(status != cs_waiting_for_login) if(status != cs_waiting_for_login)
{ {
server_log->Log(log_network_error, "Login recieved after already having logged in."); server_log->Log(log_network_error, "Login received after already having logged in.");
return; return;
} }
if((size - 12) % 8 != 0) if((size - 12) % 8 != 0)
{ {
server_log->Log(log_network_error, "Login recieved packet of size: %u, this would cause a block corruption, discarding.", size); server_log->Log(log_network_error, "Login received packet of size: %u, this would cause a block corruption, discarding.", size);
return; return;
} }
@ -341,7 +341,7 @@ void Client::Handle_Play(const char* data)
if(server.options.IsTraceOn()) if(server.options.IsTraceOn())
{ {
server_log->Log(log_network, "Play recieved from client, server number %u sequence %u.", server_id_in, sequence_in); server_log->Log(log_network, "Play received from client, server number %u sequence %u.", server_id_in, sequence_in);
} }
this->play_server_id = (unsigned int)play->ServerNumber; this->play_server_id = (unsigned int)play->ServerNumber;

8
loginserver/WorldServer.cpp
View File

@ -64,7 +64,7 @@ bool WorldServer::Process()
{ {
if(server.options.IsWorldTraceOn()) if(server.options.IsWorldTraceOn())
{ {
server_log->Log(log_network_trace, "Application packet recieved from server: 0x%.4X, (size %u)", app->opcode, app->size); server_log->Log(log_network_trace, "Application packet received from server: 0x%.4X, (size %u)", app->opcode, app->size);
} }
if(server.options.IsDumpInPacketsOn()) if(server.options.IsDumpInPacketsOn())
@ -78,7 +78,7 @@ bool WorldServer::Process()
{ {
if(app->size < sizeof(ServerNewLSInfo_Struct)) if(app->size < sizeof(ServerNewLSInfo_Struct))
{ {
server_log->Log(log_network_error, "Recieved application packet from server that had opcode ServerOP_NewLSInfo, " server_log->Log(log_network_error, "Received application packet from server that had opcode ServerOP_NewLSInfo, "
"but was too small. Discarded to avoid buffer overrun."); "but was too small. Discarded to avoid buffer overrun.");
break; break;
} }
@ -137,7 +137,7 @@ bool WorldServer::Process()
//While keeping world server spam with multiple servers connected almost impossible. //While keeping world server spam with multiple servers connected almost impossible.
if(server.options.IsTraceOn()) if(server.options.IsTraceOn())
{ {
server_log->Log(log_network_trace, "User-To-World Response recieved."); server_log->Log(log_network_trace, "User-To-World Response received.");
} }
UsertoWorldResponse_Struct *utwr = (UsertoWorldResponse_Struct*)app->pBuffer; UsertoWorldResponse_Struct *utwr = (UsertoWorldResponse_Struct*)app->pBuffer;
@ -201,7 +201,7 @@ bool WorldServer::Process()
} }
case ServerOP_LSAccountUpdate: case ServerOP_LSAccountUpdate:
{ {
server_log->Log(log_network_trace, "ServerOP_LSAccountUpdate packet recieved from: %s", short_name.c_str()); server_log->Log(log_network_trace, "ServerOP_LSAccountUpdate packet received from: %s", short_name.c_str());
ServerLSAccountUpdate_Struct *lsau = (ServerLSAccountUpdate_Struct*)app->pBuffer; ServerLSAccountUpdate_Struct *lsau = (ServerLSAccountUpdate_Struct*)app->pBuffer;
if(trusted) if(trusted)
{ {

4
loginserver/WorldServer.h
View File

@ -121,12 +121,12 @@ public:
unsigned int GetPlayersOnline() const { return players_online; } unsigned int GetPlayersOnline() const { return players_online; }
/** /**
* Takes the info struct we recieved from world and processes it. * Takes the info struct we received from world and processes it.
*/ */
void Handle_NewLSInfo(ServerNewLSInfo_Struct* i); void Handle_NewLSInfo(ServerNewLSInfo_Struct* i);
/** /**
* Takes the status struct we recieved from world and processes it. * Takes the status struct we received from world and processes it.
*/ */
void Handle_LSStatus(ServerLSStatus_Struct *s); void Handle_LSStatus(ServerLSStatus_Struct *s);