Merge pull request #1963 from 4144/fix1908

Add missing interfaces in login server. fix issue 1908

1 files changed, 113 insertions, 93 deletions

diff --git a/src/login/login.c b/src/login/login.c
index a78276051..5b281c22d 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -52,12 +52,12 @@
 
 struct login_interface login_s;
 struct login_interface *login;
+struct s_login_dbs logindbs;
+struct lchrif_interface lchrif_s;
+struct lchrif_interface *lchrif;
 struct Login_Config login_config_;
-struct mmo_char_server server[MAX_SERVERS]; // char server data
 
-struct Account_engine account_engine[] = {
-	{account_db_sql, NULL}
-};
+struct Account_engine account_engine;
 
 // account database
 AccountDB* accounts = NULL;
@@ -164,9 +164,9 @@ int charif_sendallwos(int sfd, uint8* buf, size_t len)
 	int i, c;
 
 	nullpo_ret(buf);
-	for( i = 0, c = 0; i < ARRAYLENGTH(server); ++i )
+	for (i = 0, c = 0; i < ARRAYLENGTH(login->dbs->server); ++i)
 	{
-		int fd = server[i].fd;
+		int fd = login->dbs->server[i].fd;
 		if (sockt->session_is_valid(fd) && fd != sfd) {
 			WFIFOHEAD(fd,len);
 			memcpy(WFIFOP(fd,0), buf, len);
@@ -180,41 +180,41 @@ int charif_sendallwos(int sfd, uint8* buf, size_t len)
 
 
 /// Initializes a server structure.
-void chrif_server_init(int id)
+void lchrif_server_init(int id)
 {
 	Assert_retv(id >= 0 && id < MAX_SERVERS);
-	memset(&server[id], 0, sizeof(server[id]));
-	server[id].fd = -1;
+	memset(&login->dbs->server[id], 0, sizeof(login->dbs->server[id]));
+	login->dbs->server[id].fd = -1;
 }
 
 
 /// Destroys a server structure.
-void chrif_server_destroy(int id)
+void lchrif_server_destroy(int id)
 {
 	Assert_retv(id >= 0 && id < MAX_SERVERS);
-	if (server[id].fd != -1)
+	if (login->dbs->server[id].fd != -1)
 	{
-		sockt->close(server[id].fd);
-		server[id].fd = -1;
+		sockt->close(login->dbs->server[id].fd);
+		login->dbs->server[id].fd = -1;
 	}
 }
 
 
 /// Resets all the data related to a server.
-void chrif_server_reset(int id)
+void lchrif_server_reset(int id)
 {
 	login->online_db->foreach(login->online_db, login->online_db_setoffline, id); //Set all chars from this char server to offline.
-	chrif_server_destroy(id);
-	chrif_server_init(id);
+	lchrif->server_destroy(id);
+	lchrif->server_init(id);
 }
 
 
 /// Called when the connection to Char Server is disconnected.
-void chrif_on_disconnect(int id)
+void lchrif_on_disconnect(int id)
 {
 	Assert_retv(id >= 0 && id < MAX_SERVERS);
-	ShowStatus("Char-server '%s' has disconnected.\n", server[id].name);
-	chrif_server_reset(id);
+	ShowStatus("Char-server '%s' has disconnected.\n", login->dbs->server[id].name);
+	lchrif->server_reset(id);
 }
 
 
@@ -324,7 +324,7 @@ void login_fromchar_parse_auth(int fd, int id, const char *const ip)
 		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);
+		//ShowStatus("Char-server '%s': authentication of the account %d accepted (ip: %s).\n", login->dbs->server[id].name, account_id, ip);
 
 		// send ack
 		login->fromchar_auth_ack(fd, account_id, login_id1, login_id2, sex, request_id, node);
@@ -334,7 +334,7 @@ void login_fromchar_parse_auth(int fd, int id, const char *const ip)
 	else
 	{// authentication not found
 		nullpo_retv(ip);
-		ShowStatus("Char-server '%s': authentication of the account %d REFUSED (ip: %s).\n", server[id].name, account_id, ip);
+		ShowStatus("Char-server '%s': authentication of the account %d REFUSED (ip: %s).\n", login->dbs->server[id].name, account_id, ip);
 		login->fromchar_auth_ack(fd, account_id, login_id1, login_id2, sex, request_id, NULL);
 	}
 }
@@ -345,11 +345,11 @@ void login_fromchar_parse_update_users(int fd, int id)
 	RFIFOSKIP(fd,6);
 
 	// how many users on world? (update)
