Index: src/common/mmo.h

===================================================================

--- src/common/mmo.h	(revision 17373)

+++ src/common/mmo.h	(working copy)

@@ -8,52 +8,15 @@

 #include "../common/db.h"

 #include <time.h>

-// server->client protocol version

-//        0 - pre-?

-//        1 - ?                    - 0x196

-//        2 - ?                    - 0x78, 0x79

-//        3 - ?                    - 0x1c8, 0x1c9, 0x1de

-//        4 - ?                    - 0x1d7, 0x1d8, 0x1d9, 0x1da

-//        5 - 2003-12-18aSakexe+   - 0x1ee, 0x1ef, 0x1f0, ?0x1c4, 0x1c5?

-//        6 - 2004-03-02aSakexe+   - 0x1f4, 0x1f5

-//        7 - 2005-04-11aSakexe+   - 0x229, 0x22a, 0x22b, 0x22c

-// 20061023 - 2006-10-23aSakexe+   - 0x6b, 0x6d

-// 20070521 - 2007-05-21aSakexe+   - 0x283

-// 20070821 - 2007-08-21aSakexe+   - 0x2c5

-// 20070918 - 2007-09-18aSakexe+   - 0x2d7, 0x2d9, 0x2da

-// 20071106 - 2007-11-06aSakexe+   - 0x78, 0x7c, 0x22c

-// 20080102 - 2008-01-02aSakexe+   - 0x2ec, 0x2ed , 0x2ee

-// 20081126 - 2008-11-26aSakexe+   - 0x1a2

-// 20090408 - 2009-04-08aSakexe+   - 0x44a (dont use as it overlaps with RE client packets)

-// 20080827 - 2008-08-27aRagexeRE+ - First RE Client

-// 20081217 - 2008-12-17aRagexeRE+ - 0x6d (Note: This one still use old Char Info Packet Structure)

-// 20081218 - 2008-12-17bRagexeRE+ - 0x6d (Note: From this one client use new Char Info Packet Structure)

-// 20090603 - 2009-06-03aRagexeRE+ - 0x7d7, 0x7d8, 0x7d9, 0x7da

-// 20090617 - 2009-06-17aRagexeRE+ - 0x7d9

-// 20090922 - 2009-09-22aRagexeRE+ - 0x7e5, 0x7e7, 0x7e8, 0x7e9

-// 20091103 - 2009-11-03aRagexeRE+ - 0x7f7, 0x7f8, 0x7f9

-// 20100105 - 2010-01-05aRagexeRE+ - 0x133, 0x800, 0x801

-// 20100126 - 2010-01-26aRagexeRE+ - 0x80e

-// 20100223 - 2010-02-23aRagexeRE+ - 0x80f

-// 20100413 - 2010-04-13aRagexeRE+ - 0x6b

-// 20100629 - 2010-06-29aRagexeRE+ - 0x2d0, 0xaa, 0x2d1, 0x2d2

-// 20100721 - 2010-07-21aRagexeRE+ - 0x6b, 0x6d

-// 20100727 - 2010-07-27aRagexeRE+ - 0x6b, 0x6d

-// 20100803 - 2010-08-03aRagexeRE+ - 0x6b, 0x6d, 0x827, 0x828, 0x829, 0x82a, 0x82b, 0x82c, 0x842, 0x843

-// 20101124 - 2010-11-24aRagexeRE+ - 0x856, 0x857, 0x858

-// 20110111 - 2011-01-11aRagexeRE+ - 0x6b, 0x6d

-// 20110928 - 2011-09-28aRagexeRE+ - 0x6b, 0x6d

-// 20111025 - 2011-10-25aRagexeRE+ - 0x6b, 0x6d

-// 20120307 - 2012-03-07aRagexeRE+ - 0x970

-

 #ifndef PACKETVER

-	#define PACKETVER 20120410

-	//#define PACKETVER 20130320

+	//#define PACKETVER 20120410

+	#define PACKETVER 20130320

 	//#define PACKETVER 20111116

 #endif

 //Remove/Comment this line to disable sc_data saving. [Skotlex]

 #define ENABLE_SC_SAVING

+

 //Remove/Comment this line to disable server-side hot-key saving support [Skotlex]

 //Note that newer clients no longer save hotkeys in the registry!

 #define HOTKEY_SAVING

Index: src/common/cli.c

===================================================================

--- src/common/cli.c	(revision 17373)

+++ src/common/cli.c	(working copy)

@@ -53,12 +53,12 @@

  */

 void display_versionscreen(bool do_exit)

 {

-    ShowInfo(CL_WHITE"rAthena SVN version: %s" CL_RESET"\n", get_svn_revision());

-    ShowInfo(CL_GREEN"Website/Forum:"CL_RESET"\thttp://rathena.org/\n");

-    ShowInfo(CL_GREEN"IRC Channel:"CL_RESET"\tirc://irc.rizon.net/#rathena\n");

-    ShowInfo("Open "CL_WHITE"readme.txt"CL_RESET" for more information.\n");

-    if (do_exit)

-	exit(EXIT_SUCCESS);

+	ShowInfo(CL_WHITE"rAthena SVN version: %s" CL_RESET"\n", get_svn_revision());

+	ShowInfo(CL_GREEN"Website/Forum:"CL_RESET"\thttp://rathena.org/\n");

+	ShowInfo(CL_GREEN"IRC Channel:"CL_RESET"\tirc://irc.rizon.net/#rathena\n");

+	ShowInfo("Open "CL_WHITE"readme.txt"CL_RESET" for more information.\n");

+	if (do_exit)

+		exit(EXIT_SUCCESS);

 }

 /*

Index: src/common/cli.h

===================================================================

--- src/common/cli.h	(revision 17373)

+++ src/common/cli.h	(working copy)

@@ -32,6 +32,8 @@

  extern char* MSG_CONF_NAME_EN; //all

 extern void display_helpscreen(bool exit);

+void display_versionscreen(bool do_exit);

+bool opt_has_next_value(const char* option, int i, int argc);

 int cli_get_options(int argc, char ** argv);

 int parse_console_timer(int tid, unsigned int tick, int id, intptr_t data);

 extern int parse_console(const char* buf); //particular for each serv

Index: src/common/timer.c

===================================================================

--- src/common/timer.c	(revision 17373)

+++ src/common/timer.c	(working copy)

@@ -109,28 +109,28 @@

 	} t;

 	asm volatile("rdtsc":"=a"(t.dw[0]), "=d"(t.dw[1]) );

-	

+

 	return t.qw;

 }

 static void rdtsc_calibrate(){

 	uint64 t1, t2;

 	int32 i;

-	

+

 	ShowStatus("Calibrating Timer Source, please wait... ");

-	

+

 	RDTSC_CLOCK = 0;

-	

+

 	for(i = 0; i < 5; i++){

 		t1 = _rdtsc();

 		usleep(1000000); //1000 MS

 		t2 = _rdtsc();

-		RDTSC_CLOCK += (t2 - t1) / 1000; 

+		RDTSC_CLOCK += (t2 - t1) / 1000;

 	}

 	RDTSC_CLOCK /= 5;

-	

+

 	RDTSC_BEGINTICK = _rdtsc();

-	

+

 	ShowMessage(" done. (Frequency: %u Mhz)\n", (uint32)(RDTSC_CLOCK/1000) );

 }

@@ -243,7 +243,7 @@

 int add_timer(unsigned int tick, TimerFunc func, int id, intptr_t data)

 {

 	int tid;

-	

+

 	tid = acquire_timer();

 	timer_data[tid].tick     = tick;

 	timer_data[tid].func     = func;

@@ -267,7 +267,7 @@

 		ShowError("add_timer_interval: invalid interval (tick=%u %p[%s] id=%d data=%d diff_tick=%d)\n", tick, func, search_timer_func_list(func), id, data, DIFF_TICK(tick, gettick()));

 		return INVALID_TIMER;

 	}

-	

+

 	tid = acquire_timer();

 	timer_data[tid].tick     = tick;

 	timer_data[tid].func     = func;

@@ -320,7 +320,7 @@

 int settick_timer(int tid, unsigned int tick)

 {

 	size_t i;

-	

+

 	// search timer position

 	ARR_FIND(0, BHEAP_LENGTH(timer_heap), i, BHEAP_DATA(timer_heap)[i] == tid);

 	if( i == BHEAP_LENGTH(timer_heap) )

@@ -406,6 +406,16 @@

 	return (unsigned long)difftime(time(NULL), start_time);

 }

+//-----------------------------------------------------

+// custom timestamp formatting (from eApp)

+//-----------------------------------------------------

+const char* timestamp2string(char* str, size_t size, time_t timestamp, const char* format)

+{

+	size_t len = strftime(str, size, format, localtime(&timestamp));

+	memset(str + len, '\0', size - len);

+	return str;

+}

+

 void timer_init(void)

 {

 #if defined(ENABLE_RDTSC)

Index: src/common/timer.h

===================================================================

--- src/common/timer.h	(revision 17373)

+++ src/common/timer.h	(working copy)

@@ -5,6 +5,7 @@

 #define	_TIMER_H_

 #include "../common/cbasetypes.h"

+#include <time.h>

 #define DIFF_TICK(a,b) ((int)((a)-(b)))

@@ -51,6 +52,9 @@

 unsigned long get_uptime(void);

+//transform a timestamp to string

+const char* timestamp2string(char* str, size_t size, time_t timestamp, const char* format);

+

 int do_timer(unsigned int tick);

 void timer_init(void);

 void timer_final(void);

Index: src/config/const.h

===================================================================

--- src/config/const.h	(revision 17373)

+++ src/config/const.h	(working copy)

@@ -87,6 +87,9 @@

 /* Feb 1st 2012 */

 #if PACKETVER >= 20120201

 	#define NEW_CARTS

