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

IP address output in server_messages.log in order to handle Server Attack
Merge pull request #403 from zormit/gitignore-fixes
2020-07-21 16:05:56 +02:00 · 2020-07-21 16:05:20 +02:00 · 2020-07-06 17:04:56 +02:00 · 2020-07-04 23:11:18 +02:00 · 2020-03-22 09:59:45 +01:00 · 2020-01-15 00:55:04 +01:00
136 changed files with 73656 additions and 86570 deletions
@@ -8,18 +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
-.qmake.stash
-pokerth.ap*
-*.DS_STORE
-.gitignore.save
+.vscode/
+.project
+.classpath
@@ -1 +1,36 @@
-see https://github.com/pokerth/pokerth/wiki/Building-PokerTH
+Requirements
+============
+
+To compile PokerTH you need following libs: 
+
+Linux:
+- Qt version >= 4.4.3, 4.8.x recommended  --> http://qtsoftware.com/
+- zlib version >= 1.2.3  --> http://www.zlib.net/
+- libcurl version >= 7.16  --> http://curl.haxx.se/
+- libgcrypt (e.g. version 1.4.6)  --> http://www.gnu.org/software/libgcrypt/
+- libgsasl version >= 1.4 --> http://www.gnu.org/software/gsasl/
+- libboost_thread, libboost_filesystem, libboost_datetime, libboost_program_options,
+  libboost_iostreams, libboost_asio, libboost_regex, libboost_random, libboost_uuid
+  (version >= 1.49, latest always recommended)  --> http://www.boost.org/
+- libSDL_mixer, libSDL  --> http://www.libsdl.org/
+- libSQLite3 --> http://sqlite.org/
+- libtinyxml > 2.0 --> http://www.sourceforge.net/projects/tinyxml
+- protoc >= 2.3.0 (during build), libprotobuf >= 2.3.0 -> https://github.com/google/protobuf
+- For the server: libircclient 1.3 --> http://www.sourceforge.net/projects/libircclient/
+
+Windows:
+see docs/build_mingw_windows.txt
+
+
+Basic Installation
+==================
+
+Linux:
+
+  1. Type "cd path/to/the/sources". Then do for example "/usr/qt/4/bin/qmake pokerth.pro" to configure the makefile for your system.
+     Pay attention that the QTDIR environment variable points to Qt4 not Qt3. For example QTDIR=/usr/qt/4.
+     You can set this variable typing: "export QTDIR=/usr/qt/4"
+
+  2. Type "make" to compile the package.
+
+  3. Become root (typing "su") and type "make install" to install the program binary.
@@ -9,13 +9,12 @@
 # of binary-size if you leave Qt out.
 # (see http://trolltech.com/developer/downloads/qt/mac)

-QT_FW_PATH="/usr/local/Cellar/qt/5.13.0/lib"
-QT_PLUGIN_PATH="/usr/local/Cellar/qt/5.13.0/plugins"
+QT_FW_PATH="/Users/$USER/Qt/5.9/clang_64/lib"
+QT_PLUGIN_PATH="/Users/$USER/Qt/5.9/clang_64/plugins"
 SDL_FW_PATH="/Library/Frameworks"
 APPLICATION="./pokerth.app"
 BINARY="$APPLICATION/Contents/MacOs/pokerth"
 RESOURCES="$APPLICATION/Contents/Resources"
-DYLIB_PATH="$APPLICATION/Contents/MacOs/dylibs"

 # strip binary
 strip $BINARY
@@ -24,56 +23,18 @@ cp -R ./data $RESOURCES/
 find $RESOURCES/data -name ".svn" | xargs rm -Rf
 # create framework-path
 BINARY_FW_PATH="$APPLICATION/Contents/Frameworks"
-BINARY_PLUGIN_PATH="$APPLICATION/Contents/plugins"
-
-rm -rf $BINARY_FW_PATH
-rm -rf $BINARY_PLUGIN_PATH
-rm -rf $DYLIB_PATH
-
 mkdir $BINARY_FW_PATH
+BINARY_PLUGIN_PATH="$APPLICATION/Contents/plugins"
 mkdir -p $BINARY_PLUGIN_PATH/imageformats
 mkdir -p $BINARY_PLUGIN_PATH/sqldrivers
 mkdir -p $BINARY_PLUGIN_PATH/platforms
-mkdir -p $DYLIB_PATH

 # integrate SDL-frameworks into binary
 cp -R $SDL_FW_PATH/SDL.framework $BINARY_FW_PATH
 cp -R $SDL_FW_PATH/SDL_mixer.framework $BINARY_FW_PATH

-# integrate dylibs
-cp /usr/lib/libcurl.4.dylib $DYLIB_PATH/.
-cp /usr/local/Cellar/openssl/1.0.2s/lib/libcrypto.1.0.0.dylib $DYLIB_PATH/.
-cp /usr/local/opt/openssl/lib/libssl.1.0.0.dylib $DYLIB_PATH/.
-cp /usr/lib/libsqlite3.dylib $DYLIB_PATH/.
-cp /usr/local/opt/tinyxml/lib/libtinyxml.dylib $DYLIB_PATH/.
-cp /usr/local/opt/protobuf/lib/libprotobuf.18.dylib $DYLIB_PATH/.
-cp /usr/lib/libz.1.dylib $DYLIB_PATH/.
-
-chmod -R +w $DYLIB_PATH;
-
-LIBCURL_LINK=$(otool -L $BINARY | grep libcurl | cut -d"(" -f1 | cut -f2)
-LIBCRYPTO_LINK=$(otool -L $BINARY | grep libcrypto | cut -d"(" -f1 | cut -f2)
-LIBSSL_LINK=$(otool -L $BINARY | grep libssl | cut -d"(" -f1 | cut -f2)
-LIBTINYXML_LINK=$(otool -L $BINARY | grep libtinyxml | cut -d"(" -f1 | cut -f2)
-LIBSQLITE_LINK=$(otool -L $BINARY | grep libsqlite | cut -d"(" -f1 | cut -f2)
-LIBPROTOBUF_LINK=$(otool -L $BINARY | grep libprotobuf | cut -d"(" -f1 | cut -f2)
-LIBZ_LINK=$(otool -L $BINARY | grep libz | cut -d"(" -f1 | cut -f2)
-
-install_name_tool -change $LIBCURL_LINK @loader_path/dylibs/libcurl.4.dylib $BINARY
-install_name_tool -change $LIBCRYPTO_LINK @loader_path/dylibs/libcrypto.1.0.0.dylib  $BINARY
-install_name_tool -change $LIBSSL_LINK @loader_path/dylibs/libssl.1.0.0.dylib $BINARY
-install_name_tool -change $LIBTINYXML_LINK @loader_path/dylibs/libtinyxml.dylib $BINARY
-install_name_tool -change $LIBSQLITE_LINK @loader_path/dylibs/libsqlite3.dylib $BINARY
-install_name_tool -change $LIBPROTOBUF_LINK @loader_path/dylibs/libprotobuf.18.dylib $BINARY
-install_name_tool -change $LIBSQLITE_LINK @loader_path/dylibs/libsqlite3.dylib $BINARY
-install_name_tool -change $LIBZ_LINK @loader_path/dylibs/libz.1.dylib $BINARY
-
-LIBCRYPTO_LINK=$(otool -L $DYLIB_PATH/libssl.1.0.0.dylib | grep libcrypto | cut -d"(" -f1 | cut -f2)
-LIBSSL_LINK=$(otool -L $DYLIB_PATH/libssl.1.0.0.dylib | grep libssl | cut -d"(" -f1 | cut -f2)
-install_name_tool -change $LIBCRYPTO_LINK @executable_path/dylibs/libcrypto.1.0.0.dylib $DYLIB_PATH/libssl.1.0.0.dylib
-install_name_tool -change /usr/local/opt/openssl/lib/libssl.1.0.0.dylib @executable_path/dylibs/libssl.1.0.0.dylib $DYLIB_PATH/libssl.1.0.0.dylib
-
 # integrate Qt-frameworks into binary