-	if( server[id].users != users )
+	if (login->dbs->server[id].users != users)
 	{
-		ShowStatus("set users %s : %d\n", server[id].name, users);
+		ShowStatus("set users %s : %d\n", login->dbs->server[id].name, users);
 
-		server[id].users = (uint16)users;
+		login->dbs->server[id].users = (uint16)users;
 	}
 }
 
@@ -363,13 +363,13 @@ void login_fromchar_parse_request_change_email(int fd, int id, const char *const
 	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);
+		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", login->dbs->server[id].name, account_id, ip);
 	else
 	if( !accounts->load_num(accounts, &acc, account_id) || strcmp(acc.email, "a@a.com") == 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);
+		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", login->dbs->server[id].name, account_id, ip);
 	else {
 		memcpy(acc.email, email, sizeof(acc.email));
-		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);
+		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", login->dbs->server[id].name, account_id, email, ip);
 		// Save
 		accounts->save(accounts, &acc);
 	}
@@ -428,7 +428,7 @@ void login_fromchar_parse_account_data(int fd, int id, const char *const ip)
 
 	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);
+		ShowNotice("Char-server '%s': account %d NOT found (ip: %s).\n", login->dbs->server[id].name, account_id, ip);
 		login->fromchar_account(fd, account_id, NULL);
 	}
 	else {
@@ -461,22 +461,22 @@ void login_fromchar_parse_change_email(int fd, int id, const char *const ip)
 	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);
+		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", login->dbs->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);
+		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", login->dbs->server[id].name, account_id, ip);
 	else
 	if( strcmpi(new_email, "a@a.com") == 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);
+		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", login->dbs->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);
+		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", login->dbs->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);
+		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", login->dbs->server[id].name, account_id, acc.userid, acc.email, actual_email, ip);
 	else {
 		safestrncpy(acc.email, new_email, sizeof(acc.email));
-		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);
+		ShowNotice("Char-server '%s': Modify an e-mail on an account (@email GM command) (account: %d (%s), new e-mail: %s, ip: %s).\n", login->dbs->server[id].name, account_id, acc.userid, new_email, ip);
 		// Save
 		accounts->save(accounts, &acc);
 	}
@@ -501,12 +501,12 @@ void login_fromchar_parse_account_update(int fd, int id, const char *const ip)
 	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 %u, ip: %s).\n", server[id].name, account_id, state, ip);
+		ShowNotice("Char-server '%s': Error of Status change (account: %d not found, suggested status %u, ip: %s).\n", login->dbs->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 %u, ip: %s).\n", server[id].name, account_id, state, ip);
+		ShowNotice("Char-server '%s':  Error of Status change - actual status is already the good status (account: %d, status %u, ip: %s).\n", login->dbs->server[id].name, account_id, state, ip);
 	else {
-		ShowNotice("Char-server '%s': Status change (account: %d, new status %u, ip: %s).\n", server[id].name, account_id, state, ip);
+		ShowNotice("Char-server '%s': Status change (account: %d, new status %u, ip: %s).\n", login->dbs->server[id].name, account_id, state, ip);
 
 		acc.state = state;
 		// Save
@@ -543,7 +543,7 @@ void login_fromchar_parse_ban(int fd, int id, const char *const ip)
 	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);
+		ShowNotice("Char-server '%s': Error of ban request (account: %d not found, ip: %s).\n", login->dbs->server[id].name, account_id, ip);
 	} else {
 		time_t timestamp;
 		struct tm *tmtime;
@@ -560,14 +560,14 @@ void login_fromchar_parse_ban(int fd, int id, const char *const ip)
 		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);
+			ShowNotice("Char-server '%s': Error of ban request (account: %d, invalid date, ip: %s).\n", login->dbs->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);
+			ShowNotice("Char-server '%s': Error of ban request (account: %d, new date unbans the account, ip: %s).\n", login->dbs->server[id].name, account_id, ip);
 		} else {
 			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: %ld (%s), ip: %s).\n",
-			           server[id].name, account_id, (long)timestamp, tmpstr, ip);
+			           login->dbs->server[id].name, account_id, (long)timestamp, tmpstr, ip);
 
 			acc.unban_time = timestamp;
 
@@ -596,15 +596,15 @@ void login_fromchar_parse_change_sex(int fd, int id, const char *const ip)
 	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);
+		ShowNotice("Char-server '%s': Error of sex change (account: %d not found, ip: %s).\n", login->dbs->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);
+		ShowNotice("Char-server '%s': Error of sex change - account to change is a Server account (account: %d, ip: %s).\n", login->dbs->server[id].name, account_id, ip);
 	else
 	{
 		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);