+	#ifndef ENABLE_SC_SAVING

+	 #warning "Cart won't be able to be saved for relog"

+	#endif

 	#define MAX_CARTS 9

 #else

 	#define MAX_CARTS 5

Index: src/login/account_sql.c

===================================================================

--- src/login/account_sql.c	(revision 17373)

+++ src/login/account_sql.c	(working copy)

@@ -1,689 +0,0 @@

-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL

-// For more information, see LICENCE in the main folder

-

-#include "../common/malloc.h"

-#include "../common/mmo.h"

-#include "../common/showmsg.h"

-#include "../common/sql.h"

-#include "../common/strlib.h"

-#include "../common/timer.h"

-#include "account.h"

-#include <stdlib.h>

-#include <string.h>

-

-/// global defines

-#define ACCOUNT_SQL_DB_VERSION 20110114

-

-/// internal structure

-typedef struct AccountDB_SQL

-{

-	AccountDB vtable;    // public interface

-

-	Sql* accounts;       // SQL accounts storage

-

-	// global sql settings

-	char   global_db_hostname[32];

-	uint16 global_db_port;

-	char   global_db_username[32];

-	char   global_db_password[32];

-	char   global_db_database[32];

-	char   global_codepage[32];

-	// local sql settings

-	char   db_hostname[32];

-	uint16 db_port;

-	char   db_username[32];

-	char   db_password[32];

-	char   db_database[32];

-	char   codepage[32];

-	// other settings

-	bool case_sensitive;

-	char account_db[32];

-	char accreg_db[32];

-

-} AccountDB_SQL;

-

-/// internal structure

-typedef struct AccountDBIterator_SQL

-{

-	AccountDBIterator vtable;    // public interface

-

-	AccountDB_SQL* db;

-	int last_account_id;

-} AccountDBIterator_SQL;

-

-/// internal functions

-static bool account_db_sql_init(AccountDB* self);

-static void account_db_sql_destroy(AccountDB* self);

-static bool account_db_sql_get_property(AccountDB* self, const char* key, char* buf, size_t buflen);

-static bool account_db_sql_set_property(AccountDB* self, const char* option, const char* value);

-static bool account_db_sql_create(AccountDB* self, struct mmo_account* acc);

-static bool account_db_sql_remove(AccountDB* self, const int account_id);

-static bool account_db_sql_save(AccountDB* self, const struct mmo_account* acc);

-static bool account_db_sql_load_num(AccountDB* self, struct mmo_account* acc, const int account_id);

-static bool account_db_sql_load_str(AccountDB* self, struct mmo_account* acc, const char* userid);

-static AccountDBIterator* account_db_sql_iterator(AccountDB* self);

-static void account_db_sql_iter_destroy(AccountDBIterator* self);

-static bool account_db_sql_iter_next(AccountDBIterator* self, struct mmo_account* acc);

-

-static bool mmo_auth_fromsql(AccountDB_SQL* db, struct mmo_account* acc, int account_id);

-static bool mmo_auth_tosql(AccountDB_SQL* db, const struct mmo_account* acc, bool is_new);

-

-/// public constructor

-AccountDB* account_db_sql(void)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)aCalloc(1, sizeof(AccountDB_SQL));

-

-	// set up the vtable

-	db->vtable.init         = &account_db_sql_init;

-	db->vtable.destroy      = &account_db_sql_destroy;

-	db->vtable.get_property = &account_db_sql_get_property;

-	db->vtable.set_property = &account_db_sql_set_property;

-	db->vtable.save         = &account_db_sql_save;

-	db->vtable.create       = &account_db_sql_create;

-	db->vtable.remove       = &account_db_sql_remove;

-	db->vtable.load_num     = &account_db_sql_load_num;

-	db->vtable.load_str     = &account_db_sql_load_str;

-	db->vtable.iterator     = &account_db_sql_iterator;

-

-	// initialize to default values

-	db->accounts = NULL;

-	// global sql settings

-	safestrncpy(db->global_db_hostname, "127.0.0.1", sizeof(db->global_db_hostname));

-	db->global_db_port = 3306;

-	safestrncpy(db->global_db_username, "ragnarok", sizeof(db->global_db_username));

-	safestrncpy(db->global_db_password, "ragnarok", sizeof(db->global_db_password));

-	safestrncpy(db->global_db_database, "ragnarok", sizeof(db->global_db_database));

-	safestrncpy(db->global_codepage, "", sizeof(db->global_codepage));

-	// local sql settings

-	safestrncpy(db->db_hostname, "", sizeof(db->db_hostname));

-	db->db_port = 3306;

-	safestrncpy(db->db_username, "", sizeof(db->db_username));

-	safestrncpy(db->db_password, "", sizeof(db->db_password));

-	safestrncpy(db->db_database, "", sizeof(db->db_database));

-	safestrncpy(db->codepage, "", sizeof(db->codepage));

-	// other settings

-	db->case_sensitive = false;

-	safestrncpy(db->account_db, "login", sizeof(db->account_db));

-	safestrncpy(db->accreg_db, "global_reg_value", sizeof(db->accreg_db));

-

-	return &db->vtable;

-}

-

-

-/* ------------------------------------------------------------------------- */

-

-

-/// establishes database connection

-static bool account_db_sql_init(AccountDB* self)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-	Sql* sql_handle;

-	const char* username;

-	const char* password;

-	const char* hostname;

-	uint16      port;

-	const char* database;

-	const char* codepage;

-

-	db->accounts = Sql_Malloc();

-	sql_handle = db->accounts;

-

-	if( db->db_hostname[0] != '\0' )

-	{// local settings

-		username = db->db_username;

-		password = db->db_password;

-		hostname = db->db_hostname;

-		port     = db->db_port;

-		database = db->db_database;

-		codepage = db->codepage;

-	}

-	else

-	{// global settings

-		username = db->global_db_username;

-		password = db->global_db_password;

-		hostname = db->global_db_hostname;

-		port     = db->global_db_port;

-		database = db->global_db_database;

-		codepage = db->global_codepage;

-	}

-

-	if( SQL_ERROR == Sql_Connect(sql_handle, username, password, hostname, port, database) )

-	{

-		Sql_ShowDebug(sql_handle);

-		Sql_Free(db->accounts);

-		db->accounts = NULL;

-		return false;

-	}

-

-	if( codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(sql_handle, codepage) )

-		Sql_ShowDebug(sql_handle);

-

-	return true;

-}

-

-/// disconnects from database

-static void account_db_sql_destroy(AccountDB* self)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-

-	Sql_Free(db->accounts);

-	db->accounts = NULL;

-	aFree(db);

-}

-

-/// Gets a property from this database.

-static bool account_db_sql_get_property(AccountDB* self, const char* key, char* buf, size_t buflen)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-	const char* signature;

-

-	signature = "engine.";

-	if( strncmpi(key, signature, strlen(signature)) == 0 )

-	{

-		key += strlen(signature);

-		if( strcmpi(key, "name") == 0 )

-			safesnprintf(buf, buflen, "sql");

-		else

-		if( strcmpi(key, "version") == 0 )

-			safesnprintf(buf, buflen, "%d", ACCOUNT_SQL_DB_VERSION);

-		else

-		if( strcmpi(key, "comment") == 0 )

-			safesnprintf(buf, buflen, "SQL Account Database");

-		else

-			return false;// not found

-		return true;

-	}

-

-	signature = "sql.";

-	if( strncmpi(key, signature, strlen(signature)) == 0 )

