Create lchrif interface in login.c

2 files changed, 33 insertions, 8 deletions

diff --git a/src/login/login.c b/src/login/login.c
index 48fc81113..26f7d6da3 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -53,6 +53,8 @@
 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 Account_engine account_engine[] = {
@@ -204,8 +206,8 @@ void lchrif_server_destroy(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.
-	lchrif_server_destroy(id);
-	lchrif_server_init(id);
+	lchrif->server_destroy(id);
+	lchrif->server_init(id);
 }
 
 
@@ -214,7 +216,7 @@ void lchrif_on_disconnect(int id)
 {
 	Assert_retv(id >= 0 && id < MAX_SERVERS);
 	ShowStatus("Char-server '%s' has disconnected.\n", login->dbs->server[id].name);
-	lchrif_server_reset(id);
+	lchrif->server_reset(id);
 }
 
 
@@ -807,7 +809,7 @@ int login_parse_fromchar(int fd)
 	{
 		sockt->close(fd);
 		login->dbs->server[id].fd = -1;
-		lchrif_on_disconnect(id);
+		lchrif->on_disconnect(id);
 		return 0;
 	}
 
@@ -1990,7 +1992,7 @@ int do_final(void)
 	login->auth_db->destroy(login->auth_db, NULL);
 
 	for (i = 0; i < ARRAYLENGTH(login->dbs->server); ++i)
-		lchrif_server_destroy(i);
+		lchrif->server_destroy(i);
 
 	if( login->fd != -1 )
 	{
@@ -2034,7 +2036,7 @@ void do_shutdown_login(void)
 		ShowStatus("Shutting down...\n");
 		// TODO proper shutdown procedure; kick all characters, wait for acks, ...  [FlavioJS]
 		for (id = 0; id < ARRAYLENGTH(login->dbs->server); ++id)
-			lchrif_server_reset(id);
+			lchrif->server_reset(id);
 		sockt->flush_fifos();
 		core->runflag = CORE_ST_STOP;
 	}
@@ -2106,6 +2108,7 @@ int do_init(int argc, char** argv)
 	}
 
 	ipban_defaults();
+	lchrif_defaults();
 	login_defaults();
 	lclif_defaults();
 
@@ -2147,7 +2150,7 @@ int do_init(int argc, char** argv)
 	sockt->net_config_read(login->NET_CONF_NAME);
 
 	for (i = 0; i < ARRAYLENGTH(login->dbs->server); ++i)
-		lchrif_server_init(i);
+		lchrif->server_init(i);
 
 	// initialize logging
 	if (login->config->log_login)
@@ -2207,7 +2210,8 @@ int do_init(int argc, char** argv)
 	return 0;
 }
 
-void login_defaults(void) {
+void login_defaults(void)
+{
 	login = &login_s;
 
 	login->config = &login_config_;
@@ -2284,3 +2288,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;
+}
diff --git a/src/login/login.h b/src/login/login.h
index b846e2bb7..7b6d3371c 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -239,10 +239,22 @@ struct login_interface {
 	char *NET_CONF_NAME; ///< Network configuration filename
 };
 
+/**
+ * Login.c Interface
+ **/
+struct lchrif_interface {
+	void (*server_init) (int id);
+	void (*server_destroy) (int id);
+	void (*server_reset) (int id);
+	void (*on_disconnect) (int id);
+};
+
 #ifdef HERCULES_CORE
 void login_defaults(void);
+void lchrif_defaults(void);
 #endif // HERCULES_CORE
 
 HPShared struct login_interface *login;
+HPShared struct lchrif_interface *lchrif;
 
 #endif /* LOGIN_LOGIN_H */