+		ShowNotice("Char-server '%s': Sex change (account: %d, new sex %c, ip: %s).\n", login->dbs->server[id].name, account_id, sex, ip);
 
 		acc.sex = sex;
 		// Save
@@ -622,9 +622,9 @@ void login_fromchar_parse_account_reg2(int fd, int id, const char *const ip)
 	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);
+		ShowStatus("Char-server '%s': receiving (from the char-server) of account_reg2 (account: %d not found, ip: %s).\n", login->dbs->server[id].name, account_id, ip);
 	else {
-		mmo_save_accreg2(accounts,fd,account_id,RFIFOL(fd, 8));
+		account->mmo_save_accreg2(accounts,fd,account_id,RFIFOL(fd, 8));
 	}
 	RFIFOSKIP(fd,RFIFOW(fd,2));
 }
@@ -637,13 +637,13 @@ void login_fromchar_parse_unban(int fd, int id, const char *const ip)
 	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);
+		ShowNotice("Char-server '%s': Error of Unban request (account: %d not found, ip: %s).\n", login->dbs->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);
+		ShowNotice("Char-server '%s': Error of Unban request (account: %d, no change for unban date, ip: %s).\n", login->dbs->server[id].name, account_id, ip);
 	else
 	{
-		ShowNotice("Char-server '%s': Unban request (account: %d, ip: %s).\n", server[id].name, account_id, ip);
+		ShowNotice("Char-server '%s': Unban request (account: %d, ip: %s).\n", login->dbs->server[id].name, account_id, ip);
 		acc.unban_time = 0;
 		accounts->save(accounts, &acc);
 	}
@@ -684,13 +684,13 @@ void login_fromchar_parse_request_account_reg2(int fd)
 	int char_id = RFIFOL(fd,6);
 	RFIFOSKIP(fd,10);
 
-	mmo_send_accreg2(accounts,fd,account_id,char_id);
+	account->mmo_send_accreg2(accounts,fd,account_id,char_id);
 }
 
 void login_fromchar_parse_update_wan_ip(int fd, int id)
 {
-	server[id].ip = ntohl(RFIFOL(fd,2));
-	ShowInfo("Updated IP of Server #%d to %u.%u.%u.%u.\n",id, CONVIP(server[id].ip));
+	login->dbs->server[id].ip = ntohl(RFIFOL(fd,2));
+	ShowInfo("Updated IP of Server #%d to %u.%u.%u.%u.\n",id, CONVIP(login->dbs->server[id].ip));
 	RFIFOSKIP(fd,6);
 }
 
@@ -725,7 +725,7 @@ bool login_fromchar_parse_wrong_pincode(int fd)
 			return true;
 		}
 
-		login_log(sockt->host2ip(acc.last_ip), acc.userid, 100, "PIN Code check failed"); // FIXME: Do we really want to log this with the same code as successful logins?
+		loginlog->log(sockt->host2ip(acc.last_ip), acc.userid, 100, "PIN Code check failed"); // FIXME: Do we really want to log this with the same code as successful logins?
 	}
 
 	login->remove_online_user(acc.account_id);
@@ -794,8 +794,8 @@ int login_parse_fromchar(int fd)
 	uint32 ipl;
 	char ip[16];
 
-	ARR_FIND( 0, ARRAYLENGTH(server), id, server[id].fd == fd );
-	if( id == ARRAYLENGTH(server) )
+	ARR_FIND(0, ARRAYLENGTH(login->dbs->server), id, login->dbs->server[id].fd == fd);
+	if (id == ARRAYLENGTH(login->dbs->server))
 	{// not a char server
 		ShowDebug("login_parse_fromchar: Disconnecting invalid session #%d (is not a char-server)\n", fd);
 		sockt->eof(fd);
@@ -806,12 +806,12 @@ int login_parse_fromchar(int fd)
 	if( sockt->session[fd]->flag.eof )
 	{
 		sockt->close(fd);
-		server[id].fd = -1;
-		chrif_on_disconnect(id);
+		login->dbs->server[id].fd = -1;
+		lchrif->on_disconnect(id);
 		return 0;
 	}
 
-	ipl = server[id].ip;
+	ipl = login->dbs->server[id].ip;
 	sockt->ip2str(ipl, ip);
 
 	while (RFIFOREST(fd) >= 2) {
@@ -1258,7 +1258,7 @@ void login_auth_ok(struct login_session_data* sd)
 		return;
 	}
 
-	login_log(ip, sd->userid, 100, "login ok");
+	loginlog->log(ip, sd->userid, 100, "login ok");
 	ShowStatus("Connection of the account '%s' accepted.\n", sd->userid);
 
 	// create temporary auth entry
@@ -1322,11 +1322,11 @@ void login_auth_failed(struct login_session_data *sd, int result)
 		default : error = "Unknown Error."; break;
 		}
 