-	{

-		key += strlen(signature);

-		if( strcmpi(key, "db_hostname") == 0 )

-			safesnprintf(buf, buflen, "%s", db->global_db_hostname);

-		else

-		if( strcmpi(key, "db_port") == 0 )

-			safesnprintf(buf, buflen, "%d", db->global_db_port);

-		else

-		if( strcmpi(key, "db_username") == 0 )

-			safesnprintf(buf, buflen, "%s", db->global_db_username);

-		else

-		if(	strcmpi(key, "db_password") == 0 )

-			safesnprintf(buf, buflen, "%s", db->global_db_password);

-		else

-		if( strcmpi(key, "db_database") == 0 )

-			safesnprintf(buf, buflen, "%s", db->global_db_database);

-		else

-		if( strcmpi(key, "codepage") == 0 )

-			safesnprintf(buf, buflen, "%s", db->global_codepage);

-		else

-			return false;// not found

-		return true;

-	}

-

-	signature = "account.sql.";

-	if( strncmpi(key, signature, strlen(signature)) == 0 )

-	{

-		key += strlen(signature);

-		if( strcmpi(key, "db_hostname") == 0 )

-			safesnprintf(buf, buflen, "%s", db->db_hostname);

-		else

-		if( strcmpi(key, "db_port") == 0 )

-			safesnprintf(buf, buflen, "%d", db->db_port);

-		else

-		if( strcmpi(key, "db_username") == 0 )

-			safesnprintf(buf, buflen, "%s", db->db_username);

-		else

-		if(	strcmpi(key, "db_password") == 0 )

-			safesnprintf(buf, buflen, "%s", db->db_password);

-		else

-		if( strcmpi(key, "db_database") == 0 )

-			safesnprintf(buf, buflen, "%s", db->db_database);

-		else

-		if( strcmpi(key, "codepage") == 0 )

-			safesnprintf(buf, buflen, "%s", db->codepage);

-		else

-		if( strcmpi(key, "case_sensitive") == 0 )

-			safesnprintf(buf, buflen, "%d", (db->case_sensitive ? 1 : 0));

-		else

-		if( strcmpi(key, "account_db") == 0 )

-			safesnprintf(buf, buflen, "%s", db->account_db);

-		else

-		if( strcmpi(key, "accreg_db") == 0 )

-			safesnprintf(buf, buflen, "%s", db->accreg_db);

-		else

-			return false;// not found

-		return true;

-	}

-

-	return false;// not found

-}

-

-/// if the option is supported, adjusts the internal state

-static bool account_db_sql_set_property(AccountDB* self, const char* key, const char* value)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-	const char* signature;

-

-

-	signature = "sql.";

-	if( strncmp(key, signature, strlen(signature)) == 0 )

-	{

-		key += strlen(signature);

-		if( strcmpi(key, "db_hostname") == 0 )

-			safestrncpy(db->global_db_hostname, value, sizeof(db->global_db_hostname));

-		else

-		if( strcmpi(key, "db_port") == 0 )

-			db->global_db_port = (uint16)strtoul(value, NULL, 10);

-		else

-		if( strcmpi(key, "db_username") == 0 )

-			safestrncpy(db->global_db_username, value, sizeof(db->global_db_username));

-		else

-		if( strcmpi(key, "db_password") == 0 )

-			safestrncpy(db->global_db_password, value, sizeof(db->global_db_password));

-		else

-		if( strcmpi(key, "db_database") == 0 )

-			safestrncpy(db->global_db_database, value, sizeof(db->global_db_database));

-		else

-		if( strcmpi(key, "codepage") == 0 )

-			safestrncpy(db->global_codepage, value, sizeof(db->global_codepage));

-		else

-			return false;// not found

-		return true;

-	}

-

-	signature = "account.sql.";

-	if( strncmp(key, signature, strlen(signature)) == 0 )

-	{

-		key += strlen(signature);

-		if( strcmpi(key, "db_hostname") == 0 )

-			safestrncpy(db->db_hostname, value, sizeof(db->db_hostname));

-		else

-		if( strcmpi(key, "db_port") == 0 )

-			db->db_port = (uint16)strtoul(value, NULL, 10);

-		else

-		if( strcmpi(key, "db_username") == 0 )

-			safestrncpy(db->db_username, value, sizeof(db->db_username));

-		else

-		if( strcmpi(key, "db_password") == 0 )

-			safestrncpy(db->db_password, value, sizeof(db->db_password));

-		else

-		if( strcmpi(key, "db_database") == 0 )

-			safestrncpy(db->db_database, value, sizeof(db->db_database));

-		else

-		if( strcmpi(key, "codepage") == 0 )

-			safestrncpy(db->codepage, value, sizeof(db->codepage));

-		else

-		if( strcmpi(key, "case_sensitive") == 0 )

-			db->case_sensitive = config_switch(value);

-		else

-		if( strcmpi(key, "account_db") == 0 )

-			safestrncpy(db->account_db, value, sizeof(db->account_db));

-		else

-		if( strcmpi(key, "accreg_db") == 0 )

-			safestrncpy(db->accreg_db, value, sizeof(db->accreg_db));

-		else

-			return false;// not found

-		return true;

-	}

-

-	return false;// not found

-}

-

-/// create a new account entry

-/// If acc->account_id is -1, the account id will be auto-generated,

-/// and its value will be written to acc->account_id if everything succeeds.

-static bool account_db_sql_create(AccountDB* self, struct mmo_account* acc)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-	Sql* sql_handle = db->accounts;

-

-	// decide on the account id to assign

-	int account_id;

-	if( acc->account_id != -1 )

-	{// caller specifies it manually

-		account_id = acc->account_id;

-	}

-	else

-	{// ask the database

-		char* data;

-		size_t len;

-

-		if( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT MAX(`account_id`)+1 FROM `%s`", db->account_db) )

-		{

-			Sql_ShowDebug(sql_handle);

-			return false;

-		}

-		if( SQL_SUCCESS != Sql_NextRow(sql_handle) )

-		{

-			Sql_ShowDebug(sql_handle);

-			Sql_FreeResult(sql_handle);

-			return false;

-		}

-

-		Sql_GetData(sql_handle, 0, &data, &len);

-		account_id = ( data != NULL ) ? atoi(data) : 0;

-		Sql_FreeResult(sql_handle);

-

-		if( account_id < START_ACCOUNT_NUM )

-			account_id = START_ACCOUNT_NUM;

-

-	}

-

-	// zero value is prohibited

-	if( account_id == 0 )

-		return false;

-

-	// absolute maximum

-	if( account_id > END_ACCOUNT_NUM )

-		return false;

-

-	// insert the data into the database

-	acc->account_id = account_id;

-	return mmo_auth_tosql(db, acc, true);

-}

-

-/// delete an existing account entry + its regs

-static bool account_db_sql_remove(AccountDB* self, const int account_id)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-	Sql* sql_handle = db->accounts;

-	bool result = false;

-

-	if( SQL_SUCCESS != Sql_QueryStr(sql_handle, "START TRANSACTION")

-	||  SQL_SUCCESS != Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = %d", db->account_db, account_id)

-	||  SQL_SUCCESS != Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = %d", db->accreg_db, account_id) )

-		Sql_ShowDebug(sql_handle);

-	else

-		result = true;

-

-	result &= ( SQL_SUCCESS == Sql_QueryStr(sql_handle, (result == true) ? "COMMIT" : "ROLLBACK") );

-

-	return result;

-}

-

-/// update an existing account with the provided new data (both account and regs)

-static bool account_db_sql_save(AccountDB* self, const struct mmo_account* acc)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-	return mmo_auth_tosql(db, acc, false);

-}

-

-/// retrieve data from db and store it in the provided data structure

-static bool account_db_sql_load_num(AccountDB* self, struct mmo_account* acc, const int account_id)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-	return mmo_auth_fromsql(db, acc, account_id);

-}

-

-/// retrieve data from db and store it in the provided data structure

-static bool account_db_sql_load_str(AccountDB* self, struct mmo_account* acc, const char* userid)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-	Sql* sql_handle = db->accounts;

-	char esc_userid[2*NAME_LENGTH+1];

-	int account_id;

-	char* data;

-

-	Sql_EscapeString(sql_handle, esc_userid, userid);

-

-	// get the list of account IDs for this user ID