+
 if [ "$1" != "--without-qt" ] ; then
        cp $QT_PLUGIN_PATH/imageformats/libqgif.dylib $BINARY_PLUGIN_PATH/imageformats
        cp $QT_PLUGIN_PATH/imageformats/libqjpeg.dylib $BINARY_PLUGIN_PATH/imageformats
@@ -85,8 +46,6 @@ if [ "$1" != "--without-qt" ] ; then
        cp -R $QT_FW_PATH/QtSql.framework $BINARY_FW_PATH
        cp -R $QT_FW_PATH/QtNetwork.framework $BINARY_FW_PATH
        cp -R $QT_FW_PATH/QtPrintSupport.framework $BINARY_FW_PATH
-        cp -R /usr/local/Cellar/qt/5.13.0/lib/QtDBus.framework $BINARY_FW_PATH
-        chmod -R 775 $BINARY_FW_PATH
        # remove debug versions
        rm -f $APPLICATION/Contents/Frameworks/QtCore.framework/QtCore_debug
        rm -f $APPLICATION/Contents/Frameworks/QtCore.framework/QtCore_debug.prl
@@ -106,9 +65,6 @@ if [ "$1" != "--without-qt" ] ; then
        rm -f $APPLICATION/Contents/Frameworks/QtPrintSupport.framework/QtPrintSupport_debug
        rm -f $APPLICATION/Contents/Frameworks/QtPrintSupport.framework/QtPrintSupport_debug.prl
        rm -f $APPLICATION/Contents/Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport_debug
-        rm -f $APPLICATION/Contents/Frameworks/QtDBus.framework/QtDBus_debug
-        rm -f $APPLICATION/Contents/Frameworks/QtDBus.framework/QtDBus_debug.prl
-        rm -f $APPLICATION/Contents/Frameworks/QtDBus.framework/Versions/5/QtDBus_debug

        # redirect binary to use integrated frameworks
        QTCORE="QtCore.framework/Versions/5/QtCore"
@@ -117,20 +73,18 @@ if [ "$1" != "--without-qt" ] ; then
        QTSQL="QtSql.framework/Versions/5/QtSql"
        QTNETWORK="QtNetwork.framework/Versions/5/QtNetwork"
        QTPRINT="QtPrintSupport.framework/Versions/5/QtPrintSupport"
-        QTDBUS="QtDBus.framework/Versions/5/QtDBus"
        install_name_tool -id @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTCORE
        install_name_tool -id @executable_path/../Frameworks/$QTGUI $BINARY_FW_PATH/$QTGUI
        install_name_tool -id @executable_path/../Frameworks/$QTWIDGETS $BINARY_FW_PATH/$QTWIDGETS
        install_name_tool -id @executable_path/../Frameworks/$QTSQL $BINARY_FW_PATH/$QTSQL
        install_name_tool -id @executable_path/../Frameworks/$QTNETWORK $BINARY_FW_PATH/$QTNETWORK
        install_name_tool -id @executable_path/../Frameworks/$QTPRINT $BINARY_FW_PATH/$QTPRINT
-        install_name_tool -id @executable_path/../Frameworks/$QDBUS $BINARY_FW_PATH/$QTDBUS
        QTCORE_LINK=$(otool -L $BINARY | grep QtCore | cut -d"(" -f1 | cut -f2)
        QTGUI_LINK=$(otool -L $BINARY | grep QtGui | cut -d"(" -f1 | cut -f2)
        QTWIDGETS_LINK=$(otool -L $BINARY | grep QtWidgets | cut -d"(" -f1 | cut -f2)
        QTSQL_LINK=$(otool -L $BINARY | grep QtSql | cut -d"(" -f1 | cut -f2)
        QTNETWORK_LINK=$(otool -L $BINARY | grep QtNetwork | cut -d"(" -f1 | cut -f2)
-
+        QTPRINT_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtPrintSupport | cut -d"(" -f1 | cut -f2)
        install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY
        install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY
        install_name_tool -change $QTWIDGETS_LINK @executable_path/../Frameworks/$QTWIDGETS $BINARY
@@ -144,22 +98,10 @@ if [ "$1" != "--without-qt" ] ; then
        install_name_tool -change $QTWIDGETS_LINK @executable_path/../Frameworks/$QTWIDGETS $BINARY_PLUGIN_PATH/imageformats/libqjpeg.dylib
        install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_PLUGIN_PATH/sqldrivers/libqsqlite.dylib
        install_name_tool -change $QTSQL_LINK @executable_path/../Frameworks/$QTSQL $BINARY_PLUGIN_PATH/sqldrivers/libqsqlite.dylib