-		login_log(ip, sd->userid, result, error); // FIXME: result can be 100, conflicting with the value 100 we use for successful login...
+		loginlog->log(ip, sd->userid, result, error); // FIXME: result can be 100, conflicting with the value 100 we use for successful login...
 	}
 
 	if (result == 1 && login->config->dynamic_pass_failure_ban && !sockt->trusted_ip_check(ip))
-		ipban_log(ip); // log failed password attempt
+		ipban->log(ip); // log failed password attempt
 
 	if (result == 6) {
 		struct mmo_account acc = { 0 };
@@ -1430,25 +1430,25 @@ void login_parse_request_connection(int fd, struct login_session_data* sd, const
 
 	ShowInfo("Connection request of the char-server '%s' @ %u.%u.%u.%u:%u (account: '%s', pass: '%s', ip: '%s')\n", server_name, CONVIP(server_ip), server_port, sd->userid, sd->passwd, ip);
 	sprintf(message, "charserver - %s@%u.%u.%u.%u:%u", server_name, CONVIP(server_ip), server_port);
-	login_log(sockt->session[fd]->client_addr, sd->userid, 100, message);
+	loginlog->log(sockt->session[fd]->client_addr, sd->userid, 100, message);
 
 	result = login->mmo_auth(sd, true);
 	if (core->runflag == LOGINSERVER_ST_RUNNING &&
 		result == -1 &&
 		sd->sex == 'S' &&
 		sd->account_id >= 0 &&
-		sd->account_id < ARRAYLENGTH(server) &&
-		!sockt->session_is_valid(server[sd->account_id].fd) &&
+		sd->account_id < ARRAYLENGTH(login->dbs->server) &&
+		!sockt->session_is_valid(login->dbs->server[sd->account_id].fd) &&
 		sockt->allowed_ip_check(ipl))
 	{
 		ShowStatus("Connection of the char-server '%s' accepted.\n", server_name);
-		safestrncpy(server[sd->account_id].name, server_name, sizeof(server[sd->account_id].name));
-		server[sd->account_id].fd = fd;
-		server[sd->account_id].ip = server_ip;
-		server[sd->account_id].port = server_port;
-		server[sd->account_id].users = 0;
-		server[sd->account_id].type = type;
-		server[sd->account_id].new_ = new_;
+		safestrncpy(login->dbs->server[sd->account_id].name, server_name, sizeof(login->dbs->server[sd->account_id].name));
+		login->dbs->server[sd->account_id].fd = fd;
+		login->dbs->server[sd->account_id].ip = server_ip;
+		login->dbs->server[sd->account_id].port = server_port;
+		login->dbs->server[sd->account_id].users = 0;
+		login->dbs->server[sd->account_id].type = type;
+		login->dbs->server[sd->account_id].new_ = new_;
 
 		sockt->session[fd]->func_parse = login->parse_fromchar;
 		sockt->session[fd]->flag.server = 1;
@@ -1607,7 +1607,7 @@ bool login_config_read_log(const char *filename, struct config_t *config, bool i
 bool login_config_read_account(const char *filename, struct config_t *config, bool imported)
 {
 	struct config_setting_t *setting = NULL;
-	AccountDB *db = account_engine[0].db;
+	AccountDB *db = login->dbs->account_engine->db;
 	bool retval = true;
 
 	nullpo_retr(false, filename);
@@ -1630,7 +1630,7 @@ bool login_config_read_account(const char *filename, struct config_t *config, bo
 
 	if (!db->set_property(db, config, imported))
 		retval = false;
-	if (!ipban_config_read(filename, config, imported))
+	if (!ipban->config_read(filename, config, imported))
 		retval = false;
 
 	return retval;
@@ -1913,7 +1913,7 @@ bool login_config_read(const char *filename, bool imported)
 	if (!login->config_read_users(filename, &config, imported))
 		retval = false;
 
-	if (!loginlog_config_read("conf/common/inter-server.conf", imported)) // Only inter-server
+	if (!loginlog->config_read("conf/common/inter-server.conf", imported)) // Only inter-server
 		retval = false;
 
 	if (!HPM->parse_conf(&config, filename, HPCT_LOGIN, imported))
@@ -1973,24 +1973,24 @@ int do_final(void)
 	login->clear_client_hash_nodes();
 	login->clear_dnsbl_servers();
 
-	login_log(0, "login server", 100, "login server shutdown");
+	loginlog->log(0, "login server", 100, "login server shutdown");
 
 	if (login->config->log_login)
-		loginlog_final();
+		loginlog->final();
 
-	ipban_final();
+	ipban->final();
 
-	if( account_engine[0].db )
+	if (login->dbs->account_engine->db)
 	{// destroy account engine
-		account_engine[0].db->destroy(account_engine[0].db);
-		account_engine[0].db = NULL;
+		login->dbs->account_engine->db->destroy(login->dbs->account_engine->db);
+		login->dbs->account_engine->db = NULL;
 	}
 	accounts = NULL; // destroyed in account_engine
 	login->online_db->destroy(login->online_db, NULL);
 	login->auth_db->destroy(login->auth_db, NULL);
 
-	for( i = 0; i < ARRAYLENGTH(server); ++i )
-		chrif_server_destroy(i);
+	for (i = 0; i < ARRAYLENGTH(login->dbs->server); ++i)
+		lchrif->server_destroy(i);
 
 	if( login->fd != -1 )
 	{
@@ -2033,8 +2033,8 @@ void do_shutdown_login(void)
 		core->runflag = LOGINSERVER_ST_SHUTDOWN;
 		ShowStatus("Shutting down...\n");
 		// TODO proper shutdown procedure; kick all characters, wait for acks, ...  [FlavioJS]
-		for( id = 0; id < ARRAYLENGTH(server); ++id )
-			chrif_server_reset(id);
+		for (id = 0; id < ARRAYLENGTH(login->dbs->server); ++id)
+			lchrif->server_reset(id);
 		sockt->flush_fifos();
 		core->runflag = CORE_ST_STOP;
 	}
@@ -2094,16 +2094,22 @@ int do_init(int argc, char** argv)
 {
 	int i;
 
+	account_defaults();
+	login_defaults();
+
 	// initialize engine (to accept config settings)
-	account_engine[0].db = account_engine[0].constructor();
-	accounts = account_engine[0].db;
+	login->dbs->account_engine->constructor = account->db_sql;
+	login->dbs->account_engine->db = login->dbs->account_engine->constructor();
+	accounts = login->dbs->account_engine->db;
 	if( accounts == NULL ) {
 		ShowFatalError("do_init: account engine 'sql' not found.\n");
 		exit(EXIT_FAILURE);
 	}
 
-	login_defaults();
+	ipban_defaults();
+	lchrif_defaults();
 	lclif_defaults();
+	loginlog_defaults();
 
 	// read login-server configuration
 	login->config_set_defaults();
@@ -2142,15 +2148,15 @@ int do_init(int argc, char** argv)
 	login->config_read(login->LOGIN_CONF_NAME, false);
 	sockt->net_config_read(login->NET_CONF_NAME);
 
-	for( i = 0; i < ARRAYLENGTH(server); ++i )
-		chrif_server_init(i);
+	for (i = 0; i < ARRAYLENGTH(login->dbs->server); ++i)
+		lchrif->server_init(i);
 
 	// initialize logging
 	if (login->config->log_login)
-		loginlog_init();
+		loginlog->init();
 
 	// initialize static and dynamic ipban system
-	ipban_init();
+	ipban->init();
 
 	// Online user database init
 	login->online_db = idb_alloc(DB_OPT_RELEASE_DATA);
@@ -2196,18 +2202,23 @@ int do_init(int argc, char** argv)
 #endif // CONSOLE_INPUT
 
 	ShowStatus("The login-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %u).\n\n", login->config->login_port);
-	login_log(0, "login server", 100, "login server started");
+	loginlog->log(0, "login server", 100, "login server started");
 
 	HPM->event(HPET_READY);
 
 	return 0;
 }
 
-void login_defaults(void) {
+void login_defaults(void)
+{
 	login = &login_s;
 
 	login->config = &login_config_;
 	login->accounts = accounts;
+	login->dbs = &logindbs;
+	login->dbs->account_engine = &account_engine;
+	login->dbs->account_engine->constructor = NULL;
+	login->dbs->account_engine->db = NULL;
 
 	login->mmo_auth = login_mmo_auth;
 	login->mmo_auth_new = login_mmo_auth_new;
@@ -2279,3 +2290,12 @@ void login_defaults(void) {
 	login->LOGIN_CONF_NAME = NULL;
 	login->NET_CONF_NAME = NULL;
 }
+
+void lchrif_defaults(void)
+{
+	lchrif = &lchrif_s;
+	lchrif->server_init = lchrif_server_init;
+	lchrif->server_destroy = lchrif_server_destroy;
+	lchrif->server_reset = lchrif_server_reset;
+	lchrif->on_disconnect = lchrif_on_disconnect;
+}