-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id` FROM `%s` WHERE `userid`= %s '%s'",

-		db->account_db, (db->case_sensitive ? "BINARY" : ""), esc_userid) )

-	{

-		Sql_ShowDebug(sql_handle);

-		return false;

-	}

-

-	if( Sql_NumRows(sql_handle) > 1 )

-	{// serious problem - duplicit account

-		ShowError("account_db_sql_load_str: multiple accounts found when retrieving data for account '%s'!\n", userid);

-		Sql_FreeResult(sql_handle);

-		return false;

-	}

-

-	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )

-	{// no such entry

-		Sql_FreeResult(sql_handle);

-		return false;

-	}

-

-	Sql_GetData(sql_handle, 0, &data, NULL);

-	account_id = atoi(data);

-

-	return account_db_sql_load_num(self, acc, account_id);

-}

-

-

-/// Returns a new forward iterator.

-static AccountDBIterator* account_db_sql_iterator(AccountDB* self)

-{

-	AccountDB_SQL* db = (AccountDB_SQL*)self;

-	AccountDBIterator_SQL* iter = (AccountDBIterator_SQL*)aCalloc(1, sizeof(AccountDBIterator_SQL));

-

-	// set up the vtable

-	iter->vtable.destroy = &account_db_sql_iter_destroy;

-	iter->vtable.next    = &account_db_sql_iter_next;

-

-	// fill data

-	iter->db = db;

-	iter->last_account_id = -1;

-

-	return &iter->vtable;

-}

-

-

-/// Destroys this iterator, releasing all allocated memory (including itself).

-static void account_db_sql_iter_destroy(AccountDBIterator* self)

-{

-	AccountDBIterator_SQL* iter = (AccountDBIterator_SQL*)self;

-	aFree(iter);

-}

-

-

-/// Fetches the next account in the database.

-static bool account_db_sql_iter_next(AccountDBIterator* self, struct mmo_account* acc)

-{

-	AccountDBIterator_SQL* iter = (AccountDBIterator_SQL*)self;

-	AccountDB_SQL* db = (AccountDB_SQL*)iter->db;

-	Sql* sql_handle = db->accounts;

-	char* data;

-

-	// get next account ID

-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id` FROM `%s` WHERE `account_id` > '%d' ORDER BY `account_id` ASC LIMIT 1",

-		db->account_db, iter->last_account_id) )

-	{

-		Sql_ShowDebug(sql_handle);

-		return false;

-	}

-

-	if( SQL_SUCCESS == Sql_NextRow(sql_handle) &&

-		SQL_SUCCESS == Sql_GetData(sql_handle, 0, &data, NULL) &&

-		data != NULL )

-	{// get account data

-		int account_id;

-		account_id = atoi(data);

-		if( mmo_auth_fromsql(db, acc, account_id) )

-		{

-			iter->last_account_id = account_id;

-			Sql_FreeResult(sql_handle);

-			return true;

-		}

-	}

-	Sql_FreeResult(sql_handle);

-	return false;

-}

-

-

-static bool mmo_auth_fromsql(AccountDB_SQL* db, struct mmo_account* acc, int account_id)

-{

-	Sql* sql_handle = db->accounts;

-	char* data;

-	int i = 0;

-

-	// retrieve login entry for the specified account

-	if( SQL_ERROR == Sql_Query(sql_handle,

-	    "SELECT `account_id`,`userid`,`user_pass`,`sex`,`email`,`group_id`,`state`,`unban_time`,`expiration_time`,`logincount`,`lastlogin`,`last_ip`,`birthdate`,`character_slots`,`pincode`, `pincode_change` FROM `%s` WHERE `account_id` = %d",

-		db->account_db, account_id )

-	) {

-		Sql_ShowDebug(sql_handle);

-		return false;

-	}

-

-	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )

-	{// no such entry

-		Sql_FreeResult(sql_handle);

-		return false;

-	}

-

-	Sql_GetData(sql_handle,  0, &data, NULL); acc->account_id = atoi(data);

-	Sql_GetData(sql_handle,  1, &data, NULL); safestrncpy(acc->userid, data, sizeof(acc->userid));

-	Sql_GetData(sql_handle,  2, &data, NULL); safestrncpy(acc->pass, data, sizeof(acc->pass));

-	Sql_GetData(sql_handle,  3, &data, NULL); acc->sex = data[0];

-	Sql_GetData(sql_handle,  4, &data, NULL); safestrncpy(acc->email, data, sizeof(acc->email));

-	Sql_GetData(sql_handle,  5, &data, NULL); acc->group_id = atoi(data);

-	Sql_GetData(sql_handle,  6, &data, NULL); acc->state = strtoul(data, NULL, 10);

-	Sql_GetData(sql_handle,  7, &data, NULL); acc->unban_time = atol(data);

-	Sql_GetData(sql_handle,  8, &data, NULL); acc->expiration_time = atol(data);

-	Sql_GetData(sql_handle,  9, &data, NULL); acc->logincount = strtoul(data, NULL, 10);

-	Sql_GetData(sql_handle, 10, &data, NULL); safestrncpy(acc->lastlogin, data, sizeof(acc->lastlogin));

-	Sql_GetData(sql_handle, 11, &data, NULL); safestrncpy(acc->last_ip, data, sizeof(acc->last_ip));

-	Sql_GetData(sql_handle, 12, &data, NULL); safestrncpy(acc->birthdate, data, sizeof(acc->birthdate));

-	Sql_GetData(sql_handle, 13, &data, NULL); acc->char_slots = atoi(data);

-	Sql_GetData(sql_handle, 14, &data, NULL); safestrncpy(acc->pincode, data, sizeof(acc->pincode));

-	Sql_GetData(sql_handle, 15, &data, NULL); acc->pincode_change = atol(data);

-

-	Sql_FreeResult(sql_handle);

-

-

-	// retrieve account regs for the specified user

-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `str`,`value` FROM `%s` WHERE `type`='1' AND `account_id`='%d'", db->accreg_db, acc->account_id) )

-	{

-		Sql_ShowDebug(sql_handle);

-		return false;

-	}

-

-	acc->account_reg2_num = (int)Sql_NumRows(sql_handle);

-

-	while( SQL_SUCCESS == Sql_NextRow(sql_handle) )

-	{

-		char* data;

-		Sql_GetData(sql_handle, 0, &data, NULL); safestrncpy(acc->account_reg2[i].str, data, sizeof(acc->account_reg2[i].str));

-		Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(acc->account_reg2[i].value, data, sizeof(acc->account_reg2[i].value));

-		++i;

-	}

-	Sql_FreeResult(sql_handle);

-

-	if( i != acc->account_reg2_num )

-		return false;

-

-	return true;

-}

-

-static bool mmo_auth_tosql(AccountDB_SQL* db, const struct mmo_account* acc, bool is_new)

-{

-	Sql* sql_handle = db->accounts;

-	SqlStmt* stmt = SqlStmt_Malloc(sql_handle);

-	bool result = false;

-	int i;

-

-	// try

-	do

-	{

-

-	if( SQL_SUCCESS != Sql_QueryStr(sql_handle, "START TRANSACTION") )

-	{

-		Sql_ShowDebug(sql_handle);

-		break;

-	}

-

-	if( is_new )

-	{// insert into account table

-		if( SQL_SUCCESS != SqlStmt_Prepare(stmt,

-			"INSERT INTO `%s` (`account_id`, `userid`, `user_pass`, `sex`, `email`, `group_id`, `state`, `unban_time`, `expiration_time`, `logincount`, `lastlogin`, `last_ip`, `birthdate`, `character_slots`, `pincode`, `pincode_change`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",

-			db->account_db)

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  0, SQLDT_INT,    (void*)&acc->account_id,      sizeof(acc->account_id))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  1, SQLDT_STRING, (void*)acc->userid,           strlen(acc->userid))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  2, SQLDT_STRING, (void*)acc->pass,             strlen(acc->pass))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  3, SQLDT_ENUM,   (void*)&acc->sex,             sizeof(acc->sex))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  4, SQLDT_STRING, (void*)&acc->email,           strlen(acc->email))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  5, SQLDT_INT,    (void*)&acc->group_id,        sizeof(acc->group_id))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  6, SQLDT_UINT,   (void*)&acc->state,           sizeof(acc->state))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  7, SQLDT_LONG,   (void*)&acc->unban_time,      sizeof(acc->unban_time))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  8, SQLDT_INT,    (void*)&acc->expiration_time, sizeof(acc->expiration_time))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  9, SQLDT_UINT,   (void*)&acc->logincount,      sizeof(acc->logincount))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 10, SQLDT_STRING, (void*)&acc->lastlogin,       strlen(acc->lastlogin))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 11, SQLDT_STRING, (void*)&acc->last_ip,         strlen(acc->last_ip))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 12, SQLDT_STRING, (void*)&acc->birthdate,       strlen(acc->birthdate))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 13, SQLDT_UCHAR,  (void*)&acc->char_slots,      sizeof(acc->char_slots))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 14, SQLDT_STRING, (void*)&acc->pincode,         strlen(acc->pincode))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 15, SQLDT_LONG,   (void*)&acc->pincode_change,  sizeof(acc->pincode_change))

-		||  SQL_SUCCESS != SqlStmt_Execute(stmt)

-		) {

-			SqlStmt_ShowDebug(stmt);

-			break;

-		}

-	}

-	else