-
-        QTDBUS_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtDBus | cut -d"(" -f1 | cut -f2)
-        QTPRINT_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtPrintSupport | cut -d"(" -f1 | cut -f2)
-        QTZ_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep libz | cut -d"(" -f1 | cut -f2)
-        QTCORE_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtCore | cut -d"(" -f1 | cut -f2)
-        QTGUI_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtGui | cut -d"(" -f1 | cut -f2)
-        QTWIDGETS_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtWidgets | cut -d"(" -f1 | cut -f2)
        install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
        install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
        install_name_tool -change $QTWIDGETS_LINK @executable_path/../Frameworks/$QTWIDGETS $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
        install_name_tool -change $QTPRINT_LINK @executable_path/../Frameworks/$QTPRINT $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
-        install_name_tool -change $QTDBUS_LINK @executable_path/../Frameworks/$QTDBUS $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
-        install_name_tool -change $QTZ_LINK @loader_path/dylibs/libz.1.dylib $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib
-
-        QTCORE_LINK=$(otool -L $BINARY_FW_PATH/$QTDBUS | grep QtCore | head -1 | cut -d"(" -f1 | cut -f2)
-        install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTDBUS

        QTCORE_LINK=$(otool -L $BINARY_FW_PATH/$QTGUI | grep QtCore | head -1 | cut -d"(" -f1 | cut -f2)
        install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTGUI
