diff --git a/src/net/common/asioreceivebuffer.cpp b/src/net/common/asioreceivebuffer.cpp index c4f85beb..0343a3e7 100644 --- a/src/net/common/asioreceivebuffer.cpp +++ b/src/net/common/asioreceivebuffer.cpp @@ -105,7 +105,7 @@ AsioReceiveBuffer::ScanPackets(boost::shared_ptr session) size_t packetSize = ntohl(nativeVal); if (packetSize > MAX_PACKET_SIZE) { recvBufUsed = 0; - LOG_ERROR("Session " << session->GetId() << " - Invalid packet size: " << packetSize); + LOG_ERROR(session->GetClientAddr() << "Session " << session->GetId() << " - Invalid packet size: " << packetSize); } else if (recvBufUsed >= packetSize + NET_HEADER_SIZE) { try { tmpPacket = NetPacket::Create(&recvBuf[NET_HEADER_SIZE], packetSize); @@ -118,7 +118,7 @@ AsioReceiveBuffer::ScanPackets(boost::shared_ptr session) } catch (const exception &e) { // Reset buffer on error. recvBufUsed = 0; - LOG_ERROR("Session " << session->GetId() << " - " << e.what()); + LOG_ERROR(session->GetClientAddr() << "Session " << session->GetId() << " - " << e.what()); } } } @@ -126,7 +126,7 @@ AsioReceiveBuffer::ScanPackets(boost::shared_ptr session) if (validator.IsValidPacket(*tmpPacket)) { receivedPackets.push_back(tmpPacket); } else { - LOG_ERROR("Session " << session->GetId() << " - Invalid packet: " << tmpPacket->GetMsg()->messagetype()); + LOG_ERROR(session->GetClientAddr() << "Session " << session->GetId() << " - Invalid packet: " << tmpPacket->GetMsg()->messagetype()); } } else { dataAvailable = false; diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index d7d83814..95938d29 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -63,6 +63,7 @@ #include #include #include +#include #define SERVER_MAX_NUM_LOBBY_SESSIONS 512 // Maximum number of idle users in lobby. #define SERVER_MAX_NUM_TOTAL_SESSIONS 2000 // Total maximum of sessions, fitting a 2048 handle limit @@ -304,8 +305,8 @@ ServerLobbyThread::AddConnection(boost::shared_ptr sessionData) // Create a new session. m_sessionManager.AddSession(sessionData); - LOG_VERBOSE("Accepted connection - session #" << sessionData->GetId() << "."); - LOG_ERROR("Accepted connection - session #" << sessionData->GetId() << "."); + LOG_VERBOSE(sessionData->GetRemoteIPAddressFromSocket() << " Accepted connection - session #" << sessionData->GetId() << "."); + LOG_ERROR(sessionData->GetRemoteIPAddressFromSocket() << " Accepted connection - session #" << sessionData->GetId() << "."); sessionData->StartTimerInitTimeout(SERVER_INIT_SESSION_TIMEOUT_SEC); sessionData->StartTimerGlobalTimeout(SERVER_SESSION_FORCED_TIMEOUT_SEC); diff --git a/src/third_party/protobuf/pokerth.pb.cc b/src/third_party/protobuf/pokerth.pb.cc index d5063ed2..f941a218 100644 --- a/src/third_party/protobuf/pokerth.pb.cc +++ b/src/third_party/protobuf/pokerth.pb.cc @@ -23806,7 +23806,7 @@ bool ErrorMessage_ErrorReason_IsValid(int value) { } #ifndef _MSC_VER -const ErrorMessage_ErrorReason ErrorMessage::reserved; +const ErrorMessage_ErrorReason ErrorMessage::custReserved; const ErrorMessage_ErrorReason ErrorMessage::initVersionNotSupported; const ErrorMessage_ErrorReason ErrorMessage::initServerFull; const ErrorMessage_ErrorReason ErrorMessage::initAuthFailure; diff --git a/src/third_party/protobuf/pokerth.pb.h b/src/third_party/protobuf/pokerth.pb.h index d676bab7..a30b6c78 100644 --- a/src/third_party/protobuf/pokerth.pb.h +++ b/src/third_party/protobuf/pokerth.pb.h @@ -345,7 +345,7 @@ const ReportGameAckMessage_ReportGameResult ReportGameAckMessage_ReportGameResul const int ReportGameAckMessage_ReportGameResult_ReportGameResult_ARRAYSIZE = ReportGameAckMessage_ReportGameResult_ReportGameResult_MAX + 1; enum ErrorMessage_ErrorReason { - ErrorMessage_ErrorReason_reserved = 0, + ErrorMessage_ErrorReason_custReserved = 0, ErrorMessage_ErrorReason_initVersionNotSupported = 1, ErrorMessage_ErrorReason_initServerFull = 2, ErrorMessage_ErrorReason_initAuthFailure = 3, @@ -362,7 +362,7 @@ enum ErrorMessage_ErrorReason { ErrorMessage_ErrorReason_sessionTimeout = 14 }; bool ErrorMessage_ErrorReason_IsValid(int value); -const ErrorMessage_ErrorReason ErrorMessage_ErrorReason_ErrorReason_MIN = ErrorMessage_ErrorReason_reserved; +const ErrorMessage_ErrorReason ErrorMessage_ErrorReason_ErrorReason_MIN = ErrorMessage_ErrorReason_custReserved; const ErrorMessage_ErrorReason ErrorMessage_ErrorReason_ErrorReason_MAX = ErrorMessage_ErrorReason_sessionTimeout; const int ErrorMessage_ErrorReason_ErrorReason_ARRAYSIZE = ErrorMessage_ErrorReason_ErrorReason_MAX + 1; @@ -10416,7 +10416,7 @@ class ErrorMessage : public ::google::protobuf::MessageLite { // nested types ---------------------------------------------------- typedef ErrorMessage_ErrorReason ErrorReason; - static const ErrorReason reserved = ErrorMessage_ErrorReason_reserved; + static const ErrorReason custReserved = ErrorMessage_ErrorReason_custReserved; static const ErrorReason initVersionNotSupported = ErrorMessage_ErrorReason_initVersionNotSupported; static const ErrorReason initServerFull = ErrorMessage_ErrorReason_initServerFull; static const ErrorReason initAuthFailure = ErrorMessage_ErrorReason_initAuthFailure; diff --git a/tests/src/de/pokerth/protocol/ProtoBuf.java b/tests/src/de/pokerth/protocol/ProtoBuf.java index 91e40a82..63320e83 100644 --- a/tests/src/de/pokerth/protocol/ProtoBuf.java +++ b/tests/src/de/pokerth/protocol/ProtoBuf.java @@ -48996,9 +48996,9 @@ public final class ProtoBuf { public enum ErrorReason implements com.google.protobuf.Internal.EnumLite { /** - * reserved = 0; + * custReserved = 0; */ - reserved(0, 0), + custReserved(0, 0), /** * initVersionNotSupported = 1; */ @@ -49058,9 +49058,9 @@ public final class ProtoBuf { ; /** - * reserved = 0; + * custReserved = 0; */ - public static final int reserved_VALUE = 0; + public static final int custReserved_VALUE = 0; /** * initVersionNotSupported = 1; */ @@ -49123,7 +49123,7 @@ public final class ProtoBuf { public static ErrorReason valueOf(int value) { switch (value) { - case 0: return reserved; + case 0: return custReserved; case 1: return initVersionNotSupported; case 2: return initServerFull; case 3: return initAuthFailure; @@ -49180,7 +49180,7 @@ public final class ProtoBuf { } private void initFields() { - errorReason_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason.reserved; + errorReason_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason.custReserved; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -49309,7 +49309,7 @@ public final class ProtoBuf { public Builder clear() { super.clear(); - errorReason_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason.reserved; + errorReason_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason.custReserved; bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -49379,7 +49379,7 @@ public final class ProtoBuf { } private int bitField0_; - private de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason errorReason_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason.reserved; + private de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason errorReason_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason.custReserved; /** * required .ErrorMessage.ErrorReason errorReason = 1; */ @@ -49409,7 +49409,7 @@ public final class ProtoBuf { */ public Builder clearErrorReason() { bitField0_ = (bitField0_ & ~0x00000001); - errorReason_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason.reserved; + errorReason_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.ErrorReason.custReserved; return this; }