-	{// update account table

-		if( SQL_SUCCESS != SqlStmt_Prepare(stmt, "UPDATE `%s` SET `userid`=?,`user_pass`=?,`sex`=?,`email`=?,`group_id`=?,`state`=?,`unban_time`=?,`expiration_time`=?,`logincount`=?,`lastlogin`=?,`last_ip`=?,`birthdate`=?,`character_slots`=?,`pincode`=?, `pincode_change`=? WHERE `account_id` = '%d'", db->account_db, acc->account_id)

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  0, SQLDT_STRING, (void*)acc->userid,           strlen(acc->userid))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  1, SQLDT_STRING, (void*)acc->pass,             strlen(acc->pass))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  2, SQLDT_ENUM,   (void*)&acc->sex,             sizeof(acc->sex))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  3, SQLDT_STRING, (void*)acc->email,            strlen(acc->email))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  4, SQLDT_INT,    (void*)&acc->group_id,        sizeof(acc->group_id))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  5, SQLDT_UINT,   (void*)&acc->state,           sizeof(acc->state))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  6, SQLDT_LONG,   (void*)&acc->unban_time,      sizeof(acc->unban_time))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  7, SQLDT_LONG,   (void*)&acc->expiration_time, sizeof(acc->expiration_time))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  8, SQLDT_UINT,   (void*)&acc->logincount,      sizeof(acc->logincount))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt,  9, SQLDT_STRING, (void*)&acc->lastlogin,       strlen(acc->lastlogin))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 10, SQLDT_STRING, (void*)&acc->last_ip,         strlen(acc->last_ip))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 11, SQLDT_STRING, (void*)&acc->birthdate,       strlen(acc->birthdate))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 12, SQLDT_UCHAR,  (void*)&acc->char_slots,      sizeof(acc->char_slots))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 13, SQLDT_STRING, (void*)&acc->pincode,         strlen(acc->pincode))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 14, SQLDT_LONG,   (void*)&acc->pincode_change,  sizeof(acc->pincode_change))

-		||  SQL_SUCCESS != SqlStmt_Execute(stmt)

-		) {

-			SqlStmt_ShowDebug(stmt);

-			break;

-		}

-	}

-

-	// remove old account regs

-	if( SQL_SUCCESS != Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `type`='1' AND `account_id`='%d'", db->accreg_db, acc->account_id) )

-	{

-		Sql_ShowDebug(sql_handle);

-		break;

-	}

-	// insert new account regs

-	if( SQL_SUCCESS != SqlStmt_Prepare(stmt, "INSERT INTO `%s` (`type`, `account_id`, `str`, `value`) VALUES ( 1 , '%d' , ? , ? );",  db->accreg_db, acc->account_id) )

-	{

-		SqlStmt_ShowDebug(stmt);

-		break;

-	}

-	for( i = 0; i < acc->account_reg2_num; ++i )

-	{

-		if( SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, (void*)acc->account_reg2[i].str, strlen(acc->account_reg2[i].str))

-		||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, (void*)acc->account_reg2[i].value, strlen(acc->account_reg2[i].value))

-		||  SQL_SUCCESS != SqlStmt_Execute(stmt)

-		) {

-			SqlStmt_ShowDebug(stmt);

-			break;

-		}

-	}

-	if( i < acc->account_reg2_num )

-	{

-		result = false;

-		break;

-	}

-

-	// if we got this far, everything was successful

-	result = true;

-

-	} while(0);

-	// finally

-

-	result &= ( SQL_SUCCESS == Sql_QueryStr(sql_handle, (result == true) ? "COMMIT" : "ROLLBACK") );

-	SqlStmt_Free(stmt);

-

-	return result;

-}

Index: src/login/login.h

===================================================================

--- src/login/login.h	(revision 17373)

+++ src/login/login.h	(working copy)

@@ -6,6 +6,7 @@

 #include "../common/mmo.h" // NAME_LENGTH,SEX_*

 #include "../common/core.h" // CORE_ST_LAST

+#include "account.h"

 enum E_LOGINSERVER_ST

 {

@@ -40,8 +41,8 @@

 	int fd;

 };

+#define MAX_SERVERS 30

 struct mmo_char_server {

-

 	char name[20];

 	int fd;

 	uint32 ip;

@@ -49,7 +50,7 @@

 	uint16 users;       // user count on this server

 	uint16 type;        // 0=normal, 1=maintenance, 2=over 18, 3=paying, 4=P2P

 	uint16 new_;        // should display as 'new'?

-};

+} server[MAX_SERVERS]; // char server data

 struct client_hash_node {

 	int group_id;

@@ -83,10 +84,15 @@

 	char dnsbl_servs[1024];                         // comma-separated list of dnsbl servers

 	char account_engine[256];                       // name of the engine to use (defaults to auto, for the first available engine)

+	int allowed_regs;				//max number of registration

+	int time_allowed;				//registration intervall in seconds

 	int client_hash_check;							// flags for checking client md5

 	struct client_hash_node *client_hash_nodes;		// linked list containg md5 hash for each gm group

-};

+	char *loginconf_name;

+	char *msgconf_name;

+	char *lanconf_name;

+} login_config;

 #define sex_num2str(num) ( (num ==  SEX_FEMALE  ) ? 'F' : (num ==  SEX_MALE  ) ? 'M' : 'S' )

 #define sex_str2num(str) ( (str == 'F' ) ?  SEX_FEMALE  : (str == 'M' ) ?  SEX_MALE  :  SEX_SERVER  )

@@ -94,15 +100,51 @@

 #define msg_config_read(cfgName) login_msg_config_read(cfgName)

 #define msg_txt(msg_number) login_msg_txt(msg_number)

 #define do_final_msg() login_do_final_msg()

-

 int login_msg_config_read(char *cfgName);

 const char* login_msg_txt(int msg_number);

 void login_do_final_msg(void);

+//-----------------------------------------------------

+// Online User Database [Wizputer]

+//-----------------------------------------------------

+struct online_login_data {

+	int account_id;

+	int waiting_disconnect;

+	int char_server;

+};

+DBMap* online_db; // int account_id -> struct online_login_data*

-#define MAX_SERVERS 30

-extern struct mmo_char_server server[MAX_SERVERS];

-extern struct Login_Config login_config;

+//-----------------------------------------------------

+// Auth database

+//-----------------------------------------------------

+#define AUTH_TIMEOUT 30000

+struct auth_node {

+	int account_id;

+	uint32 login_id1;

+	uint32 login_id2;

+	uint32 ip;

+	char sex;

+	uint32 version;

+	uint8 clienttype;

+};

+DBMap* auth_db; // int account_id -> struct auth_node*

+AccountDB* login_get_accounts_db(void);

+

+

+bool check_encrypted(const char* str1, const char* str2, const char* passwd);

+bool check_password(const char* md5key, int passwdenc, const char* passwd, const char* refpass);

+

+int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr_t data);

+void remove_online_user(int account_id);

+struct online_login_data* add_online_user(int char_server, int account_id);

+int lan_subnetcheck(uint32 ip);

+

+int online_db_setoffline(DBKey key, DBData *data, va_list ap);

+DBData create_online_user(DBKey key, va_list args);

+

+int mmo_auth_new(const char* userid, const char* pass, const char sex, const char* last_ip);

+int mmo_auth(struct login_session_data* sd, bool isServer);

+

 #endif /* _LOGIN_H_ */

Index: src/login/sql/CMakeLists.txt

===================================================================

--- src/login/sql/CMakeLists.txt	(revision 17373)

+++ src/login/sql/CMakeLists.txt	(working copy)

@@ -8,13 +8,19 @@

 	"${SQL_LOGIN_SOURCE_DIR}/account.h"

 	"${SQL_LOGIN_SOURCE_DIR}/ipban.h"

 	"${SQL_LOGIN_SOURCE_DIR}/login.h"

+	"${SQL_LOGIN_SOURCE_DIR}/loginclif.h"

+	"${SQL_LOGIN_SOURCE_DIR}/loginchrif.h"

+	"${SQL_LOGIN_SOURCE_DIR}/logincnslif.h"

 	"${SQL_LOGIN_SOURCE_DIR}/loginlog.h"

 	)

 set( SQL_LOGIN_SOURCES

-	"${SQL_LOGIN_SOURCE_DIR}/account_sql.c"

-	"${SQL_LOGIN_SOURCE_DIR}/ipban_sql.c"

+	"${SQL_LOGIN_SOURCE_DIR}/account.c"

+	"${SQL_LOGIN_SOURCE_DIR}/ipban.c"

 	"${SQL_LOGIN_SOURCE_DIR}/login.c"

-	"${SQL_LOGIN_SOURCE_DIR}/loginlog_sql.c"

+	"${SQL_LOGIN_SOURCE_DIR}/loginclif.c"

+	"${SQL_LOGIN_SOURCE_DIR}/loginchrif.c"

+	"${SQL_LOGIN_SOURCE_DIR}/logincnslif.c"

+	"${SQL_LOGIN_SOURCE_DIR}/loginlog.c"

 	)

 set( DEPENDENCIES common_sql )

 set( LIBRARIES ${GLOBAL_LIBRARIES} )

Index: src/login/loginlog_sql.c

===================================================================

--- src/login/loginlog_sql.c	(revision 17373)

+++ src/login/loginlog_sql.c	(working copy)

