Index: conf/login_athena.conf

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

--- conf/login_athena.conf	(revision 17365)

+++ conf/login_athena.conf	(working copy)

@@ -82,8 +82,21 @@

 check_client_version: no

 // What version we would allow to connect? (if the options above is enabled..)

-client_version_to_connect: 20

+client_version_to_connect: 30

+// Client MD5 hash check

+// If turned on, the login server will check if the client's hash matches

+// the value below, and will not connect tampered clients.

+// Note: see doc\md5_hashcheck.txt for more details.

+client_hash_check: no

+

+// Client MD5 hashes

+// A player can login with a client hash at or below the account group_id.

+// Format: group_id, hash

+client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5

+client_hash: 98, cb1ea78023d337c38e8ba5124e2338ae

+client_hash: 99, any

+

 // Store passwords as MD5 hashes instead of plaintext ?

 // NOTE: Will not work with clients that use <passwordencrypt>

 use_MD5_passwords: no

@@ -145,17 +158,5 @@

 //account.sql.account_db: login

 //account.sql.accreg_db: global_reg_value

-// Client MD5 hash check

-// If turned on, the login server will check if the client's hash matches

-// the value below, and will not connect tampered clients.

-// Note: see doc\md5_hashcheck.txt for more details.

-client_hash_check: off

-

-// Client MD5 hashes

-// A player can login with a client hash at or below the account group_id.

-// Format: group_id, hash

-client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5

-client_hash: 99, cb1ea78023d337c38e8ba5124e2338ae

-

 import: conf/inter_athena.conf

 import: conf/import/login_conf.txt

Index: db/packet_db.txt

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

--- db/packet_db.txt	(revision 17365)

+++ db/packet_db.txt	(working copy)

@@ -1416,7 +1416,7 @@

 //2009-08-18aRagexeRE

 0x07e3,6

-0x07e4,-1,itemlistwindowselected,2:4:8

+0x07e4,-1,itemlistwindowselected,2:4:8:12

 0x07e6,8

 //2009-08-25aRagexeRE

@@ -1612,7 +1612,7 @@

 //2010-11-24aRagexeRE

 packet_ver: 26

-0x0288,-1,cashshopbuy,2:4:8:10

+0x0288,-1,cashshopbuy,2:4:6:10

 0x0436,19,wanttoconnection,2:6:10:14:18

 0x035f,5,walktoxy,2

 0x0360,6,ticksend,2

@@ -1658,7 +1658,7 @@

 0x083c,19,wanttoconnection,2:6:10:14:18

 0x08aa,7,actionrequest,2:6

 0x02c4,10,useskilltoid,2:4:6

-0x0811,-1,itemlistwindowselected,2:4:8

+0x0811,-1,itemlistwindowselected,2:4:8:12

 0x890,8

 0x08a5,18,bookingregreq,2:4:6

 0x0835,-1,reqopenbuyingstore,2:4:8:9:89

@@ -1689,7 +1689,7 @@

 0x0929,26,partyinvite2,2

 0x0885,7,actionrequest,2:6

 0x0889,10,useskilltoid,2:4:6

-0x0870,-1,itemlistwindowselected,2:4:8

+0x0870,-1,itemlistwindowselected,2:4:8:12

 //0x0926,18,bookingregreq,2:4:6

 0x0815,-1,reqopenbuyingstore,2:4:8:9:89

 0x0817,2,reqclosebuyingstore,0

@@ -1707,13 +1707,13 @@

 0x089c,26,friendslistadd,2

 0x0885,5,hommenu,2:4

 0x0961,36,storagepassword,2:4:20

-0x0288,-1,cashshopbuy,2:4:8:10

+0x0288,-1,cashshopbuy,2:4:6:10

 0x091c,26,partyinvite2,2

 0x094b,19,wanttoconnection,2:6:10:14:18

 0x0369,7,actionrequest,2:6

 0x083c,10,useskilltoid,2:4:6

 0x0439,8,useitem,2:4

-0x0945,-1,itemlistwindowselected,2:4:8

+0x0945,-1,itemlistwindowselected,2:4:8:12

 0x0815,-1,reqopenbuyingstore,2:4:8:9:89

 0x0817,2,reqclosebuyingstore,0

 0x0360,6,reqclickbuyingstore,2

@@ -1769,7 +1769,7 @@

 0x08A8,36,storagepassword,2:4:20

 0x0802,26,partyinvite2,2

 0x022D,19,wanttoconnection,2:6:10:14:18

-0x0281,-1,itemlistwindowselected,2:4:8

+0x0281,-1,itemlistwindowselected,2:4:8:12

 0x035F,6,ticksend,2

 0x0202,5,changedir,2:4

 0x07E4,6,takeitem,2

@@ -1808,7 +1808,7 @@

 packet_ver: 34

 0x014f,6,guildrequestinfo,2

 0x01fd,15,repairitem,2:4:6:7:9:11:13

-//0x0281,-1,itemlistwindowselected,2:4:8

+//0x0281,-1,itemlistwindowselected,2:4:8:12

 0x035f,6,reqclickbuyingstore,2

 0x0363,6,ticksend,2

 0x0365,12,searchstoreinfolistitemclick,2:6:10

