Merge branch 'stable' of https://github.com/pokerth/pokerth into stable

fix gitignore: don't ignore certain patterns of subdirectories

.gitignore

@@ -8,14 +8,15 @@ Makefile.pokerth_protocol
 Makefile.pokerth_server
 Makefile.pokerth_dbofficial
 bin/
-chatcleaner
+/chatcleaner
 lib/
 mocs/
 obj/
-pokerth
+/pokerth
 qrc_pokerth.cpp
 uics/
 make.sh
 gitpush_serverstuff_stable
-pokerth_server
 .vscode/
+.project
+.classpath

src/net/common/asioreceivebuffer.cpp

@@ -105,7 +105,7 @@ AsioReceiveBuffer::ScanPackets(boost::shared_ptr<SessionData> 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<SessionData> 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<SessionData> 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;

src/net/common/serverlobbythread.cpp

@@ -63,8 +63,9 @@
 #include <boost/algorithm/string.hpp>
 #include <gsasl.h>
 #include <ctime>
+#include <string>  
 
-#define SERVER_MAX_NUM_LOBBY_SESSIONS				512		// Maximum number of idle users in lobby.
+#define SERVER_MAX_NUM_LOBBY_SESSIONS				1536		// Maximum number of idle users in lobby.
 #define SERVER_MAX_NUM_TOTAL_SESSIONS				2000	// Total maximum of sessions, fitting a 2048 handle limit
 
 #define SERVER_SAVE_STATISTICS_INTERVAL_SEC			60
@@ -304,8 +305,8 @@ ServerLobbyThread::AddConnection(boost::shared_ptr<SessionData> 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);

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;

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;

tests/src/de/pokerth/protocol/ProtoBuf.java

@@ -48996,9 +48996,9 @@ public final class ProtoBuf {
     public enum ErrorReason
         implements com.google.protobuf.Internal.EnumLite {
       /**
-       * <code>reserved = 0;</code>
+       * <code>custReserved = 0;</code>
        */
-      reserved(0, 0),
+      custReserved(0, 0),
       /**
        * <code>initVersionNotSupported = 1;</code>
        */
@@ -49058,9 +49058,9 @@ public final class ProtoBuf {
       ;
 
       /**
-       * <code>reserved = 0;</code>
+       * <code>custReserved = 0;</code>
        */
-      public static final int reserved_VALUE = 0;
+      public static final int custReserved_VALUE = 0;
       /**
        * <code>initVersionNotSupported = 1;</code>
        */
@@ -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;
       /**
        * <code>required .ErrorMessage.ErrorReason errorReason = 1;</code>
        */
@@ -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;
       }