Preparations for the login server TXT/SQL merge

- copied the sql login server code to /src/login
- merged the login server header files
- moved the account savefile name config setting to inter_athena.conf and renamed it to match the other settings

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

1 files changed, 11 insertions, 10 deletions

diff --git a/src/login/login.h b/src/login/login.h
index 1147d6bb6..4c1ea07e7 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -7,6 +7,7 @@
 #include "../common/mmo.h" // NAME_LENGTH
 
 #define LOGIN_CONF_NAME "conf/login_athena.conf"
+#define INTER_CONF_NAME "conf/inter_athena.conf"
 #define LAN_CONF_NAME "conf/subnet_athena.conf"
 
 // supported encryption types: 1- passwordencrypt, 2- passwordencrypt2, 3- both
@@ -38,9 +39,9 @@ struct mmo_char_server {
 	int fd;
 	uint32 ip;
 	uint16 port;
-	uint16 users;		// user count on this server
-	uint16 maintenance;	// in maintenance mode?
-	uint16 new_;		// allows creating new chars?
+	uint16 users;       // user count on this server
+	uint16 maintenance; // in maintenance mode?
+	uint16 new_;        // should display as 'new'?
 };
 
 struct Login_Config {
@@ -53,19 +54,19 @@ struct Login_Config {
 	bool console;                                   // console input system enabled?
 	bool new_account_flag;                          // autoregistration via _M/_F ?
 	int start_limited_time;                         // new account expiration time (-1: unlimited)
-//	bool case_sensitive;                            // are logins case sensitive ?
+	bool case_sensitive;                            // are logins case sensitive ?
 	bool use_md5_passwds;                           // work with password hashes instead of plaintext passwords?
-//	bool login_gm_read;                             // should the login server handle info about gm accounts?
+	bool login_gm_read;                             // should the login server handle info about gm accounts?
 	int min_level_to_connect;                       // minimum level of player/GM (0: player, 1-99: GM) to connect
 	bool online_check;                              // reject incoming players that are already registered as online ?
 	bool check_client_version;                      // check the clientversion set in the clientinfo ?
 	int client_version_to_connect;                  // the client version needed to connect (if checking is enabled)
 
-//	bool ipban;                                     // perform IP blocking (via contents of `ipbanlist`) ?
-//	bool dynamic_pass_failure_ban;                  // automatic IP blocking due to failed login attemps ?
-//	unsigned int dynamic_pass_failure_ban_interval; // how far to scan the loginlog for password failures
-//	unsigned int dynamic_pass_failure_ban_limit;    // number of failures needed to trigger the ipban
-//	unsigned int dynamic_pass_failure_ban_duration; // duration of the ipban
+	bool ipban;                                     // perform IP blocking (via contents of `ipbanlist`) ?
+	bool dynamic_pass_failure_ban;                  // automatic IP blocking due to failed login attemps ?
+	unsigned int dynamic_pass_failure_ban_interval; // how far to scan the loginlog for password failures
+	unsigned int dynamic_pass_failure_ban_limit;    // number of failures needed to trigger the ipban
+	unsigned int dynamic_pass_failure_ban_duration; // duration of the ipban
 	bool use_dnsbl;                                 // dns blacklist blocking ?
 	char dnsbl_servs[1024];                         // comma-separated list of dnsbl servers