@@ -60,7 +60,7 @@ mac{
        CONFIG += x86_64
        CONFIG -= x86
        CONFIG -= ppc
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
        QMAKE_CXXFLAGS -= -std=gnu++0x

 	# for universal-compilation on PPC-Mac uncomment the following line
@@ -42,6 +42,7 @@ HEADERS += src/dbofficial/asyncdbauth.h \
 	src/dbofficial/asyncdbavatarblacklist.h \
 	src/dbofficial/asyncdbadminplayers.h \
 	src/dbofficial/asyncdbblockplayer.h \
+	src/dbofficial/asyncdbplayerlastgames.h \
 	src/dbofficial/dbidmanager.h
 SOURCES += src/dbofficial/asyncdbauth.cpp \
 	src/dbofficial/asyncdbcreategame.cpp \
@@ -60,6 +61,7 @@ SOURCES += src/dbofficial/asyncdbauth.cpp \
 	src/dbofficial/asyncdbavatarblacklist.cpp \
 	src/dbofficial/asyncdbadminplayers.cpp \
 	src/dbofficial/asyncdbblockplayer.cpp \
+	src/dbofficial/asyncdbplayerlastgames.cpp \
 	src/dbofficial/dbidmanager.cpp
 win32 { 
    DEFINES += _WIN32_WINNT=0x0501
@@ -576,7 +576,7 @@ mac {
 	CONFIG += x86_64
 	CONFIG -= x86
 	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
 	QMAKE_CXXFLAGS -= -std=gnu++0x

 	# workaround for problems with boost_filesystem exceptions
@@ -587,14 +587,13 @@ mac {
 	# QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
 	LIBPATH += lib

-
 	# QT dynamic linked framework (see also mac_post_make.sh)
-	LIBS += -F /Library/Frameworks
-#	LIBS += -framework \
-#		QtCore
-#	LIBS += -framework \
-#		QtGui
-   LIBS += -framework \
+    LIBS += -F /Library/Frameworks
+	LIBS += -framework \
+		QtCore
+	LIBS += -framework \
+		QtGui
+    LIBS += -framework \
        SDL
    LIBS += -framework \
        SDL_mixer
@@ -616,7 +615,7 @@ mac {
 		-lprotobuf \
 		-lz \
 		-framework \
-          Cocoa
+            Cocoa

 	# set the application icon
 	RC_FILE = pokerth.icns
@@ -294,7 +294,7 @@ mac{
 	CONFIG += x86_64
 	CONFIG -= x86
 	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
 	QMAKE_CXXFLAGS -= -std=gnu++0x

 	# for universal-compilation on PPC-Mac uncomment the following line
@@ -40,7 +40,7 @@ win32 {
 	system(protoc pokerth.proto --java_out=tests/src)
 }
 unix : !mac {
-    INCLUDEPATH += $${PREFIX}/include
+        INCLUDEPATH += $${PREFIX}/include
 	system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
 	system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf)
 	system(protoc pokerth.proto --java_out=tests/src)
@@ -52,14 +52,11 @@ unix : !mac {
 	}
 }
 mac { 
-	# make it x86_64 only
-	CONFIG += x86_64
-	CONFIG -= x86
-	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
-	system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
-	system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf)
-	system(protoc pokerth.proto --java_out=tests/src)	
+        # make it x86_64 only
+        CONFIG += x86_64
+        CONFIG -= x86
+        CONFIG -= ppc
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12

 	# for universal-compilation on PPC-Mac uncomment the following line
 	# on Intel-Mac you have to comment this line out or build will fail.
@@ -310,7 +310,7 @@ mac {
 	CONFIG += x86_64
 	CONFIG -= x86
 	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
 	QMAKE_CXXFLAGS -= -std=gnu++0x

 	# workaround for problems with boost_filesystem exceptions
@@ -312,6 +312,8 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	configList.push_back(ConfigInfo("DBServerEncryptionKey", CONFIG_TYPE_STRING, ""));
 	configList.push_back(ConfigInfo("GameNameBadWordList", CONFIG_TYPE_STRING_LIST, "Regex"));
 	configList.push_back(ConfigInfo("ServerRestrictGuestLogin", CONFIG_TYPE_INT, "0"));
+	configList.push_back(ConfigInfo("ServerLimitRankNum", CONFIG_TYPE_INT, "4"));
+	configList.push_back(ConfigInfo("ServerLimitRankPeriod", CONFIG_TYPE_INT, "60"));

 	//fill tempList firstTime
 	configBufferList = configList;
@@ -93,6 +93,11 @@ ServerDBGeneric::SetGamePlayerPlace(unsigned /*requestId*/, DB_id /*playerId*/,
 {
 }

+void
+ServerDBGeneric::SetPlayerLastGames(unsigned /*requestId*/, DB_id /*playerId*/, std::vector<long> /*last_games*/, std::string /*playerIp*/)
+{
+}
+
 void
 ServerDBGeneric::EndGame(unsigned /*requestId*/)
 {
@@ -35,6 +35,7 @@

 #include <string>
 #include <ctime>
+#include <vector>

 typedef unsigned DB_id;
 #define DB_ID_INVALID 0
@@ -45,6 +46,8 @@ struct DBPlayerData {
 	std::string secret;
 	std::string country;
 	std::string last_login;
+	std::string last_games;
+	std::string last_ip;
 };

 #endif
@@ -57,6 +57,7 @@ public:

 	virtual void AsyncCreateGame(unsigned requestId, const std::string &gameName);
 	virtual void SetGamePlayerPlace(unsigned requestId, DB_id playerId, unsigned place);
+	virtual void SetPlayerLastGames(unsigned requestId, DB_id playerId, std::vector<long> last_games, std::string playerIp);
 	virtual void EndGame(unsigned requestId);

 	virtual void AsyncReportAvatar(unsigned requestId, unsigned replyId, DB_id reportedPlayerId, const std::string &avatarHash, const std::string &avatarType, DB_id *byPlayerId);
@@ -36,6 +36,7 @@
 #include <db/serverdbcallback.h>
 #include <string>
 #include <list>
+#include <vector>

 typedef std::list<DB_id> db_list;

@@ -57,6 +58,7 @@ public:

 	virtual void AsyncCreateGame(unsigned requestId, const std::string &gameName) = 0;
 	virtual void SetGamePlayerPlace(unsigned requestId, DB_id playerId, unsigned place) = 0;
+	virtual void SetPlayerLastGames(unsigned requestId, DB_id playerId, std::vector<long> last_games, std::string playerIp) = 0;
 	virtual void EndGame(unsigned requestId) = 0;

 	virtual void AsyncReportAvatar(unsigned requestId, unsigned replyId, DB_id reportedPlayerId, const std::string &avatarHash, const std::string &avatarType, DB_id *byPlayerId) = 0;
@@ -55,6 +55,7 @@ public:

 	virtual void AsyncCreateGame(unsigned /*requestId*/, const std::string &/*gameName*/) {}
 	virtual void SetGamePlayerPlace(unsigned /*requestId*/, DB_id /*playerId*/, unsigned /*place*/) {}
+	virtual void SetPlayerLastGames(unsigned /*requestId*/, DB_id /*playerId*/, std::vector<long> /*last_games*/, std::string /*playerIp*/) {}
 	virtual void EndGame(unsigned /*requestId*/) {}

 	virtual void AsyncReportAvatar(unsigned /*requestId*/, unsigned /*replyId*/, DB_id /*reportedPlayerId*/, const std::string &/*avatarHash*/, const std::string &/*avatarType*/, DB_id * /*byPlayerId*/) {}
@@ -52,19 +52,25 @@ AsyncDBAuth::HandleResult(mysqlpp::Query &/*query*/, DBIdManager& /*idManager*/,
 		service.post(boost::bind(&ServerDBCallback::PlayerLoginFailed, &cb, GetId()));
 	} else {
 		int blocked = result[0][2];
-		int active = result[0][5];
+		int active = result[0][7];
 		if ((active != 1) || (blocked != 0)) {
 			service.post(boost::bind(&ServerDBCallback::PlayerLoginBlocked, &cb, GetId()));
 		} else {
 			mysqlpp::String secret(result[0][1]);
 			mysqlpp::String country(result[0][3]);
 			mysqlpp::String last_login(result[0][4]);
+			mysqlpp::String last_games(result[0][5]);
+			mysqlpp::String last_ip(result[0][6]);
 			boost::shared_ptr<DBPlayerData> tmpData(new DBPlayerData);
 			tmpData->id = result[0][0];
 			secret.to_string(tmpData->secret);
 			if (!country.is_null())
 				country.to_string(tmpData->country);
 			last_login.to_string(tmpData->last_login);
+			if (!last_games.is_null())
+				last_games.to_string(tmpData->last_games);
+			if (!last_ip.is_null())
+				last_ip.to_string(tmpData->last_ip);

 			service.post(boost::bind(&ServerDBCallback::PlayerLoginSuccess, &cb, GetId(), tmpData));
 		}
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2016 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+
+#include <dbofficial/asyncdbplayerlastgames.h>
+
+
+using namespace std;
+
+
+AsyncDBPlayerLastGames::AsyncDBPlayerLastGames(unsigned queryId, const string &preparedName, const list<string> &params)
+	: SingleAsyncDBQuery(queryId, preparedName, params)
+{
+}
+
+AsyncDBPlayerLastGames::~AsyncDBPlayerLastGames()
+{
+}
+
+void
+AsyncDBPlayerLastGames::HandleResult(mysqlpp::Query &/*query*/, DBIdManager &/*idManager*/, mysqlpp::StoreQueryResult &/*result*/, boost::asio::io_service &service, ServerDBCallback &cb)
+{
+	// This query does not produce a result.
+	HandleError(service, cb);
+}
+
+void
+AsyncDBPlayerLastGames::HandleNoResult(mysqlpp::Query &/*query*/, DBIdManager& /*idManager*/, boost::asio::io_service &/*service*/, ServerDBCallback &/*cb*/)
+{
+}
+
+void
+AsyncDBPlayerLastGames::HandleError(boost::asio::io_service &service, ServerDBCallback &cb)
+{
+}
@@ -0,0 +1,57 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2016 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+/* Async database update to block a player. */
+
+#ifndef _ASYNCDBPLAYERLASTGAMES_H_
+#define _ASYNCDBPLAYERLASTGAMES_H_
+
+#include <dbofficial/singleasyncdbquery.h>
+
+
+class AsyncDBPlayerLastGames : public SingleAsyncDBQuery
+{
+public:
+	AsyncDBPlayerLastGames(unsigned queryId, const std::string &preparedName, const std::list<std::string> &params);
+	virtual ~AsyncDBPlayerLastGames();
+
+	virtual void Init(DBIdManager& /*idManager*/) {}
+
+	virtual void HandleResult(mysqlpp::Query &query, DBIdManager& idManager, mysqlpp::StoreQueryResult& result, boost::asio::io_service &service, ServerDBCallback &cb);
+	virtual void HandleNoResult(mysqlpp::Query &query, DBIdManager& idManager, boost::asio::io_service &service, ServerDBCallback &cb);
+	virtual void HandleError(boost::asio::io_service &service, ServerDBCallback &cb);
+
+	virtual bool RequiresResultSet() const
+	{
+		return false;
+	}
+};
+
+#endif
@@ -42,6 +42,8 @@
 #define DB_TABLE_PLAYER_COL_ACTIVE					"active"
 #define DB_TABLE_PLAYER_COL_AVATARHASH				"avatar_hash"
 #define DB_TABLE_PLAYER_COL_AVATARTYPE				"avatar_mime"
+#define DB_TABLE_PLAYER_COL_LASTGAMES				"last_games"
+#define DB_TABLE_PLAYER_COL_LASTIP				    "last_ip"

 #define DB_TABLE_GAME								"game"
 #define DB_TABLE_GAME_COL_ID						"idgame"
@@ -41,12 +41,15 @@
 #include <dbofficial/asyncdbreportgame.h>
 #include <dbofficial/asyncdbadminplayers.h>
 #include <dbofficial/asyncdbblockplayer.h>
+#include <dbofficial/asyncdbplayerlastgames.h>
 #include <dbofficial/compositeasyncdbquery.h>
 #include <dbofficial/db_table_defs.h>
 #include <ctime>
 #include <sstream>
 #include <mysql++.h>

+#include <core/loghelper.h> // @TODO: remove in productive
+
 #define QUERY_NICK_PREPARE				"nick_template"
 #define QUERY_LOGIN_PREPARE				"login_template"
 #define QUERY_AVATAR_BLACKLIST_PREPARE	"avatar_blacklist_template"
@@ -58,6 +61,7 @@
 #define QUERY_REPORT_GAME_PREPARE		"report_game_template"
 #define QUERY_ADMIN_PLAYER_PREPARE		"admin_player_template"
 #define QUERY_BLOCK_PLAYER_PREPARE		"block_player_template"
+#define QUERY_PLAYER_LASTGAMES_PREPARE	"player_lastgames_template"

 using namespace std;

@@ -230,6 +234,33 @@ ServerDBThread::SetGamePlayerPlace(unsigned requestId, DB_id playerId, unsigned
 	m_semaphore.post();
 }

+void
+ServerDBThread::SetPlayerLastGames(unsigned requestId, DB_id playerId, std::vector<long> last_games, std::string playerIp)
+{
+	LOG_ERROR("ServerDBThread::SetPlayerLastGames() entered.");
+
+	std::ostringstream oss;
+    std::copy(last_games.begin(), last_games.end(), std::ostream_iterator<int>(oss, ","));
+    std::string last_gamesFieldValue( oss.str() );
+	list<string> params;
+	ostringstream paramStream;
+	params.push_back(last_gamesFieldValue);
+	params.push_back(playerIp);
+	paramStream << playerId;
+	params.push_back(paramStream.str());
+	boost::shared_ptr<AsyncDBQuery> asyncQuery(
+		new AsyncDBPlayerLastGames(
+			requestId,
+			QUERY_PLAYER_LASTGAMES_PREPARE,
+			params));
+	{
+		boost::mutex::scoped_lock lock(m_asyncQueueMutex);
+		m_asyncQueue.push(asyncQuery);
+	}
+	LOG_ERROR("Query posted.");
+	m_semaphore.post();
+}
+
 void
 ServerDBThread::EndGame(unsigned requestId)
 {
@@ -432,7 +463,7 @@ ServerDBThread::EstablishDBConnection()
 		*/
 		prepareNick
 				<< "PREPARE " QUERY_NICK_PREPARE " FROM " << mysqlpp::quote
-				<< "SELECT " DB_TABLE_PLAYER_COL_ID ", AES_DECRYPT(" DB_TABLE_PLAYER_COL_PASSWORD ", ?), " DB_TABLE_PLAYER_COL_VALID ", TRIM(" DB_TABLE_PLAYER_COL_COUNTRY "), " DB_TABLE_PLAYER_COL_LASTLOGIN ", " DB_TABLE_PLAYER_COL_ACTIVE " FROM " DB_TABLE_PLAYER " WHERE " DB_TABLE_PLAYER_COL_USERNAME " = ?";
+				<< "SELECT " DB_TABLE_PLAYER_COL_ID ", AES_DECRYPT(" DB_TABLE_PLAYER_COL_PASSWORD ", ?), " DB_TABLE_PLAYER_COL_VALID ", TRIM(" DB_TABLE_PLAYER_COL_COUNTRY "), " DB_TABLE_PLAYER_COL_LASTLOGIN ", " DB_TABLE_PLAYER_COL_LASTGAMES ", " DB_TABLE_PLAYER_COL_LASTIP ", " DB_TABLE_PLAYER_COL_ACTIVE " FROM " DB_TABLE_PLAYER " WHERE " DB_TABLE_PLAYER_COL_USERNAME " = ?";

 		mysqlpp::Query prepareAvatarBlacklist = m_connData->conn.query();
 		prepareAvatarBlacklist
@@ -479,12 +510,16 @@ ServerDBThread::EstablishDBConnection()
 		prepareBlockPlayer
 				<< "PREPARE " QUERY_BLOCK_PLAYER_PREPARE " FROM " << mysqlpp::quote
 				<< "UPDATE " DB_TABLE_PLAYER " SET " DB_TABLE_PLAYER_COL_VALID " = ?, " DB_TABLE_PLAYER_COL_ACTIVE " = ? WHERE " DB_TABLE_PLAYER_COL_ID " = ?";
+		mysqlpp::Query preparePlayerLastGames = m_connData->conn.query();
+		preparePlayerLastGames
+				<< "PREPARE " QUERY_PLAYER_LASTGAMES_PREPARE " FROM " << mysqlpp::quote
+				<< "UPDATE " DB_TABLE_PLAYER " SET " DB_TABLE_PLAYER_COL_LASTGAMES " = ?, " DB_TABLE_PLAYER_COL_LASTIP " = ? WHERE " DB_TABLE_PLAYER_COL_ID " = ?";
 		if (!prepareNick.exec() || !prepareAvatarBlacklist.exec() || !prepareLogin.exec() || !prepareCreateGame.exec()
 				|| !prepareEndGame.exec() || !prepareRelation.exec() || !prepareScore.exec() || !prepareReportAvatar.exec()
-				|| !prepareReportGame.exec() || !prepareAdminPlayer.exec() || !prepareBlockPlayer.exec()) {
+				|| !prepareReportGame.exec() || !prepareAdminPlayer.exec() || !prepareBlockPlayer.exec() || !preparePlayerLastGames.exec()) {
 			string tmpError = string(prepareNick.error()) + prepareAvatarBlacklist.error() + prepareLogin.error() + prepareCreateGame.error() +
 							  prepareEndGame.error() + prepareRelation.error() + prepareScore.error() + prepareReportAvatar.error() +
-							  prepareReportGame.error() + prepareAdminPlayer.error() + prepareBlockPlayer.error();
+							  prepareReportGame.error() + prepareAdminPlayer.error() + prepareBlockPlayer.error() + preparePlayerLastGames.error();
 			m_connData->conn.disconnect();
 			m_ioService->post(boost::bind(&ServerDBCallback::ConnectFailed, &m_callback, tmpError));
 			m_permanentError = true;
@@ -42,6 +42,7 @@
 #include <dbofficial/dbidmanager.h>
 #include <core/thread.h>

+
 struct DBConnectionData;
 class AsyncDBQuery;

@@ -66,6 +67,7 @@ public:

 	virtual void AsyncCreateGame(unsigned requestId, const std::string &gameName);
 	virtual void SetGamePlayerPlace(unsigned requestId, DB_id playerId, unsigned place);
+	virtual void SetPlayerLastGames(unsigned requestId, DB_id playerId, std::vector<long> last_games, std::string playerIp);
 	virtual void EndGame(unsigned requestId);

 	virtual void AsyncReportAvatar(unsigned requestId, unsigned replyId, DB_id reportedPlayerId, const std::string &avatarHash, const std::string &avatarType, DB_id *byPlayerId);
@@ -2222,13 +2222,13 @@ p, li { white-space: pre-wrap; }
        <property name="minimumSize">
         <size>
          <width>600</width>
-          <height>94</height>
+          <height>114</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>600</width>
-          <height>94</height>
+          <height>114</height>
         </size>
        </property>
        <property name="styleSheet">
@@ -2631,6 +2631,13 @@ p, li { white-space: pre-wrap; }
           </layout>
          </widget>
         </item>
+         <item row="1" column="0" colspan="5">
+          <widget class="QLabel" name="label_WinningCombination">
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
        </layout>
       </widget>
      </item>
@@ -2530,6 +2530,7 @@ void gameTableImpl::postRiverRunAnimation2()

 	if(nonfoldPlayersCounter!=1) {

+		label_WinningCombination->setText(CardsValue::determineHandName(currentGame->getCurrentHand()->getCurrentBeRo()->getHighestCardsValue(), activePlayerList).c_str());
 		if(!flipHolecardsAllInAlreadyDone) {

 			for (it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
@@ -3017,6 +3018,8 @@ void gameTableImpl::nextRoundCleanGui()
 	resetMyButtonsCheckStateMemory();
 	clearMyButtons();
 	pushButton_showMyCards->hide();
+	label_WinningCombination->clear();
+	update();
 }

 void gameTableImpl::stopTimer()
@@ -4117,6 +4120,7 @@ void gameTableImpl::refreshGameTableStyle()
 	myGameTableStyle->setBigFontBoardStyle(textLabel_handLabel);
 	myGameTableStyle->setBigFontBoardStyle(label_Pot);
 #endif
+	myGameTableStyle->setBigFontBoardStyle(label_WinningCombination);
 	myGameTableStyle->setCardHolderStyle(label_CardHolder0,0);
 	myGameTableStyle->setCardHolderStyle(label_CardHolder1,0);
 	myGameTableStyle->setCardHolderStyle(label_CardHolder2,0);
@@ -2745,13 +2745,13 @@ p, li { white-space: pre-wrap; }
        <property name="minimumSize">
         <size>
          <width>390</width>
-          <height>82</height>
+          <height>102</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>390</width>
-          <height>82</height>
+          <height>102</height>
         </size>
        </property>
        <property name="styleSheet">
@@ -3039,6 +3039,13 @@ p, li { white-space: pre-wrap; }
           </widget>
          </widget>
         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_WinningCombination">
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
        </layout>
       </widget>
      </item>
@@ -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;
@@ -293,11 +293,13 @@ ServerGame::TimerVoteKick(const boost::system::error_code &ec)
 PlayerDataList
 ServerGame::InternalStartGame()
 {
+	LOG_ERROR("InternalStartGame() entered.");
 	// Initialize the game.
 	PlayerDataList playerData(GetFullPlayerDataList());

 	if (playerData.size() >= 2) {
 		// Set DB Backend.
+		// @TODO: check for wec or bbc game with bbcbot as creator
 		if (GetGameData().gameType == GAME_TYPE_RANKING)
 			m_database = GetLobbyThread().GetDatabase();
 		else
@@ -346,6 +348,12 @@ ServerGame::InternalStartGame()

 		GetDatabase().AsyncCreateGame(GetId(), GetName());
 		InitRankingMap(playerData);
+
+		// @TODO: here to save last_games with mysql per player
+
+		if (GetGameData().gameType == GAME_TYPE_RANKING)
+			StoreLastGames(playerData);
+		
 	}
 	return playerData;
 }
@@ -442,6 +450,26 @@ ServerGame::StoreAndResetRanking()
 	m_rankingMap.clear();
 }

+void
+ServerGame::StoreLastGames(const PlayerDataList &playerDataList)
+{
+	// Store players lastgames in database.
+	PlayerDataList::const_iterator i = playerDataList.begin();
+	PlayerDataList::const_iterator end = playerDataList.end();
+	while (i != end) {
+		boost::shared_ptr<PlayerData> tmpPlayer(*i);
+		// tmpPlayer->GetUniqueId()
+		tmpPlayer->AddPlayerLastGame((long)time(NULL));
+		LOG_ERROR("TimeStamp stored: " << tmpPlayer->GetPlayerLastGames().back());
+		std::vector<long> last_games = tmpPlayer->GetPlayerLastGames();
+		LOG_ERROR("Ready for storing vector for player " << tmpPlayer->GetDBId() << " - lastGameTs " << last_games.back());
+		if(tmpPlayer->GetDBId() != DB_ID_INVALID){
+			GetDatabase().SetPlayerLastGames(GetId(), tmpPlayer->GetDBId(), last_games, GetSessionManager().GetSessionByUniquePlayerId(tmpPlayer->GetUniqueId())->GetClientAddr());
+		}
+		++i;
+	}
+}
+
 void
 ServerGame::RemoveAutoLeavePlayers()
 {
@@ -62,8 +62,10 @@
 #include <boost/uuid/uuid.hpp>
 #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
@@ -303,7 +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_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);
@@ -1347,7 +1350,7 @@ ServerLobbyThread::HandleNetPacketRetrieveAvatar(boost::shared_ptr<SessionData>
 void
 ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr<SessionData> session, const JoinNewGameMessage &newGame)
 {
-	LOG_VERBOSE("Creating new game, initiated by session #" << session->GetId() << ".");
+	LOG_ERROR("Creating new game, initiated by session #" << session->GetId() << ".");

 	string password;
 	if (newGame.has_password())
@@ -1377,6 +1380,10 @@ ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr<SessionData> sess
 		SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GUEST_FORBIDDEN);
 	} else if (!ServerGame::CheckSettings(tmpData, password, GetServerMode())) {
 		SendJoinGameFailed(session, gameId, NTF_NET_JOIN_INVALID_SETTINGS);
+	} else if (!session->GetPlayerData()->IsPlayerAllowedToJoinCreateLimitRank(m_serverConfig.readConfigString("ServerLimitRankNum"), m_serverConfig.readConfigString("ServerLimitRankPeriod"))
+			&& tmpData.gameType == GAME_TYPE_RANKING ) {
+		LOG_ERROR("not allowed due to ranklimit");
+		SendJoinGameFailed(session, gameId, NTF_NET_JOIN_IP_BLOCKED);
 	} else {
 		boost::shared_ptr<ServerGame> game(
 			new ServerGame(
@@ -1418,6 +1425,7 @@ ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr<SessionData> sessio
 				MoveSessionToGame(game, session, joinGame.autoleave(), true);
 			}
 		} else {
+			LOG_ERROR("JoinGame pre validation");
 			// As guest, you are only allowed to join normal games.
 			if (session->GetPlayerData()->GetRights() == PLAYER_RIGHTS_GUEST
 					&& tmpData.gameType != GAME_TYPE_NORMAL) {
@@ -1427,14 +1435,14 @@ ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr<SessionData> sessio
 				SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_NOT_INVITED);
 			} else if (!game->CheckPassword(password)) {
 				SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_INVALID_PASSWORD);
-			} else if (tmpData.gameType == GAME_TYPE_RANKING
-					   && !joinGame.spectateonly()
-					   && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR
-					   && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR_V4V6
-					   && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR_V4
-					   && game->IsClientAddressConnected(session->GetClientAddr())) {
+			} else if (tmpData.gameType == GAME_TYPE_RANKING && !session->GetPlayerData()->IsPlayerAllowedToJoinCreateLimitRank(m_serverConfig.readConfigString("ServerLimitRankNum"), m_serverConfig.readConfigString("ServerLimitRankPeriod"))) {
+				SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_IP_BLOCKED);
+			} else if (tmpData.gameType == GAME_TYPE_RANKING && !joinGame.spectateonly()
+				   && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR
+				   && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR_V4V6
+				   && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR_V4
+				   && game->IsClientAddressConnected(session->GetClientAddr())) {
 				SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_IP_BLOCKED);
-
 			} else {
 				MoveSessionToGame(game, session, joinGame.autoleave(), false);
 			}
@@ -1803,6 +1811,18 @@ ServerLobbyThread::UserValid(unsigned playerId, const DBPlayerData &dbPlayerData
 	if (tmpSession && tmpSession->GetPlayerData()) {
 		tmpSession->GetPlayerData()->SetDBId(dbPlayerData.id);
 		tmpSession->GetPlayerData()->SetCountry(dbPlayerData.country);
+		if(dbPlayerData.last_games.length() > 0){
+			LOG_ERROR("last_games from db = " << dbPlayerData.last_games);
+			vector<string> last_games; 
+			boost::split(last_games, dbPlayerData.last_games, boost::is_any_of(",")); 
+			for (unsigned int i = 0; i < last_games.size(); i++){
+				if(last_games[i].length() > 0)
+					tmpSession->GetPlayerData()->AddPlayerLastGame(stol(last_games[i]));
+			} 
+			LOG_ERROR("last_games last from vector after db = " << tmpSession->GetPlayerData()->GetPlayerLastGames().back());
+		}else{
+			LOG_ERROR("no lastGames from db");
+		}
 		this->AuthChallenge(tmpSession, dbPlayerData.secret);
 	}
 }
@@ -34,6 +34,8 @@
 #include <net/serverexception.h>
 #include <net/socket_msg.h>

+#include <ctime>
+
 using namespace std;

 #define SERVER_MAX_GUEST_USERS_LOBBY	50		// LG: Maximum number of guests users in lobby allowed
@@ -148,6 +148,7 @@ protected:
 	void SetPlayerPlace(unsigned playerId, int place);
 	void ReplaceRankingPlayer(unsigned oldPlayerId, unsigned newPlayerId);
 	void StoreAndResetRanking();
+	void StoreLastGames(const PlayerDataList &playerDataList);
 	void RemoveAutoLeavePlayers();
 	void InternalEndGame();

@@ -40,6 +40,7 @@ typedef unsigned SessionId;
 #include <boost/thread.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <string>
+#include <vector>

 #include <net/socket_helper.h>
 #include <net/sessiondatacallback.h>
@@ -65,6 +65,8 @@ public:
 	bool IsPlayerConnected(unsigned uniqueId) const;
 	bool IsClientAddressConnected(const std::string &clientAddress) const;
 	bool IsGuestAllowedToConnect(const std::string &clientAddress) const;
+	bool IsPlayerAllowedToJoinCreateLimitRank(const std::string &playerName) const;
+	bool IsPlayerAllowedToJoinCreateLimitRank(unsigned uniqueId) const;

 	void ForEach(boost::function<void (boost::shared_ptr<SessionData>)> func);

@@ -29,6 +29,8 @@
 * as that of the covered work.                                              *
 *****************************************************************************/
 #include <playerdata.h>
+#include <ctime>
+#include <core/loghelper.h> // @TODO: remove in productive

 using namespace std;

@@ -242,3 +244,59 @@ PlayerData::operator<(const PlayerData &other) const
 	return m_number < other.GetNumber();
 }

+void
+PlayerData::SetPlayerLastGames(std::vector<long> last_games)
+{
+	boost::mutex::scoped_lock lock(m_dataMutex);
+	m_last_games.clear();
+	m_last_games = last_games;
+}
+
+void
+PlayerData::AddPlayerLastGame(long lastGame)
+{
+	boost::mutex::scoped_lock lock(m_dataMutex);
+
+	m_last_games.push_back(lastGame);
+}
+
+std::vector<long>
+PlayerData::GetPlayerLastGames()
+{
+	boost::mutex::scoped_lock lock(m_dataMutex);
+	return m_last_games;
+}
+
+bool
+PlayerData::IsPlayerAllowedToJoinCreateLimitRank(std::string num, std::string period)
+{
+	bool retVal = false;
+LOG_ERROR("checking IsPlayerAllowedToJoinCreateLimitRank() ");
+LOG_ERROR("num = " <<  num << " period " << period);
+	boost::mutex::scoped_lock lock(m_dataMutex);
+
+	long then = (long)time(NULL) - (long)(stoi(period) * 60);
+
+	int count = 0;
+	int i=0;
+	for(std::vector<long>::iterator timeStamp = m_last_games.begin(); timeStamp != m_last_games.end(); ++timeStamp) {
+		LOG_ERROR("timeStamp " << *timeStamp);
+		time_t ts = (time_t)*timeStamp;
+		LOG_ERROR("comparing ts  " <<  (long)ts << " with " << then);
+		if((long)ts > then){
+			LOG_ERROR("counting timeStamp in time  " <<  ctime(&ts));
+			count++;
+		}else{
+			LOG_ERROR("erasing overdued timestamp " << ctime(&ts));
+			timeStamp = m_last_games.erase(timeStamp); // erase overdued entries
+			if( timeStamp == m_last_games.end())
+				break;
+		}
+		i++;
+	}
+
+	if(count < stoi(num))
+		retVal = true;
+
+	return retVal;
+}
@@ -116,6 +116,12 @@ public:
 	int GetStartCash() const;
 	void SetStartCash(int cash);

+	// @TODO: last_games here
+	void AddPlayerLastGame(long last_games);
+	void SetPlayerLastGames(std::vector<long> last_games);
+	std::vector<long> GetPlayerLastGames();
+	bool IsPlayerAllowedToJoinCreateLimitRank(std::string num, std::string period);
+
 	bool operator<(const PlayerData &other) const;

 private:
@@ -135,6 +141,8 @@ private:
 	bool							m_isGameAdmin;
 	boost::shared_ptr<AvatarFile>	m_netAvatarFile;

+	std::vector<long> 				m_last_games;
+
 	mutable boost::mutex			m_dataMutex;
 };

@@ -1,28 +0,0 @@
-# - Config file for the websocketpp package
-# It defines the following variables
-#  WEBSOCKETPP_FOUND - indicates that the module was found
-#  WEBSOCKETPP_INCLUDE_DIR - include directories
-
-
-####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
-####### Any changes to this file will be overwritten by the next CMake run ####
-####### The input file was websocketpp-config.cmake.in                            ########
-
-get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
-
-macro(set_and_check _var _file)
-  set(${_var} "${_file}")
-  if(NOT EXISTS "${_file}")
-    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-  endif()
-endmacro()
-
-####################################################################################
-set_and_check(WEBSOCKETPP_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include")
-set(WEBSOCKETPP_FOUND TRUE)
-
-#This is a bit of a hack, but it works well. It also allows continued support of CMake 2.8
-if(${CMAKE_VERSION} VERSION_GREATER 3.0.0 OR ${CMAKE_VERSION} VERSION_EQUAL 3.0.0)
-  add_library(websocketpp::websocketpp INTERFACE IMPORTED)
-  set_target_properties(websocketpp::websocketpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${WEBSOCKETPP_INCLUDE_DIR}")
-endif()
@@ -1,52 +0,0 @@
-# This is a basic version file for the Config-mode of find_package().
-# It is used by write_basic_package_version_file() as input file for configure_file()
-# to create a version-file which can be installed along a config.cmake file.
-#
-# The created file sets PACKAGE_VERSION_EXACT if the current version string and
-# the requested version string are exactly the same and it sets
-# PACKAGE_VERSION_COMPATIBLE if the current version is equal to the requested version.
-# The tweak version component is ignored.
-# The variable CVF_VERSION must be set before calling configure_file().
-
-
-set(PACKAGE_VERSION "0.8.1")
-
-if("0.8.1" MATCHES "^([0-9]+\\.[0-9]+\\.[0-9]+)\\.") # strip the tweak version
-  set(CVF_VERSION_NO_TWEAK "${CMAKE_MATCH_1}")
-else()
-  set(CVF_VERSION_NO_TWEAK "0.8.1")
-endif()
-
-if(PACKAGE_FIND_VERSION MATCHES "^([0-9]+\\.[0-9]+\\.[0-9]+)\\.") # strip the tweak version
-  set(REQUESTED_VERSION_NO_TWEAK "${CMAKE_MATCH_1}")
-else()
-  set(REQUESTED_VERSION_NO_TWEAK "${PACKAGE_FIND_VERSION}")
-endif()
-
-if(REQUESTED_VERSION_NO_TWEAK STREQUAL CVF_VERSION_NO_TWEAK)
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-endif()
-
-if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-  set(PACKAGE_VERSION_EXACT TRUE)
-endif()
-
-
-# if the installed project requested no architecture check, don't perform the check
-if("FALSE")
-  return()
-endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
-  return()
-endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
-  math(EXPR installedBits "8 * 8")
-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
q4z1	a333185525	Merge branch 'stable' of https://github.com/pokerth/pokerth into stable	2020-07-21 16:05:56 +02:00
q4z1	7d116d7294	IP address output in server_messages.log in order to handle Server Attack	2020-07-21 16:05:20 +02:00
Kai Philipp	0cd9ba6f99	Merge pull request #403 from zormit/gitignore-fixes fix gitignore: don't ignore certain patterns of subdirectories	2020-07-06 17:04:56 +02:00
Moritz Neeb	99ad7ffd71	fix gitignore: don't ignore certain patterns of subdirectories the project has source code in paths like: tests/src/de/pokerth src/chatcleaner which should not be ignored. To fix this, a slash needs to be added in front of the files that actually should be ignored. While at it: - pokerth_server does not need to be ignored (it's generated in `bin/`, which is ignored already) - ignore some project files (for the case Eclipse is used as IDE)	2020-07-04 23:11:18 +02:00
q4z1	9b36c9863c	bottleneck handling	2020-03-22 09:59:45 +01:00
Kai Philipp	20793e24a1	Merge pull request #376 from rkfg/hand_name Show the winning hand after the round @TODO: to be tested in an internet game	2020-01-15 00:55:04 +01:00
Sergey Shpikin	382b533488	Show the winning hand after the round	2020-01-13 17:53:49 +03:00
Kai Philipp	7c538fc436	limit rank games per time unit implemented	2019-11-20 18:19:46 +01:00