@@ -1821,7 +1821,7 @@

 0x084b,19 //fallitem4

 0x085a,90,useskilltoposinfo,2:4:6:8:10

 0x085d,18,bookingregreq,2:4:6

-0x0868,-1,itemlistwindowselected,2:4:8

+0x0868,-1,itemlistwindowselected,2:4:8:12

 0x086d,26,partyinvite2,2

 0x086f,26,friendslistadd,2

 0x0874,8,movefromkafra,2:4

@@ -1891,7 +1891,7 @@

 0x0815,-1,reqopenbuyingstore,2:4:8:9:89

 0x092D,18,bookingregreq,2:4:6

 //0x08AA,8 CZ_JOIN_BATTLE_FIELD

-0x0963,-1,itemlistwindowselected,2:4:8

+0x0963,-1,itemlistwindowselected,2:4:8:12

 0x0943,19,wanttoconnection,2:6:10:14:18

 0x0947,26,partyinvite2,2

 //0x0862,4 CZ_GANGSI_RANK

@@ -1923,7 +1923,7 @@

 0x0874,-1,reqopenbuyingstore,2:4:8:9:89

 0x089B,18,bookingregreq,2:4:6

 //0x0965,8 CZ_JOIN_BATTLE_FIELD

-0x086A,-1,itemlistwindowselected,2:4:8

+0x086A,-1,itemlistwindowselected,2:4:8:12

 0x08A9,19,wanttoconnection,2:6:10:14:18

 0x0950,26,partyinvite2,2

 //0x08AC,4 CZ_GANGSI_RANK

@@ -1955,7 +1955,7 @@

 0x0869,-1,reqopenbuyingstore,2:4:8:9:89

 0x0874,41,bookingregreq,2,4:6

 // 0x088E,8); // CZ_JOIN_BATTLE_FIELD

-0x0958,-1,itemlistwindowselected,2:4:8

+0x0958,-1,itemlistwindowselected,2:4:8:12

 0x0919,19,wanttoconnection,2:6:10:14:18

 0x08A8,26,partyinvite2,2

 // 0x0888,4); // CZ_GANGSI_RANK

@@ -1987,7 +1987,7 @@

 0x0815,-1,reqopenbuyingstore,2:4:8:9:89

 0x0365,41,bookingregreq,2:4:6

 // 0x0363,8 // CZ_JOIN_BATTLE_FIELD

-0x0281,-1,itemlistwindowselected,2:4:8

+0x0281,-1,itemlistwindowselected,2:4:8:12

 0x022D,19,wanttoconnection,2:6:10:14:18

 0x0802,26,partyinvite2,2

 // 0x0436,4 // CZ_GANGSI_RANK

@@ -2019,7 +2019,7 @@

 0x0815,-1,reqopenbuyingstore,2:4:8:9:89

 0x0365,18,bookingregreq,2:4:6

 // 0x0363,8 CZ_JOIN_BATTLE_FIELD

-0x0281,-1,itemlistwindowselected,2:4:8

+0x0281,-1,itemlistwindowselected,2:4:8:12

 0x0919,19,wanttoconnection,2:6:10:14:18

 0x0802,26,partyinvite2,2

 // 0x0436,4 CZ_GANGSI_RANK

Index: src/login/loginlog_sql.c

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

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

+++ 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_sql.c

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

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

+++ 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 17365)

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

@@ -11,12 +11,14 @@

 #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++;

-		}

-	}

-

-	if( subnet_count > 1 ) /* only useful if there is more than 1 available */

-		ShowStatus("Read information about %d subnetworks.\n", subnet_count);

-

-	fclose(fp);

-	return 0;

-}

-

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

-// Console Command Parser [Wizputer]

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

