From bff2ef1b4645a065ee105ee5a53af3a5f1f0ab48 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 30 Mar 2008 19:01:09 +0000
Subject: Yet more login server stuff:  * jA data structure compatibility
 renaming / adjustments  * mmo_account -> login_session_data, auth_data ->
 mmo_account  * made gender variable usage consistent for the entire login
 server  * rewrote TXT's new account creation procedure to match SQL's

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12450 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/login/login.h | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'src/login/login.h')

diff --git a/src/login/login.h b/src/login/login.h
index e34942816..8470578aa 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -12,21 +12,28 @@
 // supported encryption types: 1- passwordencrypt, 2- passwordencrypt2, 3- both
 #define PASSWORDENC 3
 
-struct mmo_account {
-	int version;
-	char userid[NAME_LENGTH];
-	char passwd[NAME_LENGTH];
-	int passwdenc;
+struct login_session_data {
 
 	int account_id;
 	long login_id1;
 	long login_id2;
-	char lastlogin[24];
 	char sex;
+
+	char userid[NAME_LENGTH];
+	char passwd[NAME_LENGTH];
+	int passwdenc;
+	char md5key[20];
+	uint16 md5keylen;
+
+	char lastlogin[24];
 	uint8 level;
+	int version;
+
+	int fd;
 };
 
 struct mmo_char_server {
+
 	char name[20];
 	int fd;
 	uint32 ip;
@@ -36,7 +43,7 @@ struct mmo_char_server {
 	uint16 new_;		// allows creating new chars?
 };
 
-extern struct Login_Config {
+struct Login_Config {
 
 	uint32 login_ip;                                // the address to bind to
 	uint16 login_port;                              // the port to bind to
@@ -62,13 +69,12 @@ extern struct Login_Config {
 	bool use_dnsbl;                                 // dns blacklist blocking ?
 	char dnsbl_servs[1024];                         // comma-separated list of dnsbl servers
 
-} login_config;
+};
+
+struct mmo_account {
 
-// TXT-specific account database
-// holds info about all existing accounts (entire contents of account.txt)
-extern struct auth_data {
 	int account_id;
-	uint8 sex; // 0, 1, 2
+	char sex;
 	char userid[24];
 	char pass[32+1]; // 23+1 for normal, 32+1 for md5-ed passwords
 	char lastlogin[24];
@@ -82,6 +88,7 @@ extern struct auth_data {
 	char memo[255]; // a memo field
 	int account_reg2_num;
 	struct global_reg account_reg2[ACCOUNT_REG2_NUM]; // account script variables (stored on login server)
-} *auth_dat;
+};
+
 
 #endif /* _LOGIN_H_ */
-- 
cgit v1.2.3-60-g2f50