Merged the /loginmerge branch (topic:192754)

 * the login server storage, ipban and logging systems have been abstracted and now provide a common interface; the rest has been merged into a single login server core (no more login/login_sql duplicity)
 * storage systems are now added via compiler options (WITH_SQL / WITH_TXT)
 * multiple storage engines can be compiled in at the same time, and the config option account.engine defines which one will be used.
 * due to MySQL autoincrement limitations, accounts with id '0' will not be supported; account IDs from this point on should start from '1'.
 * login_log() functions now again record IP addresses in dotted format, not as 4-byte integers (undo from r6868).
 * removed config options that defined column names in the login table
 * removed `memo` and `error message` columns from login db/savefile
 * moved `loginlog` table to the logs database
 * added sql files upgrade_svn12975.sql and upgrade_svn12975_log.sql
 * due to changes to the login table layout, I added an !optional! sql file (upgrade_svn12975_view.sql) that will provide a certain degree of backwards compatibility with existing software; read the instructions inside carefully!
 * moved third-party includes/libs to a separate directory
 * updated project files / makefiles

Changed the way GM levels are handled
 * removed conf/gm_account.txt
 * added the gm level column to the txt savefile (after 'email' column)
 * gm level information is now transferred along with account data
 
For open problems see bugreport:1889.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13000 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 238 insertions, 210 deletions

diff --git a/vcproj-6/login-server_sql.dsp b/vcproj-6/login-server_sql.dsp
index 07f853727..561976f4e 100644
--- a/vcproj-6/login-server_sql.dsp
+++ b/vcproj-6/login-server_sql.dsp
@@ -1,210 +1,238 @@
-# Microsoft Developer Studio Project File - Name="login_sql" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=login_sql - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "login-server_sql.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "login-server_sql.mak" CFG="login_sql - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "login_sql - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c

-# ADD BASE RSC /l 0x409

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 WSOCK32.lib libmysql.lib zdll.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/login_sql/login-server_sql.pdb" /machine:I386 /out:"../login-server_sql.exe" /libpath:"../lib"

-# SUBTRACT LINK32 /pdb:none

-# Begin Target

-

-# Name "login_sql - Win32 Release"

-# Begin Group "common"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\src\common\cbasetypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\core.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\core.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\db.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\db.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\ers.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\ers.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\lock.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\lock.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\malloc.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\malloc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\mapindex.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\mapindex.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\md5calc.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\md5calc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\mmo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\nullpo.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\nullpo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\plugin.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\plugins.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\plugins.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\showmsg.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\showmsg.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\socket.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\socket.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\sql.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\sql.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\strlib.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\strlib.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\svnversion.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\timer.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\timer.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\utils.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\utils.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\common\version.h

-# End Source File

-# End Group

-# Begin Group "login_sql"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\src\login_sql\login.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\login_sql\login.h

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="login_sql" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=login_sql - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "login-server_sql.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "login-server_sql.mak" CFG="login_sql - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "login_sql - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W2 /GX /O2 /I "..\3rdparty\mysql\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_SQL" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c
+# ADD BASE RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 WSOCK32.lib libmysql.lib ws2_32.lib /nologo /subsystem:console /pdb:"tmp/login_sql/login-server_sql.pdb" /machine:I386 /out:"../login-server_sql.exe" /libpath:"..\3rdparty\mysql\lib"
+# SUBTRACT LINK32 /pdb:none
+# Begin Target
+
+# Name "login_sql - Win32 Release"
+# Begin Group "common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\src\common\cbasetypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\core.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\core.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\db.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\db.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\ers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\ers.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\lock.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\lock.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\malloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\malloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\mapindex.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\mapindex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\md5calc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\md5calc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\mmo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\nullpo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\nullpo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\plugin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\plugins.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\plugins.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\showmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\showmsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\socket.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\socket.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\sql.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\sql.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\strlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\strlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\svnversion.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\timer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\timer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\utils.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\utils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\common\version.h
+# End Source File
+# End Group
+# Begin Group "login_sql"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\src\login\account.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\account_sql.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\admin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\ipban.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\ipban_sql.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\login.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\login.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\loginlog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\login\loginlog_sql.h
+# End Source File
+# End Group
+# End Target
+# End Project