@@ -1,184 +0,0 @@

-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL

-// For more information, see LICENCE in the main folder

-

-#include "../common/cbasetypes.h"

-#include "../common/mmo.h"

-#include "../common/socket.h"

-#include "../common/sql.h"

-#include "../common/strlib.h"

-#include <string.h>

-#include <stdlib.h> // exit

-

-// global sql settings (in ipban_sql.c)

-static char   global_db_hostname[32] = "127.0.0.1";

-static uint16 global_db_port = 3306;

-static char   global_db_username[32] = "ragnarok";

-static char   global_db_password[32] = "ragnarok";

-static char   global_db_database[32] = "ragnarok";

-static char   global_codepage[32] = "";

-// local sql settings

-static char   log_db_hostname[32] = "";

-static uint16 log_db_port = 0;

-static char   log_db_username[32] = "";

-static char   log_db_password[32] = "";

-static char   log_db_database[32] = "";

-static char   log_codepage[32] = "";

-static char   log_login_db[256] = "loginlog";

-

-static Sql* sql_handle = NULL;

-static bool enabled = false;

-

-

-// Returns the number of failed login attemps by the ip in the last minutes.

-unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes)

-{

-	unsigned long failures = 0;

-

-	if( !enabled )

-		return 0;

-

-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT count(*) FROM `%s` WHERE `ip` = '%s' AND `rcode` = '1' AND `time` > NOW() - INTERVAL %d MINUTE",

-		log_login_db, ip2str(ip,NULL), minutes) )// how many times failed account? in one ip.

-		Sql_ShowDebug(sql_handle);

-

-	if( SQL_SUCCESS == Sql_NextRow(sql_handle) )

-	{

-		char* data;

-		Sql_GetData(sql_handle, 0, &data, NULL);

-		failures = strtoul(data, NULL, 10);

-		Sql_FreeResult(sql_handle);

-	}

-	return failures;

-}

-

-

-/*=============================================

- * Records an event in the login log

- *---------------------------------------------*/

-void login_log(uint32 ip, const char* username, int rcode, const char* message)

-{

-	char esc_username[NAME_LENGTH*2+1];

-	char esc_message[255*2+1];

-	int retcode;

-

-	if( !enabled )

-		return;

-

-	Sql_EscapeStringLen(sql_handle, esc_username, username, strnlen(username, NAME_LENGTH));

-	Sql_EscapeStringLen(sql_handle, esc_message, message, strnlen(message, 255));

-

-	retcode = Sql_Query(sql_handle,

-		"INSERT INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%s', '%s', '%d', '%s')",

-		log_login_db, ip2str(ip,NULL), esc_username, rcode, esc_message);

-

-	if( retcode != SQL_SUCCESS )

-		Sql_ShowDebug(sql_handle);

-}

-

-bool loginlog_init(void)

-{

-	const char* username;

-	const char* password;

-	const char* hostname;

-	uint16      port;

-	const char* database;

-	const char* codepage;

-

-	if( log_db_hostname[0] != '\0' )

-	{// local settings

-		username = log_db_username;

-		password = log_db_password;

-		hostname = log_db_hostname;

-		port     = log_db_port;

-		database = log_db_database;

-		codepage = log_codepage;

-	}

-	else

-	{// global settings

-		username = global_db_username;

-		password = global_db_password;

-		hostname = global_db_hostname;

-		port     = global_db_port;

-		database = global_db_database;

-		codepage = global_codepage;

-	}

-

-	sql_handle = Sql_Malloc();

-

-	if( SQL_ERROR == Sql_Connect(sql_handle, username, password, hostname, port, database) )

-	{

-		Sql_ShowDebug(sql_handle);

-		Sql_Free(sql_handle);

-		exit(EXIT_FAILURE);

-	}

-

-	if( codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(sql_handle, codepage) )

-		Sql_ShowDebug(sql_handle);

-

-	enabled = true;

-

-	return true;

-}

-

-bool loginlog_final(void)

-{

-	Sql_Free(sql_handle);

-	sql_handle = NULL;

-	return true;

-}

-

-bool loginlog_config_read(const char* key, const char* value)

-{

-	const char* signature;

-

-	signature = "sql.";

-	if( strncmpi(key, signature, strlen(signature)) == 0 )

-	{

-		key += strlen(signature);

-		if( strcmpi(key, "db_hostname") == 0 )

-			safestrncpy(global_db_hostname, value, sizeof(global_db_hostname));

-		else

-		if( strcmpi(key, "db_port") == 0 )

-			global_db_port = (uint16)strtoul(value, NULL, 10);

-		else

-		if( strcmpi(key, "db_username") == 0 )

-			safestrncpy(global_db_username, value, sizeof(global_db_username));

-		else

-		if( strcmpi(key, "db_password") == 0 )

-			safestrncpy(global_db_password, value, sizeof(global_db_password));

-		else

-		if( strcmpi(key, "db_database") == 0 )

-			safestrncpy(global_db_database, value, sizeof(global_db_database));

-		else

-		if( strcmpi(key, "codepage") == 0 )

-			safestrncpy(global_codepage, value, sizeof(global_codepage));

-		else

-			return false;// not found

-		return true;

-	}

-

-	if( strcmpi(key, "log_db_ip") == 0 )

-		safestrncpy(log_db_hostname, value, sizeof(log_db_hostname));

-	else

-	if( strcmpi(key, "log_db_port") == 0 )

-		log_db_port = (uint16)strtoul(value, NULL, 10);

-	else

-	if( strcmpi(key, "log_db_id") == 0 )

-		safestrncpy(log_db_username, value, sizeof(log_db_username));

-	else

-	if( strcmpi(key, "log_db_pw") == 0 )

-		safestrncpy(log_db_password, value, sizeof(log_db_password));

-	else

-	if( strcmpi(key, "log_db_db") == 0 )

-		safestrncpy(log_db_database, value, sizeof(log_db_database));

-	else

-	if( strcmpi(key, "log_codepage") == 0 )

-		safestrncpy(log_codepage, value, sizeof(log_codepage));

-	else

-	if( strcmpi(key, "log_login_db") == 0 )

-		safestrncpy(log_login_db, value, sizeof(log_login_db));

-	else

-		return false;

-

-	return true;

-}

Index: src/login/ipban.c

===================================================================

--- src/login/ipban.c	(working copy)

+++ src/login/ipban.c	(working copy)

@@ -100,7 +100,7 @@

 	if( login_config.ipban_cleanup_interval > 0 )

 		// release data

 		delete_timer(cleanup_timer_id, ipban_cleanup);

-	

+

 	ipban_cleanup(0,0,0,0); // always clean up on login-server stop

 	// close connections

Index: src/login/Makefile.in

===================================================================

--- src/login/Makefile.in	(revision 17373)

+++ src/login/Makefile.in	(working copy)

@@ -12,10 +12,9 @@

 	../../3rdparty/libconfig/strbuf.h ../../3rdparty/libconfig/wincompat.h

 LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig

-LOGIN_OBJ = login.o

-LOGIN_SQL_OBJ = $(LOGIN_OBJ:%=obj_sql/%) \

-	obj_sql/account_sql.o obj_sql/ipban_sql.o obj_sql/loginlog_sql.o

-LOGIN_H = login.h account.h ipban.h loginlog.h

+LOGIN_OBJ = login.o loginclif.o loginchrif.o logincnslif.o account.o ipban.o loginlog.o

+LOGIN_H = login.h loginclif.h loginchrif.h logincnslif.h account.h ipban.h loginlog.h

+LOGIN_SQL_OBJ = $(LOGIN_OBJ:%=obj_sql/%)

 HAVE_MYSQL=@HAVE_MYSQL@

 ifeq ($(HAVE_MYSQL),yes)