-int parse_console(const char* buf){

-	char type[64];

-	char command[64];

-	int n=0;

-

-	if( ( n = sscanf(buf, "%127[^:]:%255[^\n\r]", type, command) ) < 2 ){

-		if((n = sscanf(buf, "%63[^\n]", type))<1) return -1; //nothing to do no arg

-	}

-	if( n != 2 ){ //end string

-		ShowNotice("Type: '%s'\n",type);

-		command[0] = '\0';

-	}

-	else

-		ShowNotice("Type of command: '%s' || Command: '%s'\n",type,command);

-

-	if( n == 2 ){

-		if(strcmpi("server", type) == 0 ){

-			if( strcmpi("shutdown", command) == 0 || strcmpi("exit", command) == 0 || strcmpi("quit", command) == 0 ){

-				runflag = 0;

-			}

-			else if( strcmpi("alive", command) == 0 || strcmpi("status", command) == 0 )

-				ShowInfo(CL_CYAN"Console: "CL_BOLD"I'm Alive."CL_RESET"\n");

-		}

-		if( strcmpi("create",type) == 0 )

-		{

-			char username[NAME_LENGTH], password[NAME_LENGTH], md5password[32+1], sex; //23+1 plaintext 32+1 md5

-			bool md5 = 0;

-			if( sscanf(command, "%23s %23s %c", username, password, &sex) < 3 || strnlen(username, sizeof(username)) < 4 || strnlen(password, sizeof(password)) < 1 ){

-				ShowWarning("Console: Invalid parameters for '%s'. Usage: %s <username> <password> <sex:F/M>\n", type, type);

-				return 0;

-			}

-			if( login_config.use_md5_passwds ){

-				MD5_String(password,md5password);

-				md5 = 1;

-			}

-			if( mmo_auth_new(username,(md5?md5password:password), TOUPPER(sex), "0.0.0.0") != -1 ){

-				ShowError("Console: Account creation failed.\n");

-				return 0;

-			}

-			ShowStatus("Console: Account '%s' created successfully.\n", username);

-		}

-	}

-	else if( strcmpi("ers_report", type) == 0 ){

-		ers_report();

-	}

-	else if( strcmpi("help", type) == 0 ){

-		ShowInfo("Available commands:\n");

-		ShowInfo("\t server:shutdown => Stops the server.\n");

-		ShowInfo("\t server:alive => Checks if the server is running.\n");

-		ShowInfo("\t ers_report => Displays database usage.\n");

-		ShowInfo("\t create:<username> <password> <sex:M|F> => Creates a new account.\n");

-	}

-	else{ // commands with parameters

-

-

-

-	}

-

-	return 0;

-}

-

-

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

-// Packet parsing for char-servers

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