@@ -62,8 +61,8 @@

 login-server_sql: obj_sql $(LOGIN_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a  $(MT19937AR_OBJ)

 	@echo "	LD	$@"

 	@@CC@ @LDFLAGS@ -o ../../login-server_sql@EXEEXT@ $(LOGIN_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@

-	    

+

 # login object files

 obj_sql/%.o: %.c $(LOGIN_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)

Index: src/login/ipban_sql.c

===================================================================

--- src/login/ipban_sql.c	(revision 17373)

+++ src/login/ipban_sql.c	(working copy)

@@ -1,258 +0,0 @@

-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL

-// For more information, see LICENCE in the main folder

-

-#include "../common/cbasetypes.h"

-#include "../common/db.h"

-#include "../common/malloc.h"

-#include "../common/sql.h"

-#include "../common/socket.h"

-#include "../common/strlib.h"

-#include "../common/timer.h"

-#include "login.h"

-#include "ipban.h"

-#include "loginlog.h"

-#include <stdlib.h>

-#include <string.h>

-

-// global sql settings

-static char   global_db_hostname[32] = "127.0.0.1";

-static uint16 global_db_port = 3306;

-static char   global_db_username[32] = "ragnarok";

-static char   global_db_password[32] = "ragnarok";

-static char   global_db_database[32] = "ragnarok";

-static char   global_codepage[32] = "";

-// local sql settings

-static char   ipban_db_hostname[32] = "";

-static uint16 ipban_db_port = 0;

-static char   ipban_db_username[32] = "";

-static char   ipban_db_password[32] = "";

-static char   ipban_db_database[32] = "";

-static char   ipban_codepage[32] = "";

-static char   ipban_table[32] = "ipbanlist";

-

-// globals

-static Sql* sql_handle = NULL;

-static int cleanup_timer_id = INVALID_TIMER;

-static bool ipban_inited = false;

-

-int ipban_cleanup(int tid, unsigned int tick, int id, intptr_t data);

-

-

-// initialize

-void ipban_init(void)

-{

-	const char* username;

-	const char* password;

-	const char* hostname;

-	uint16      port;

-	const char* database;

-	const char* codepage;

-

-	ipban_inited = true;

-

-	if( !login_config.ipban )

-		return;// ipban disabled

-

-	if( ipban_db_hostname[0] != '\0' )

-	{// local settings

-		username = ipban_db_username;

-		password = ipban_db_password;

-		hostname = ipban_db_hostname;

-		port     = ipban_db_port;

-		database = ipban_db_database;

-		codepage = ipban_codepage;

-	}

-	else

-	{// global settings

-		username = global_db_username;

-		password = global_db_password;

-		hostname = global_db_hostname;

-		port     = global_db_port;

-		database = global_db_database;

-		codepage = global_codepage;

-	}

-

-	// establish connections

-	sql_handle = Sql_Malloc();

-	if( SQL_ERROR == Sql_Connect(sql_handle, username, password, hostname, port, database) )

-	{

-		Sql_ShowDebug(sql_handle);

-		Sql_Free(sql_handle);

-		exit(EXIT_FAILURE);

-	}

-	if( codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(sql_handle, codepage) )

-		Sql_ShowDebug(sql_handle);

-

-	if( login_config.ipban_cleanup_interval > 0 )

-	{ // set up periodic cleanup of connection history and active bans

-		add_timer_func_list(ipban_cleanup, "ipban_cleanup");

-		cleanup_timer_id = add_timer_interval(gettick()+10, ipban_cleanup, 0, 0, login_config.ipban_cleanup_interval*1000);

-	} else // make sure it gets cleaned up on login-server start regardless of interval-based cleanups

-		ipban_cleanup(0,0,0,0);

-}

-

-// finalize

-void ipban_final(void)

-{

-	if( !login_config.ipban )

-		return;// ipban disabled

-

-	if( login_config.ipban_cleanup_interval > 0 )

-		// release data

-		delete_timer(cleanup_timer_id, ipban_cleanup);

-	

-	ipban_cleanup(0,0,0,0); // always clean up on login-server stop

-

-	// close connections

-	Sql_Free(sql_handle);

-	sql_handle = NULL;

-}

-

-// load configuration options

-bool ipban_config_read(const char* key, const char* value)

-{

-	const char* signature;

-

-	if( ipban_inited )

-		return false;// settings can only be changed before init

-

-	signature = "sql.";

-	if( strncmpi(key, signature, strlen(signature)) == 0 )

-	{

-		key += strlen(signature);

-		if( strcmpi(key, "db_hostname") == 0 )

-			safestrncpy(global_db_hostname, value, sizeof(global_db_hostname));

-		else

-		if( strcmpi(key, "db_port") == 0 )

-			global_db_port = (uint16)strtoul(value, NULL, 10);

-		else

-		if( strcmpi(key, "db_username") == 0 )

-			safestrncpy(global_db_username, value, sizeof(global_db_username));

-		else

-		if( strcmpi(key, "db_password") == 0 )

-			safestrncpy(global_db_password, value, sizeof(global_db_password));

-		else

-		if( strcmpi(key, "db_database") == 0 )

-			safestrncpy(global_db_database, value, sizeof(global_db_database));

-		else

-		if( strcmpi(key, "codepage") == 0 )

-			safestrncpy(global_codepage, value, sizeof(global_codepage));

-		else

-			return false;// not found

-		return true;

-	}

-

-	signature = "ipban.sql.";

-	if( strncmpi(key, signature, strlen(signature)) == 0 )

-	{

-		key += strlen(signature);

-		if( strcmpi(key, "db_hostname") == 0 )

-			safestrncpy(ipban_db_hostname, value, sizeof(ipban_db_hostname));

-		else

-		if( strcmpi(key, "db_port") == 0 )

-			ipban_db_port = (uint16)strtoul(value, NULL, 10);

-		else

-		if( strcmpi(key, "db_username") == 0 )

-			safestrncpy(ipban_db_username, value, sizeof(ipban_db_username));

-		else

-		if( strcmpi(key, "db_password") == 0 )

-			safestrncpy(ipban_db_password, value, sizeof(ipban_db_password));

-		else

-		if( strcmpi(key, "db_database") == 0 )

-			safestrncpy(ipban_db_database, value, sizeof(ipban_db_database));

-		else

-		if( strcmpi(key, "codepage") == 0 )

-			safestrncpy(ipban_codepage, value, sizeof(ipban_codepage));

-		else

-		if( strcmpi(key, "ipban_table") == 0 )

-			safestrncpy(ipban_table, value, sizeof(ipban_table));

-		else

-			return false;// not found

-		return true;

-	}

-

-	signature = "ipban.";

-	if( strncmpi(key, signature, strlen(signature)) == 0 )

-	{

-		key += strlen(signature);

-		if( strcmpi(key, "enable") == 0 )

-			login_config.ipban = (bool)config_switch(value);

-		else

-		if( strcmpi(key, "dynamic_pass_failure_ban") == 0 )

-			login_config.dynamic_pass_failure_ban = (bool)config_switch(value);

-		else

-		if( strcmpi(key, "dynamic_pass_failure_ban_interval") == 0 )

-			login_config.dynamic_pass_failure_ban_interval = atoi(value);

-		else

-		if( strcmpi(key, "dynamic_pass_failure_ban_limit") == 0 )

-			login_config.dynamic_pass_failure_ban_limit = atoi(value);

-		else

-		if( strcmpi(key, "dynamic_pass_failure_ban_duration") == 0 )

-			login_config.dynamic_pass_failure_ban_duration = atoi(value);

-		else

-			return false;// not found

-		return true;

-	}

-

-	return false;// not found

-}

-

-// check ip against active bans list

-bool ipban_check(uint32 ip)

-{

-	uint8* p = (uint8*)&ip;

-	char* data = NULL;

-	int matches;

-

-	if( !login_config.ipban )

-		return false;// ipban disabled

-

-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT count(*) FROM `%s` WHERE `rtime` > NOW() AND (`list` = '%u.*.*.*' OR `list` = '%u.%u.*.*' OR `list` = '%u.%u.%u.*' OR `list` = '%u.%u.%u.%u')",

-		ipban_table, p[3], p[3], p[2], p[3], p[2], p[1], p[3], p[2], p[1], p[0]) )

-	{

-		Sql_ShowDebug(sql_handle);

-		// close connection because we can't verify their connectivity.

-		return true;

-	}

-

-	if( SQL_ERROR == Sql_NextRow(sql_handle) )

-		return true;// Shouldn't happen, but just in case...

-

-	Sql_GetData(sql_handle, 0, &data, NULL);

-	matches = atoi(data);

-	Sql_FreeResult(sql_handle);

-

-	return( matches > 0 );

-}

-

-// log failed attempt

-void ipban_log(uint32 ip)

-{

-	unsigned long failures;

-

-	if( !login_config.ipban )

-		return;// ipban disabled

-

-	failures = loginlog_failedattempts(ip, login_config.dynamic_pass_failure_ban_interval);// how many times failed account? in one ip.

-

-	// if over the limit, add a temporary ban entry

-	if( failures >= login_config.dynamic_pass_failure_ban_limit )

-	{

-		uint8* p = (uint8*)&ip;

-		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`list`,`btime`,`rtime`,`reason`) VALUES ('%u.%u.%u.*', NOW() , NOW() +  INTERVAL %d MINUTE ,'Password error ban')",

-			ipban_table, p[3], p[2], p[1], login_config.dynamic_pass_failure_ban_duration) )

-			Sql_ShowDebug(sql_handle);

-	}

-}

-

-// remove expired bans

-int ipban_cleanup(int tid, unsigned int tick, int id, intptr_t data)

-{

-	if( !login_config.ipban )

-		return 0;// ipban disabled

-

-	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `ipbanlist` WHERE `rtime` <= NOW()") )

-		Sql_ShowDebug(sql_handle);

-

-	return 0;

-}

Index: src/login/login.c

===================================================================

--- src/login/login.c	(revision 17373)

+++ src/login/login.c	(working copy)

@@ -7,16 +7,18 @@

 #include "../common/md5calc.h"

 #include "../common/random.h"

 #include "../common/showmsg.h"

-#include "../common/socket.h"

+#include "../common/socket.h" //ip2str

 #include "../common/strlib.h"

 #include "../common/timer.h"

 #include "../common/msg_conf.h"

-#include "../common/cli.h"

-#include "../common/ers.h"

+#include "../common/utils.h"

 #include "account.h"

 #include "ipban.h"

 #include "login.h"

 #include "loginlog.h"

+#include "loginclif.h"

+#include "loginchrif.h"

+#include "logincnslif.h"

 #include <stdio.h>

 #include <stdlib.h>

@@ -24,11 +26,6 @@

 #define LOGIN_MAX_MSG 30

 static char* msg_table[LOGIN_MAX_MSG]; // Login Server messages_conf

-struct Login_Config login_config;

-

-int login_fd; // login server socket

-struct mmo_char_server server[MAX_SERVERS]; // char server data

-

 // Account engines available

 static struct{

 	AccountDB* (*constructor)(void);

@@ -53,60 +50,25 @@

 	// end of structure

 	{NULL, NULL}

 };

-// account database

-AccountDB* accounts = NULL;

-

-//Account registration flood protection [Kevin]

-int allowed_regs = 1;

-int time_allowed = 10; //in seconds

-

+AccountDB* accounts = NULL; // account database«

 // Advanced subnet check [LuzZza]

 struct s_subnet {

 	uint32 mask;

 	uint32 char_ip;

 	uint32 map_ip;

 } subnet[16];

-

 int subnet_count = 0;

-int mmo_auth_new(const char* userid, const char* pass, const char sex, const char* last_ip);

+int login_fd; // login server socket

-//-----------------------------------------------------

-// Auth database

-//-----------------------------------------------------

-#define AUTH_TIMEOUT 30000

+AccountDB* login_get_accounts_db(void){

+	return accounts;

+}

-struct auth_node {

-

-	int account_id;

-	uint32 login_id1;

-	uint32 login_id2;

-	uint32 ip;

-	char sex;

-	uint32 version;

-	uint8 clienttype;

-};

-

-static DBMap* auth_db; // int account_id -> struct auth_node*

-

-

-//-----------------------------------------------------

-// Online User Database [Wizputer]

-//-----------------------------------------------------

-struct online_login_data {

-

-	int account_id;

-	int waiting_disconnect;

-	int char_server;

-};

-

-static DBMap* online_db; // int account_id -> struct online_login_data*

-static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr_t data);

-

 /**

  * @see DBCreateData

  */

-static DBData create_online_user(DBKey key, va_list args)

+DBData create_online_user(DBKey key, va_list args)

 {

 	struct online_login_data* p;

 	CREATE(p, struct online_login_data, 1);

@@ -141,7 +103,7 @@

 	idb_remove(online_db, account_id);

 }

-static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr_t data)

+int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr_t data)

 {

 	struct online_login_data* p = (struct online_login_data*)idb_get(online_db, id);

 	if( p != NULL && p->waiting_disconnect == tid && p->account_id == id )

@@ -154,9 +116,9 @@

 }

 /**

- * @see DBApply

+ * Mark a char offline

  */

-static int online_db_setoffline(DBKey key, DBData *data, va_list ap)

+int online_db_setoffline(DBKey key, DBData *data, va_list ap)

 {

 	struct online_login_data* p = db_data2ptr(data);

 	int server = va_arg(ap, int);

@@ -192,766 +154,7 @@

 }

-//--------------------------------------------------------------------

-// Packet send to all char-servers, except one (wos: without our self)

-//--------------------------------------------------------------------

-int charif_sendallwos(int sfd, uint8* buf, size_t len)

-{

-	int i, c;

-	for( i = 0, c = 0; i < ARRAYLENGTH(server); ++i )

-	{

-		int fd = server[i].fd;

-		if( session_isValid(fd) && fd != sfd )

-		{

-			WFIFOHEAD(fd,len);

-			memcpy(WFIFOP(fd,0), buf, len);

-			WFIFOSET(fd,len);

-			++c;

-		}

-	}

-

-	return c;

-}

-

-

-/// Initializes a server structure.

-void chrif_server_init(int id)

-{

-	memset(&server[id], 0, sizeof(server[id]));

-	server[id].fd = -1;

-}

-

-

-/// Destroys a server structure.

-void chrif_server_destroy(int id)

-{

-	if( server[id].fd != -1 )

-	{

-		do_close(server[id].fd);

-		server[id].fd = -1;

-	}

-}

-

-

-/// Resets all the data related to a server.

-void chrif_server_reset(int id)

-{

-	online_db->foreach(online_db, online_db_setoffline, id); //Set all chars from this char server to offline.

-	chrif_server_destroy(id);

-	chrif_server_init(id);

-}

-

-

-/// Called when the connection to Char Server is disconnected.

-void chrif_on_disconnect(int id)

-{

-	ShowStatus("Char-server '%s' has disconnected.\n", server[id].name);

-	chrif_server_reset(id);

-}

-

-

-//-----------------------------------------------------

-// periodic ip address synchronization

-//-----------------------------------------------------

-static int sync_ip_addresses(int tid, unsigned int tick, int id, intptr_t data)

-{

-	uint8 buf[2];

-	ShowInfo("IP Sync in progress...\n");

-	WBUFW(buf,0) = 0x2735;

-	charif_sendallwos(-1, buf, 2);

-	return 0;

-}

-

-

-//-----------------------------------------------------

-// encrypted/unencrypted password check (from eApp)

-//-----------------------------------------------------

-bool check_encrypted(const char* str1, const char* str2, const char* passwd)

-{

-	char tmpstr[64+1], md5str[32+1];

-

-	safesnprintf(tmpstr, sizeof(tmpstr), "%s%s", str1, str2);

-	MD5_String(tmpstr, md5str);

-

-	return (0==strcmp(passwd, md5str));

-}

-

-bool check_password(const char* md5key, int passwdenc, const char* passwd, const char* refpass)

-{

-	if(passwdenc == 0)

-	{

-		return (0==strcmp(passwd, refpass));

-	}

-	else

-	{

-		// password mode set to 1 -> md5(md5key, refpass) enable with <passwordencrypt></passwordencrypt>

-		// password mode set to 2 -> md5(refpass, md5key) enable with <passwordencrypt2></passwordencrypt2>

-

-		return ((passwdenc&0x01) && check_encrypted(md5key, refpass, passwd)) ||

-		       ((passwdenc&0x02) && check_encrypted(refpass, md5key, passwd));

-	}

-}

-

-

-//-----------------------------------------------------

-// custom timestamp formatting (from eApp)

-//-----------------------------------------------------

-const char* timestamp2string(char* str, size_t size, time_t timestamp, const char* format)

-{

-	size_t len = strftime(str, size, format, localtime(&timestamp));

-	memset(str + len, '\0', size - len);

-	return str;

-}

-

-

-//--------------------------------------------

-// Test to know if an IP come from LAN or WAN.

-//--------------------------------------------

-int lan_subnetcheck(uint32 ip)

-{

-	int i;

-	ARR_FIND( 0, subnet_count, i, (subnet[i].char_ip & subnet[i].mask) == (ip & subnet[i].mask) );

-	return ( i < subnet_count ) ? subnet[i].char_ip : 0;

-}

-

-//----------------------------------

-// Reading Lan Support configuration

-//----------------------------------

-int login_lan_config_read(const char *lancfgName)

-{

-	FILE *fp;

-	int line_num = 0;

-	char line[1024], w1[64], w2[64], w3[64], w4[64];

-

-	if((fp = fopen(lancfgName, "r")) == NULL) {

-		ShowWarning("LAN Support configuration file is not found: %s\n", lancfgName);

-		return 1;

-	}

-

-	while(fgets(line, sizeof(line), fp))

-	{

-		line_num++;

-		if ((line[0] == '/' && line[1] == '/') || line[0] == '\n' || line[1] == '\n')

-			continue;

-

-		if(sscanf(line,"%[^:]: %[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4) != 4)

-		{

-			ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num);

-			continue;

-		}

-

-		if( strcmpi(w1, "subnet") == 0 )

-		{

-			subnet[subnet_count].mask = str2ip(w2);

-			subnet[subnet_count].char_ip = str2ip(w3);

-			subnet[subnet_count].map_ip = str2ip(w4);

-

-			if( (subnet[subnet_count].char_ip & subnet[subnet_count].mask) != (subnet[subnet_count].map_ip & subnet[subnet_count].mask) )

-			{

-				ShowError("%s: Configuration Error: The char server (%s) and map server (%s) belong to different subnetworks!\n", lancfgName, w3, w4);

-				continue;

-			}

-

-			subnet_count++;

-		}

-	}