-int parse_fromchar(int fd){

-	int j, id;

-	uint32 ipl;

-	char ip[16];

-

-	ARR_FIND( 0, ARRAYLENGTH(server), id, server[id].fd == fd );

-	if( id == ARRAYLENGTH(server) ){// not a char server

-		ShowDebug("parse_fromchar: Disconnecting invalid session #%d (is not a char-server)\n", fd);

-		set_eof(fd);

-		do_close(fd);

-		return 0;

-	}

-

-	if( session[fd]->flag.eof ){

-		do_close(fd);

-		server[id].fd = -1;

-		chrif_on_disconnect(id);

-		return 0;

-	}

-

-	ipl = server[id].ip;

-	ip2str(ipl, ip);

-

-	while( RFIFOREST(fd) >= 2 ){

-		uint16 command = RFIFOW(fd,0);

-

-		switch( command ){

-

-		case 0x2712: // request from char-server to authenticate an account

-			if( RFIFOREST(fd) < 23 )

-				return 0;

-			else{

-				struct auth_node* node;

-				int account_id = RFIFOL(fd,2);

-				uint32 login_id1 = RFIFOL(fd,6);

-				uint32 login_id2 = RFIFOL(fd,10);

-				uint8 sex = RFIFOB(fd,14);

-				//uint32 ip_ = ntohl(RFIFOL(fd,15));

-				int request_id = RFIFOL(fd,19);

-				RFIFOSKIP(fd,23);

-

-				node = (struct auth_node*)idb_get(auth_db, account_id);

-				if( runflag == LOGINSERVER_ST_RUNNING &&

-					node != NULL &&

-					node->account_id == account_id &&

-					node->login_id1  == login_id1 &&

-					node->login_id2  == login_id2 &&

-					node->sex        == sex_num2str(sex) /*&&

-					node->ip         == ip_*/ ){// found

-					//ShowStatus("Char-server '%s': authentication of the account %d accepted (ip: %s).\n", server[id].name, account_id, ip);

-

-					// send ack

-					WFIFOHEAD(fd,25);

-					WFIFOW(fd,0) = 0x2713;

-					WFIFOL(fd,2) = account_id;

-					WFIFOL(fd,6) = login_id1;

-					WFIFOL(fd,10) = login_id2;

-					WFIFOB(fd,14) = sex;

-					WFIFOB(fd,15) = 0;// ok

-					WFIFOL(fd,16) = request_id;

-					WFIFOL(fd,20) = node->version;

-					WFIFOB(fd,24) = node->clienttype;

-					WFIFOSET(fd,25);

-

-					// each auth entry can only be used once

-					idb_remove(auth_db, account_id);

-				}else{// authentication not found

-					ShowStatus("Char-server '%s': authentication of the account %d REFUSED (ip: %s).\n", server[id].name, account_id, ip);

-					WFIFOHEAD(fd,25);

-					WFIFOW(fd,0) = 0x2713;

-					WFIFOL(fd,2) = account_id;

-					WFIFOL(fd,6) = login_id1;

-					WFIFOL(fd,10) = login_id2;

-					WFIFOB(fd,14) = sex;

-					WFIFOB(fd,15) = 1;// auth failed

-					WFIFOL(fd,16) = request_id;

-					WFIFOL(fd,20) = 0;

-					WFIFOB(fd,24) = 0;

-					WFIFOSET(fd,25);

-				}

-			}

-		break;

-

-		case 0x2714:

-			if( RFIFOREST(fd) < 6 )

-				return 0;

-			else{

-				int users = RFIFOL(fd,2);

-				RFIFOSKIP(fd,6);

-

-				// how many users on world? (update)

-				if( server[id].users != users ){

-					ShowStatus("set users %s : %d\n", server[id].name, users);

-

-					server[id].users = users;

-				}

-			}

-		break;

-

-		case 0x2715: // request from char server to change e-email from default "[email protected]"

-			if (RFIFOREST(fd) < 46)

-				return 0;

-			else{

-				struct mmo_account acc;

-				char email[40];

-

-				int account_id = RFIFOL(fd,2);

-				safestrncpy(email, (char*)RFIFOP(fd,6), 40); remove_control_chars(email);

-				RFIFOSKIP(fd,46);

-

-				if( e_mail_check(email) == 0 )

-					ShowNotice("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - e-mail is invalid (account: %d, ip: %s)\n", server[id].name, account_id, ip);

-				else if( !accounts->load_num(accounts, &acc, account_id) || strcmp(acc.email, "[email protected]") == 0 || acc.email[0] == '\0' )

-					ShowNotice("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - account doesn't exist or e-mail of account isn't default e-mail (account: %d, ip: %s).\n", server[id].name, account_id, ip);

-				else{

-					memcpy(acc.email, email, 40);

-					ShowNotice("Char-server '%s': Create an e-mail on an account with a default e-mail (account: %d, new e-mail: %s, ip: %s).\n", server[id].name, account_id, email, ip);

-					// Save

-					accounts->save(accounts, &acc);

-				}

-			}

-		break;

-

-		case 0x2716: // request account data

-			if( RFIFOREST(fd) < 6 )

-				return 0;

-			else{

-				struct mmo_account acc;

-				time_t expiration_time = 0;

-				char email[40] = "";

-				uint8 char_slots = 0;

-				int group_id = 0;

-				char birthdate[10+1] = "";

-				char pincode[PINCODE_LENGTH+1];

-				int account_id = RFIFOL(fd,2);

-

-				memset(pincode,0,PINCODE_LENGTH+1);

-

-				RFIFOSKIP(fd,6);

-

-				if( !accounts->load_num(accounts, &acc, account_id) )

-					ShowNotice("Char-server '%s': account %d NOT found (ip: %s).\n", server[id].name, account_id, ip);

-				else{

-					safestrncpy(email, acc.email, sizeof(email));

-					expiration_time = acc.expiration_time;

-					group_id = acc.group_id;

-					char_slots = acc.char_slots;

-					safestrncpy(birthdate, acc.birthdate, sizeof(birthdate));

-					safestrncpy(pincode, acc.pincode, sizeof(pincode));

-				}

-

-				WFIFOHEAD(fd,72);

-				WFIFOW(fd,0) = 0x2717;

-				WFIFOL(fd,2) = account_id;

-				safestrncpy((char*)WFIFOP(fd,6), email, 40);

-				WFIFOL(fd,46) = (uint32)expiration_time;

-				WFIFOB(fd,50) = (unsigned char)group_id;

-				WFIFOB(fd,51) = char_slots;

-				safestrncpy((char*)WFIFOP(fd,52), birthdate, 10+1);

-				safestrncpy((char*)WFIFOP(fd,63), pincode, 4+1 );

-				WFIFOL(fd,68) = (uint32)acc.pincode_change;

-				WFIFOSET(fd,72);

-			}

-		break;

-

-		case 0x2719: // ping request from charserver

-			RFIFOSKIP(fd,2);

-

-			WFIFOHEAD(fd,2);

-			WFIFOW(fd,0) = 0x2718;

-			WFIFOSET(fd,2);

-		break;

-

-		// Map server send information to change an email of an account via char-server

-		case 0x2722:	// 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B

-			if (RFIFOREST(fd) < 86)

-				return 0;

-			else{

-				struct mmo_account acc;

-				char actual_email[40];

-				char new_email[40];

-

-				int account_id = RFIFOL(fd,2);

-				safestrncpy(actual_email, (char*)RFIFOP(fd,6), 40);

-				safestrncpy(new_email, (char*)RFIFOP(fd,46), 40);

-				RFIFOSKIP(fd, 86);

-

-				if( e_mail_check(actual_email) == 0 )

-					ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual email is invalid (account: %d, ip: %s)\n", server[id].name, account_id, ip);

-				else if( e_mail_check(new_email) == 0 )

-					ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a invalid new e-mail (account: %d, ip: %s)\n", server[id].name, account_id, ip);

-				else if( strcmpi(new_email, "[email protected]") == 0 )

-					ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a default e-mail (account: %d, ip: %s)\n", server[id].name, account_id, ip);

-				else if( !accounts->load_num(accounts, &acc, account_id) )

-					ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but account doesn't exist (account: %d, ip: %s).\n", server[id].name, account_id, ip);

-				else if( strcmpi(acc.email, actual_email) != 0 )

-					ShowNotice("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual e-mail is incorrect (account: %d (%s), actual e-mail: %s, proposed e-mail: %s, ip: %s).\n", server[id].name, account_id, acc.userid, acc.email, actual_email, ip);

-				else{

-					safestrncpy(acc.email, new_email, 40);

-					ShowNotice("Char-server '%s': Modify an e-mail on an account (@email GM command) (account: %d (%s), new e-mail: %s, ip: %s).\n", server[id].name, account_id, acc.userid, new_email, ip);

-					// Save

-					accounts->save(accounts, &acc);

-				}

-			}

-		break;

-

-		case 0x2724: // Receiving an account state update request from a map-server (relayed via char-server)

-			if (RFIFOREST(fd) < 10)

-				return 0;

-			else{

-				struct mmo_account acc;

-

-				int account_id = RFIFOL(fd,2);

-				unsigned int state = RFIFOL(fd,6);

-				RFIFOSKIP(fd,10);

-

-				if( !accounts->load_num(accounts, &acc, account_id) )

-					ShowNotice("Char-server '%s': Error of Status change (account: %d not found, suggested status %d, ip: %s).\n", server[id].name, account_id, state, ip);

-				else if( acc.state == state )

-					ShowNotice("Char-server '%s':  Error of Status change - actual status is already the good status (account: %d, status %d, ip: %s).\n", server[id].name, account_id, state, ip);

-				else{

-					ShowNotice("Char-server '%s': Status change (account: %d, new status %d, ip: %s).\n", server[id].name, account_id, state, ip);

-

-					acc.state = state;

-					// Save

-					accounts->save(accounts, &acc);

-

-					// notify other servers

-					if (state != 0){

-						uint8 buf[11];

-						WBUFW(buf,0) = 0x2731;

-						WBUFL(buf,2) = account_id;

-						WBUFB(buf,6) = 0; // 0: change of state, 1: ban

-						WBUFL(buf,7) = state; // status or final date of a banishment

-						charif_sendallwos(-1, buf, 11);

-					}

-				}

-			}

-		break;

-

-		case 0x2725: // Receiving of map-server via char-server a ban request

-			if (RFIFOREST(fd) < 18)

-				return 0;

-			else{

-				struct mmo_account acc;

-

-				int account_id = RFIFOL(fd,2);

-				int year = (short)RFIFOW(fd,6);

-				int month = (short)RFIFOW(fd,8);

-				int mday = (short)RFIFOW(fd,10);

-				int hour = (short)RFIFOW(fd,12);

-				int min = (short)RFIFOW(fd,14);

-				int sec = (short)RFIFOW(fd,16);

-				RFIFOSKIP(fd,18);

-

-				if( !accounts->load_num(accounts, &acc, account_id) )

-					ShowNotice("Char-server '%s': Error of ban request (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);

-				else{

-					time_t timestamp;

-					struct tm *tmtime;

-					if (acc.unban_time == 0 || acc.unban_time < time(NULL))

-						timestamp = time(NULL); // new ban

-					else

-						timestamp = acc.unban_time; // add to existing ban

-					tmtime = localtime(&timestamp);

-					tmtime->tm_year = tmtime->tm_year + year;

-					tmtime->tm_mon  = tmtime->tm_mon + month;

-					tmtime->tm_mday = tmtime->tm_mday + mday;

-					tmtime->tm_hour = tmtime->tm_hour + hour;

-					tmtime->tm_min  = tmtime->tm_min + min;

-					tmtime->tm_sec  = tmtime->tm_sec + sec;

-					timestamp = mktime(tmtime);

-					if (timestamp == -1)

-						ShowNotice("Char-server '%s': Error of ban request (account: %d, invalid date, ip: %s).\n", server[id].name, account_id, ip);

-					else if( timestamp <= time(NULL) || timestamp == 0 )

-						ShowNotice("Char-server '%s': Error of ban request (account: %d, new date unbans the account, ip: %s).\n", server[id].name, account_id, ip);

-					else{

-						uint8 buf[11];

-						char tmpstr[24];

-						timestamp2string(tmpstr, sizeof(tmpstr), timestamp, login_config.date_format);

-						ShowNotice("Char-server '%s': Ban request (account: %d, new final date of banishment: %d (%s), ip: %s).\n", server[id].name, account_id, timestamp, tmpstr, ip);

-

-						acc.unban_time = timestamp;

-

-						// Save

-						accounts->save(accounts, &acc);

-

-						WBUFW(buf,0) = 0x2731;

-						WBUFL(buf,2) = account_id;

-						WBUFB(buf,6) = 1; // 0: change of status, 1: ban

-						WBUFL(buf,7) = (uint32)timestamp; // status or final date of a banishment

-						charif_sendallwos(-1, buf, 11);

-					}

-				}

-			}

-		break;

-

-		case 0x2727: // Change of sex (sex is reversed)

-			if( RFIFOREST(fd) < 6 )

-				return 0;

-			else{

-				struct mmo_account acc;

-

-				int account_id = RFIFOL(fd,2);

-				RFIFOSKIP(fd,6);

-

-				if( !accounts->load_num(accounts, &acc, account_id) )

-					ShowNotice("Char-server '%s': Error of sex change (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);

-				else if( acc.sex == 'S' )

-					ShowNotice("Char-server '%s': Error of sex change - account to change is a Server account (account: %d, ip: %s).\n", server[id].name, account_id, ip);

-				else{

-					unsigned char buf[7];

-					char sex = ( acc.sex == 'M' ) ? 'F' : 'M'; //Change gender

-

-					ShowNotice("Char-server '%s': Sex change (account: %d, new sex %c, ip: %s).\n", server[id].name, account_id, sex, ip);

-

-					acc.sex = sex;

-					// Save

-					accounts->save(accounts, &acc);

-

-					// announce to other servers

-					WBUFW(buf,0) = 0x2723;

-					WBUFL(buf,2) = account_id;

-					WBUFB(buf,6) = sex_str2num(sex);

-					charif_sendallwos(-1, buf, 7);

-				}

-			}

-		break;

-

-		case 0x2728:	// We receive account_reg2 from a char-server, and we send them to other map-servers.

-			if( RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2) )

-				return 0;

-			else{

-				struct mmo_account acc;

-

-				int account_id = RFIFOL(fd,4);

-

-				if( !accounts->load_num(accounts, &acc, account_id) )

-					ShowStatus("Char-server '%s': receiving (from the char-server) of account_reg2 (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);

-				else{

-					int len;

-					int p;

-					ShowNotice("char-server '%s': receiving (from the char-server) of account_reg2 (account: %d, ip: %s).\n", server[id].name, account_id, ip);

-					for( j = 0, p = 13; j < ACCOUNT_REG2_NUM && p < RFIFOW(fd,2); ++j ){

-						sscanf((char*)RFIFOP(fd,p), "%31c%n", acc.account_reg2[j].str, &len);

-						acc.account_reg2[j].str[len]='\0';

-						p +=len+1; //+1 to skip the '\0' between strings.

-						sscanf((char*)RFIFOP(fd,p), "%255c%n", acc.account_reg2[j].value, &len);

-						acc.account_reg2[j].value[len]='\0';

-						p +=len+1;

-						remove_control_chars(acc.account_reg2[j].str);

-						remove_control_chars(acc.account_reg2[j].value);

-					}

-					acc.account_reg2_num = j;

-

-					// Save

-					accounts->save(accounts, &acc);

-

-					// Sending information towards the other char-servers.

-					RFIFOW(fd,0) = 0x2729;// reusing read buffer

-					charif_sendallwos(fd, RFIFOP(fd,0), RFIFOW(fd,2));

-				}

-				RFIFOSKIP(fd,RFIFOW(fd,2));

-			}

-		break;

-

-		case 0x272a:	// Receiving of map-server via char-server an unban request

-			if( RFIFOREST(fd) < 6 )

-				return 0;

-			else{

-				struct mmo_account acc;

-

-				int account_id = RFIFOL(fd,2);

-				RFIFOSKIP(fd,6);

-

-				if( !accounts->load_num(accounts, &acc, account_id) )

-					ShowNotice("Char-server '%s': Error of UnBan request (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);

-				else if( acc.unban_time == 0 )

-					ShowNotice("Char-server '%s': Error of UnBan request (account: %d, no change for unban date, ip: %s).\n", server[id].name, account_id, ip);

-				else{

-					ShowNotice("Char-server '%s': UnBan request (account: %d, ip: %s).\n", server[id].name, account_id, ip);

-					acc.unban_time = 0;

-					accounts->save(accounts, &acc);

-				}

-			}

-		break;

-

-		case 0x272b:    // Set account_id to online [Wizputer]

-			if( RFIFOREST(fd) < 6 )

-				return 0;

-			add_online_user(id, RFIFOL(fd,2));

-			RFIFOSKIP(fd,6);

-		break;

-

-		case 0x272c:   // Set account_id to offline [Wizputer]

-			if( RFIFOREST(fd) < 6 )

-				return 0;

-			remove_online_user(RFIFOL(fd,2));

-			RFIFOSKIP(fd,6);

-		break;

-

-		case 0x272d:	// Receive list of all online accounts. [Skotlex]

-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))

-				return 0;

-			else{

-				struct online_login_data *p;

-				int aid;

-				uint32 i, users;

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

-				users = RFIFOW(fd,4);

-				for (i = 0; i < users; i++) {

-					aid = RFIFOL(fd,6+i*4);

-					p = idb_ensure(online_db, aid, create_online_user);

-					p->char_server = id;

-					if (p->waiting_disconnect != INVALID_TIMER){

-						delete_timer(p->waiting_disconnect, waiting_disconnect_timer);

-						p->waiting_disconnect = INVALID_TIMER;

-					}

-				}

-

-				RFIFOSKIP(fd,RFIFOW(fd,2));

-			}

-		break;

-

-		case 0x272e: //Request account_reg2 for a character.

-			if (RFIFOREST(fd) < 10)

-				return 0;

-			else{

-				struct mmo_account acc;

-				size_t off;

-

-				int account_id = RFIFOL(fd,2);

-				int char_id = RFIFOL(fd,6);

-				RFIFOSKIP(fd,10);

-

-				WFIFOHEAD(fd,ACCOUNT_REG2_NUM*sizeof(struct global_reg));

-				WFIFOW(fd,0) = 0x2729;

-				WFIFOL(fd,4) = account_id;

-				WFIFOL(fd,8) = char_id;

-				WFIFOB(fd,12) = 1; //Type 1 for Account2 registry

-

-				off = 13;

-				if( accounts->load_num(accounts, &acc, account_id) ){

-					for( j = 0; j < acc.account_reg2_num; j++ ){

-						if( acc.account_reg2[j].str[0] != '\0' ){

-							off += sprintf((char*)WFIFOP(fd,off), "%s", acc.account_reg2[j].str)+1; //We add 1 to consider the '\0' in place.

-							off += sprintf((char*)WFIFOP(fd,off), "%s", acc.account_reg2[j].value)+1;

-						}

-					}

-				}

-

-				WFIFOW(fd,2) = (uint16)off;

-				WFIFOSET(fd,WFIFOW(fd,2));

-			}

-		break;

-

-		case 0x2736: // WAN IP update from char-server

-			if( RFIFOREST(fd) < 6 )

-				return 0;

-			server[id].ip = ntohl(RFIFOL(fd,2));

-			ShowInfo("Updated IP of Server #%d to %d.%d.%d.%d.\n",id, CONVIP(server[id].ip));

-			RFIFOSKIP(fd,6);

-		break;

-

-		case 0x2737: //Request to set all offline.

-			ShowInfo("Setting accounts from char-server %d offline.\n", id);

-			online_db->foreach(online_db, online_db_setoffline, id);

-			RFIFOSKIP(fd,2);

-		break;

-

-		case 0x2738: //Change PIN Code for a account

-			if( RFIFOREST(fd) < 11 )

-				return 0;

-			else{

-				struct mmo_account acc;

-

-				if( accounts->load_num(accounts, &acc, RFIFOL(fd,2) ) ){

-					strncpy( acc.pincode, (char*)RFIFOP(fd,6), 5 );

-					acc.pincode_change = time( NULL );

-					accounts->save(accounts, &acc);

-				}

-

-				RFIFOSKIP(fd,11);

-			}

-		break;

-

-		case 0x2739: // PIN Code was entered wrong too often

-			if( RFIFOREST(fd) < 6 )

-				return 0;

-			else{

-				struct mmo_account acc;

-

-				if( accounts->load_num(accounts, &acc, RFIFOL(fd,2) ) ){

-					struct online_login_data* ld;

-

-					ld = (struct online_login_data*)idb_get(online_db,acc.account_id);

-

-					if( ld == NULL )

-						return 0;

-

-					login_log( host2ip(acc.last_ip), acc.userid, 100, "PIN Code check failed" );

-				}

-

-				remove_online_user(acc.account_id);

-

-				RFIFOSKIP(fd,6);

-			}

-		break;

-

-		default:

-			ShowError("parse_fromchar: Unknown packet 0x%x from a char-server! Disconnecting!\n", command);

-			set_eof(fd);

-			return 0;

-		} // switch

-	} // while

-

-	return 0;

-}

-

-

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

 // Make new account

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

@@ -964,7 +167,7 @@

 	//Account Registration Flood Protection by [Kevin]

 	if( new_reg_tick == 0 )

 		new_reg_tick = gettick();

-	if( DIFF_TICK(tick, new_reg_tick) < 0 && num_regs >= allowed_regs ) {

+	if( DIFF_TICK(tick, new_reg_tick) < 0 && num_regs >= login_config.allowed_regs ) {

 		ShowNotice("Account registration denied (registration limit exceeded)\n");

 		return 3;

 	}

@@ -1004,7 +207,7 @@

 	if( DIFF_TICK(tick, new_reg_tick) > 0 ) {// Update the registration check.

 		num_regs = 0;

-		new_reg_tick = tick + time_allowed*1000;

+		new_reg_tick = tick + login_config.time_allowed*1000;

 	}

 	++num_regs;

@@ -1041,8 +244,11 @@

 	}

 	//Client Version check

-	if( login_config.check_client_version && sd->version != login_config.client_version_to_connect )

+	if( login_config.check_client_version && sd->version != login_config.client_version_to_connect ){

+		ShowNotice("Invalid version (account: '%s', auth_vers: '%d', received version: '%d', ip: %s)\n",

+			sd->userid, login_config.client_version_to_connect, sd->version, ip);

 		return 5;

+	}

 	len = strnlen(sd->userid, NAME_LENGTH);

@@ -1093,15 +299,16 @@

 	if( login_config.client_hash_check && !isServer ) {

 		struct client_hash_node *node = login_config.client_hash_nodes;

+		uint8 anyhash[16];

 		bool match = false;

 		if( !sd->has_client_hash ) {

 			ShowNotice("Client doesn't sent client hash (account: %s, pass: %s, ip: %s)\n", sd->userid, sd->passwd, acc.state, ip);

 			return 5;

 		}

-

+		memset(anyhash,1,sizeof(anyhash));

 		while( node ) {

-			if( node->group_id <= acc.group_id && memcmp(node->hash, sd->client_hash, 16) == 0 ) {

+			if( node->group_id <= acc.group_id && (memcmp(node->hash,anyhash,16)==0 || memcmp(node->hash, sd->client_hash, 16) == 0 ) ){

 				match = true;

 				break;

 			}

@@ -1145,466 +352,97 @@

 	return -1; // account OK

 }

-void login_auth_ok(struct login_session_data* sd)

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

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

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

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

 {

-	int fd = sd->fd;

-	uint32 ip = session[fd]->client_addr;

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

-	uint8 server_num, n;

-	uint32 subnet_char_ip;

-	struct auth_node* node;

-	int i;

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

+	MD5_String(tmpstr, md5str);

-	if( runflag != LOGINSERVER_ST_RUNNING )

-	{

-		// players can only login while running

-		WFIFOHEAD(fd,3);

-		WFIFOW(fd,0) = 0x81;

-		WFIFOB(fd,2) = 1;// server closed

-		WFIFOSET(fd,3);

-		return;

-	}

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

+}

-	if( login_config.group_id_to_connect >= 0 && sd->group_id != login_config.group_id_to_connect ) {

-		ShowStatus("Connection refused: the required group id for connection is %d (account: %s, group: %d).\n", login_config.group_id_to_connect, sd->userid, sd->group_id);

-		WFIFOHEAD(fd,3);

-		WFIFOW(fd,0) = 0x81;

-		WFIFOB(fd,2) = 1; // 01 = Server closed

-		WFIFOSET(fd,3);

-		return;

-	} else if( login_config.min_group_id_to_connect >= 0 && login_config.group_id_to_connect == -1 && sd->group_id < login_config.min_group_id_to_connect ) {

-		ShowStatus("Connection refused: the minium group id required for connection is %d (account: %s, group: %d).\n", login_config.min_group_id_to_connect, sd->userid, sd->group_id);

-		WFIFOHEAD(fd,3);

-		WFIFOW(fd,0) = 0x81;

-		WFIFOB(fd,2) = 1; // 01 = Server closed

-		WFIFOSET(fd,3);

-		return;

-	}

-

-	server_num = 0;

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

-		if( session_isActive(server[i].fd) )

-			server_num++;

-

-	if( server_num == 0 )

-	{// if no char-server, don't send void list of servers, just disconnect the player with proper message

-		ShowStatus("Connection refused: there is no char-server online (account: %s).\n", sd->userid);

-		WFIFOHEAD(fd,3);

-		WFIFOW(fd,0) = 0x81;

-		WFIFOB(fd,2) = 1; // 01 = Server closed

-		WFIFOSET(fd,3);

-		return;

-	}

-

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

+{

+	if(passwdenc == 0)

 	{

-		struct online_login_data* data = (struct online_login_data*)idb_get(online_db, sd->account_id);

-		if( data )

-		{// account is already marked as online!

-			if( data->char_server > -1 )

-			{// Request char servers to kick this account out. [Skotlex]

-				uint8 buf[6];

-				ShowNotice("User '%s' is already online - Rejected.\n", sd->userid);

-				WBUFW(buf,0) = 0x2734;

-				WBUFL(buf,2) = sd->account_id;

-				charif_sendallwos(-1, buf, 6);

-				if( data->waiting_disconnect == INVALID_TIMER )

-					data->waiting_disconnect = add_timer(gettick()+AUTH_TIMEOUT, waiting_disconnect_timer, sd->account_id, 0);

-

-				WFIFOHEAD(fd,3);

-				WFIFOW(fd,0) = 0x81;

-				WFIFOB(fd,2) = 8; // 08 = Server still recognizes your last login

-				WFIFOSET(fd,3);

-				return;

-			}

-			else

-			if( data->char_server == -1 )

-			{// client has authed but did not access char-server yet

-				// wipe previous session

-				idb_remove(auth_db, sd->account_id);

-				remove_online_user(sd->account_id);

-				data = NULL;

-			}

-		}

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

 	}

-

-	login_log(ip, sd->userid, 100, "login ok");

-	ShowStatus("Connection of the account '%s' accepted.\n", sd->userid);

-

-	WFIFOHEAD(fd,47+32*server_num);

-	WFIFOW(fd,0) = 0x69;

-	WFIFOW(fd,2) = 47+32*server_num;

-	WFIFOL(fd,4) = sd->login_id1;

-	WFIFOL(fd,8) = sd->account_id;

-	WFIFOL(fd,12) = sd->login_id2;

-	WFIFOL(fd,16) = 0; // in old version, that was for ip (not more used)

-	//memcpy(WFIFOP(fd,20), sd->lastlogin, 24); // in old version, that was for name (not more used)

-	memset(WFIFOP(fd,20), 0, 24);

-	WFIFOW(fd,44) = 0; // unknown

-	WFIFOB(fd,46) = sex_str2num(sd->sex);

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

+	else

 	{

-		if( !session_isValid(server[i].fd) )

-			continue;

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

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

-		subnet_char_ip = lan_subnetcheck(ip); // Advanced subnet check [LuzZza]

-		WFIFOL(fd,47+n*32) = htonl((subnet_char_ip) ? subnet_char_ip : server[i].ip);

-		WFIFOW(fd,47+n*32+4) = ntows(htons(server[i].port)); // [!] LE byte order here [!]