Index: src/char/char.c
===================================================================
--- src/char/char.c	(revision 17365)
+++ src/char/char.c	(working copy)
@@ -33,10 +33,9 @@
 #include <stdlib.h>
 #include <malloc.h>
 
-#define MAX_STARTITEM 32
-#define CHAR_MAX_MSG 300
-static char* msg_table[CHAR_MAX_MSG]; // Login Server messages_conf
-
+// <editor-fold defaultstate="collapsed" desc="db_tablename">
+int db_use_sqldbs;
+char db_path[1024] = "db";
 char char_db[256] = "char";
 char scdata_db[256] = "sc_data";
 char cart_db[256] = "cart_inventory";
@@ -67,16 +66,17 @@
 char mercenary_db[256] = "mercenary";
 char mercenary_owner_db[256] = "mercenary_owner";
 char ragsrvinfo_db[256] = "ragsrvinfo";
+// </editor-fold>
 
+
 // show loading/saving messages
 int save_log = 1;
 
 static DBMap* char_db_; // int char_id -> struct mmo_charstatus*
 
-char db_path[1024] = "db";
+#define CHAR_MAX_MSG 300
+static char* msg_table[CHAR_MAX_MSG]; // Login Server messages_conf
 
-int db_use_sqldbs;
-
 struct mmo_map_server {
 	int fd;
 	uint32 ip;
@@ -115,103 +115,90 @@
 int log_char = 1;	// loggin char or not [devil]
 int log_inter = 1;	// loggin inter or not [devil]
 
-// Advanced subnet check [LuzZza]
-struct s_subnet {
-	uint32 mask;
-	uint32 char_ip;
-	uint32 map_ip;
-} subnet[16];
-int subnet_count = 0;
+// check for exit signal
+// 0 is saving complete
+// other is char_id
+unsigned int save_flag = 0;
+// Initial position (it's possible to set it in conf file)
+struct point start_point = { 0, 53, 111 };
+int console = 0;
+int max_connect_user = -1;
+int gm_allow_group = -1;
+int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
+int start_zeny = 0;
+int guild_exp_rate = 100;
 
-struct char_session_data {
-	bool auth; // whether the session is authed or not
-	int account_id, login_id1, login_id2, sex;
-	int found_char[MAX_CHARS]; // ids of chars on this account
-	char email[40]; // e-mail (default: a@a.com) by [Yor]
-	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-	int group_id; // permission
-	uint8 char_slots;
-	uint32 version;
-	uint8 clienttype;
-	char new_name[NAME_LENGTH];
-	char birthdate[10+1];  // YYYY-MM-DD
-	// Pincode system
-	char pincode[PINCODE_LENGTH+1];
-	uint32 pincode_seed;
-	time_t pincode_change;
-	uint16 pincode_try;
-	// Addon system
-	unsigned int char_moves[MAX_CHARS]; // character moves left
-};
-
+#define MAX_STARTITEM 32
 struct startitem {
 	int nameid; //Item ID
 	int amount; //Number of items
 	int pos; //Position (for auto-equip)
 } start_items[MAX_STARTITEM+1];
 
-int max_connect_user = -1;
-int gm_allow_group = -1;
-int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
-int start_zeny = 0;
-int guild_exp_rate = 100;
-
 // Pincode system
-#define PINCODE_OK 0
-#define PINCODE_ASK 1
-#define PINCODE_NOTSET 2
-#define PINCODE_EXPIRED 3
-#define PINCODE_NEW 4
-#define PINCODE_PASSED 7
-#define	PINCODE_WRONG 8
-
+enum pincode_state {
+	PINCODE_OK = 0,
+	PINCODE_ASK,
+	PINCODE_NOTSET,
+	PINCODE_EXPIRED,
+	PINCODE_NEW,
+	PINCODE_PASSED,
+	PINCODE_WRONG,
+	PINCODE_MAXSTATE
+};
 bool pincode_enabled = true;
 int pincode_changetime = 0;
 int pincode_maxtry = 3;
 bool pincode_force = true;
 
-void pincode_check( int fd, struct char_session_data* sd );
-void pincode_change( int fd, struct char_session_data* sd );
-void pincode_setnew( int fd, struct char_session_data* sd );
-void pincode_sendstate( int fd, struct char_session_data* sd, uint16 state );
-void pincode_notifyLoginPinUpdate( int account_id, char* pin );
-void pincode_notifyLoginPinError( int account_id );
-void pincode_decrypt( uint32 userSeed, char* pin );
-int pincode_compare( int fd, struct char_session_data* sd, char* pin );
-
 // Addon system
 bool char_move_enabled = true;
 bool char_movetoused = true;
 bool char_moves_unlimited = false;
 
-void moveCharSlot( int fd, struct char_session_data* sd, unsigned short from, unsigned short to );
-void moveCharSlotReply( int fd, struct char_session_data* sd, unsigned short index, short reason );
-
 //Custom limits for the fame lists. [Skotlex]
 int fame_list_size_chemist = MAX_FAME_LIST;
 int fame_list_size_smith = MAX_FAME_LIST;
 int fame_list_size_taekwon = MAX_FAME_LIST;
-
 // Char-server-side stored fame lists [DracoRPG]
 struct fame_list smith_fame_list[MAX_FAME_LIST];
 struct fame_list chemist_fame_list[MAX_FAME_LIST];
 struct fame_list taekwon_fame_list[MAX_FAME_LIST];
 
-// check for exit signal
-// 0 is saving complete
-// other is char_id
-unsigned int save_flag = 0;
 
-// Initial position (it's possible to set it in conf file)
-struct point start_point = { 0, 53, 111 };
+// Advanced subnet check [LuzZza]
+struct s_subnet {
+	uint32 mask;
+	uint32 char_ip;
+	uint32 map_ip;
+} subnet[16];
+int subnet_count = 0;
 
-int console = 0;
+struct char_session_data {
+	bool auth; // whether the session is authed or not
+	int account_id, login_id1, login_id2, sex;
+	int found_char[MAX_CHARS]; // ids of chars on this account
+	char email[40]; // e-mail (default: a@a.com) by [Yor]
+	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
+	int group_id; // permission
+	uint8 char_slots;
+	uint32 version;
+	uint8 clienttype;
+	char new_name[NAME_LENGTH];
+	char birthdate[10+1];  // YYYY-MM-DD
+	// Pincode system
+	char pincode[PINCODE_LENGTH+1];
+	uint32 pincode_seed;
+	time_t pincode_change;
+	uint16 pincode_try;
+	// Addon system
+	unsigned int char_moves[MAX_CHARS]; // character moves left
+};
 
 //-----------------------------------------------------
 // Auth database
 //-----------------------------------------------------
 #define AUTH_TIMEOUT 30000
-
 struct auth_node {
 	int account_id;
 	int char_id;
@@ -223,13 +210,11 @@
 	int group_id;
 	unsigned changing_mapservers : 1;
 };
-
 static DBMap* auth_db; // int account_id -> struct auth_node*
 
 //-----------------------------------------------------
 // Online User Database
 //-----------------------------------------------------
-
 struct online_char_data {
 	int account_id;
 	int char_id;
@@ -238,8 +223,12 @@
 	short server; // -2: unknown server, -1: not connected, 0+: id of server
 	bool pincode_success;
 };
+static DBMap* online_char_db; // int account_id -> struct online_char_data*
 
-static DBMap* online_char_db; // int account_id -> struct online_char_data*
+
+int parse_char(int fd);
+int parse_fromlogin(int fd);
+
 static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr_t data);
 int delete_char_sql(int char_id);
 
@@ -1951,8 +1940,12 @@
 }
 
 //struct PACKET_CH_CHARLIST_REQ { 0x0 short PacketType}
-void char_parse_req_charlist(int fd, struct char_session_data* sd){
+int char_parse_req_charlist(int fd, struct char_session_data* sd){
+	if( RFIFOREST(fd) < 2 )
+		return 0;
+	RFIFOSKIP(fd,2);
 	mmo_char_send099d(fd,sd);
+	return 1;
 }
 
 //----------------------------------------
@@ -2001,13 +1994,12 @@
 
 void mmo_char_send(int fd, struct char_session_data* sd){
 	ShowInfo("sd->version = %d\n",sd->version);
-#if PACKETVER >= 20130000
+	if(sd->version > 34){
 		mmo_char_send082d(fd,sd);
 		char_charlist_notify(fd,sd);
 		char_block_character(fd,sd);
-#endif
-	//@FIXME dump from kro doesn't show 6b transmission
-	mmo_char_send006b(fd,sd);
+	}
+	mmo_char_send006b(fd,sd); //@FIXME dump from kro doesn't show 6b transmission
 }
 
 int char_married(int pl1, int pl2)
@@ -2184,369 +2176,6 @@
 		ShowStatus("Awaiting maps from map-server.\n");
 }
 
-
-int parse_fromlogin(int fd) {
-	struct char_session_data* sd = NULL;
-	int i;
-
-	// only process data from the login-server
-	if( fd != login_fd ) {
-		ShowDebug("parse_fromlogin: Disconnecting invalid session #%d (is not the login-server)\n", fd);
-		do_close(fd);
-		return 0;
-	}
-
-	if( session[fd]->flag.eof ) {
-		do_close(fd);
-		login_fd = -1;
-		loginif_on_disconnect();
-		return 0;
-	} else if ( session[fd]->flag.ping ) {/* we've reached stall time */
-		if( DIFF_TICK(last_tick, session[fd]->rdata_tick) > (stall_time * 2) ) {/* we can't wait any longer */
-			set_eof(fd);
-			return 0;
-		} else if( session[fd]->flag.ping != 2 ) { /* we haven't sent ping out yet */
-			WFIFOHEAD(fd,2);// sends a ping packet to login server (will receive pong 0x2718)
-			WFIFOW(fd,0) = 0x2719;
-			WFIFOSET(fd,2);
-
-			session[fd]->flag.ping = 2;
-		}
-	}
-
-	sd = (struct char_session_data*)session[fd]->session_data;
-
-	while(RFIFOREST(fd) >= 2) {
-		uint16 command = RFIFOW(fd,0);
-
-		switch( command )
-		{
-
-		// acknowledgement of connect-to-loginserver request
-		case 0x2711:
-			if (RFIFOREST(fd) < 3)
-				return 0;
-
-			if (RFIFOB(fd,2)) {
-				//printf("connect login server error : %d\n", RFIFOB(fd,2));
-				ShowError("Can not connect to login-server.\n");
-				ShowError("The server communication passwords (default s1/p1) are probably invalid.\n");
-				ShowError("Also, please make sure your login db has the correct communication username/passwords and the gender of the account is S.\n");
-				ShowError("The communication passwords are set in map_athena.conf and char_athena.conf\n");
-				set_eof(fd);
-				return 0;
-			} else {
-				ShowStatus("Connected to login-server (connection #%d).\n", fd);
-				loginif_on_ready();
-			}
-			RFIFOSKIP(fd,3);
-		break;
-
-		// acknowledgement of account authentication request
-		case 0x2713:
-			if (RFIFOREST(fd) < 25)
-				return 0;
-		{
-			int account_id = RFIFOL(fd,2);
-			uint32 login_id1 = RFIFOL(fd,6);
-			uint32 login_id2 = RFIFOL(fd,10);
-			uint8 sex = RFIFOB(fd,14);
-			uint8 result = RFIFOB(fd,15);
-			int request_id = RFIFOL(fd,16);
-			uint32 version = RFIFOL(fd,20);
-			uint8 clienttype = RFIFOB(fd,24);
-			RFIFOSKIP(fd,25);
-
-			if( session_isActive(request_id) && (sd=(struct char_session_data*)session[request_id]->session_data) &&
-				!sd->auth && sd->account_id == account_id && sd->login_id1 == login_id1 && sd->login_id2 == login_id2 && sd->sex == sex )
-			{
-				int client_fd = request_id;
-				sd->version = version;
-				sd->clienttype = clienttype;
-				switch( result )
-				{
-				case 0:// ok
-					char_auth_ok(client_fd, sd);
-					break;
-				case 1:// auth failed
-					WFIFOHEAD(client_fd,3);
-					WFIFOW(client_fd,0) = 0x6c;
-					WFIFOB(client_fd,2) = 0;// rejected from server
-					WFIFOSET(client_fd,3);
-					break;
-				}
-			}
-		}
-		break;
-
-		case 0x2717: // account data
-			if (RFIFOREST(fd) < 72)
-				return 0;
-
-			// find the authenticated session with this account id
-			ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) );
-			if( i < fd_max )
-			{
-				int server_id;
-				memcpy(sd->email, RFIFOP(fd,6), 40);
-				sd->expiration_time = (time_t)RFIFOL(fd,46);
-				sd->group_id = RFIFOB(fd,50);
-				sd->char_slots = RFIFOB(fd,51);
-				if( sd->char_slots > MAX_CHARS ) {
-					ShowError("Account '%d' `character_slots` column is higher than supported MAX_CHARS (%d), update MAX_CHARS in mmo.h! capping to MAX_CHARS...\n",sd->account_id,sd->char_slots);
-					sd->char_slots = MAX_CHARS;/* cap to maximum */
-				} else if ( !sd->char_slots )/* no value aka 0 in sql */
-					sd->char_slots = MAX_CHARS;/* cap to maximum */
-				safestrncpy(sd->birthdate, (const char*)RFIFOP(fd,52), sizeof(sd->birthdate));
-				safestrncpy(sd->pincode, (const char*)RFIFOP(fd,63), sizeof(sd->pincode));
-				sd->pincode_change = (time_t)RFIFOL(fd,68);
-				ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map[0] );
-				// continued from char_auth_ok...
-				if( server_id == ARRAYLENGTH(server) || //server not online, bugreport:2359
-					(max_connect_user == 0 && sd->group_id != gm_allow_group) ||
-					( max_connect_user > 0 && count_users() >= max_connect_user && sd->group_id != gm_allow_group ) ) {
-					// refuse connection (over populated)
-					WFIFOHEAD(i,3);
-					WFIFOW(i,0) = 0x6c;
-					WFIFOW(i,2) = 0;
-					WFIFOSET(i,3);
-				} else {
-					// send characters to player
-					mmo_char_send(i, sd);
-#if PACKETVER >=  20110309
-					if( pincode_enabled ){
-						// PIN code system enabled
-						if( strlen( sd->pincode ) <= 0 ){
-							// No PIN code has been set yet
-							if( pincode_force ){
-								pincode_sendstate( i, sd, PINCODE_NEW );
-							}else{
-								pincode_sendstate( i, sd, PINCODE_PASSED );
-							}
-						}else{
-							if( !pincode_changetime || ( sd->pincode_change + pincode_changetime ) > time(NULL) ){
-								struct online_char_data* node = (struct online_char_data*)idb_get( online_char_db, sd->account_id );
-
-								if( node != NULL && node->pincode_success ){
-									// User has already passed the check
-									pincode_sendstate( i, sd, PINCODE_PASSED );
-								}else{
-									// Ask user for his PIN code
-									pincode_sendstate( i, sd, PINCODE_ASK );
-								}
-							}else{
-								// User hasnt changed his PIN code too long
-								pincode_sendstate( i, sd, PINCODE_EXPIRED );
-							}
-						}
-					}else{
-						// PIN code system disabled
-						pincode_sendstate( i, sd, PINCODE_OK );
-					}
-#endif
-				}
-			}
-			RFIFOSKIP(fd,72);
-		break;
-
-		// login-server alive packet
-		case 0x2718:
-			if (RFIFOREST(fd) < 2)
-				return 0;
-			RFIFOSKIP(fd,2);
-			session[fd]->flag.ping = 0;
-		break;
-
-		// changesex reply
-		case 0x2723:
-			if (RFIFOREST(fd) < 7)
-				return 0;
-		{
-			unsigned char buf[7];
-
-			int acc = RFIFOL(fd,2);
-			int sex = RFIFOB(fd,6);
-			RFIFOSKIP(fd,7);
-
-			if( acc > 0 )
-			{// TODO: Is this even possible?
-				int char_id[MAX_CHARS];
-				int class_[MAX_CHARS];
-				int guild_id[MAX_CHARS];
-				int num;
-				char* data;
-
-				struct auth_node* node = (struct auth_node*)idb_get(auth_db, acc);
-				if( node != NULL )
-					node->sex = sex;
-
-				// get characters
-				if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `char_id`,`class`,`guild_id` FROM `%s` WHERE `account_id` = '%d'", char_db, acc) )
-					Sql_ShowDebug(sql_handle);
-				for( i = 0; i < MAX_CHARS && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
-				{
-					Sql_GetData(sql_handle, 0, &data, NULL); char_id[i] = atoi(data);
-					Sql_GetData(sql_handle, 1, &data, NULL); class_[i] = atoi(data);
-					Sql_GetData(sql_handle, 2, &data, NULL); guild_id[i] = atoi(data);
-				}
-				num = i;
-				for( i = 0; i < num; ++i )
-				{
-					if( class_[i] == JOB_BARD || class_[i] == JOB_DANCER ||
-						class_[i] == JOB_CLOWN || class_[i] == JOB_GYPSY ||
-						class_[i] == JOB_BABY_BARD || class_[i] == JOB_BABY_DANCER ||
-						class_[i] == JOB_MINSTREL || class_[i] == JOB_WANDERER ||
-						class_[i] == JOB_MINSTREL_T || class_[i] == JOB_WANDERER_T ||
-						class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER ||
-						class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
-					{
-						// job modification
-						if( class_[i] == JOB_BARD || class_[i] == JOB_DANCER )
-							class_[i] = (sex ? JOB_BARD : JOB_DANCER);
-						else if( class_[i] == JOB_CLOWN || class_[i] == JOB_GYPSY )
-							class_[i] = (sex ? JOB_CLOWN : JOB_GYPSY);
-						else if( class_[i] == JOB_BABY_BARD || class_[i] == JOB_BABY_DANCER )
-							class_[i] = (sex ? JOB_BABY_BARD : JOB_BABY_DANCER);
-						else if( class_[i] == JOB_MINSTREL || class_[i] == JOB_WANDERER )
-							class_[i] = (sex ? JOB_MINSTREL : JOB_WANDERER);
-						else if( class_[i] == JOB_MINSTREL_T || class_[i] == JOB_WANDERER_T )
-							class_[i] = (sex ? JOB_MINSTREL_T : JOB_WANDERER_T);
-						else if( class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER )
-							class_[i] = (sex ? JOB_BABY_MINSTREL : JOB_BABY_WANDERER);
-						else if( class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
-							class_[i] = (sex ? JOB_KAGEROU : JOB_OBORO);
-					}
-
-					if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `class`='%d', `weapon`='0', `shield`='0', `head_top`='0', `head_mid`='0', `head_bottom`='0' WHERE `char_id`='%d'", char_db, class_[i], char_id[i]) )
-						Sql_ShowDebug(sql_handle);
-
-					if( guild_id[i] )// If there is a guild, update the guild_member data [Skotlex]
-						inter_guild_sex_changed(guild_id[i], acc, char_id[i], sex);
-				}
-				Sql_FreeResult(sql_handle);
-
-				// disconnect player if online on char-server
-				disconnect_player(acc);
-			}
-
-			// notify all mapservers about this change
-			WBUFW(buf,0) = 0x2b0d;
-			WBUFL(buf,2) = acc;
-			WBUFB(buf,6) = sex;
-			mapif_sendall(buf, 7);
-		}
-		break;
-
-		// reply to an account_reg2 registry request
-		case 0x2729:
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-
-		{	//Receive account_reg2 registry, forward to map servers.
-			unsigned char buf[13+ACCOUNT_REG2_NUM*sizeof(struct global_reg)];
-			memcpy(buf,RFIFOP(fd,0), RFIFOW(fd,2));
-			WBUFW(buf,0) = 0x3804; //Map server can now receive all kinds of reg values with the same packet. [Skotlex]
-			mapif_sendall(buf, WBUFW(buf,2));
-			RFIFOSKIP(fd, RFIFOW(fd,2));
-		}
-		break;
-
-		// State change of account/ban notification (from login-server)
-		case 0x2731:
-			if (RFIFOREST(fd) < 11)
-				return 0;
-
-		{	// send to all map-servers to disconnect the player
-			unsigned char buf[11];
-			WBUFW(buf,0) = 0x2b14;
-			WBUFL(buf,2) = RFIFOL(fd,2);
-			WBUFB(buf,6) = RFIFOB(fd,6); // 0: change of statut, 1: ban
-			WBUFL(buf,7) = RFIFOL(fd,7); // status or final date of a banishment
-			mapif_sendall(buf, 11);
-		}
-			// disconnect player if online on char-server
-			disconnect_player(RFIFOL(fd,2));
-
-			RFIFOSKIP(fd,11);
-		break;
-
-		// Login server request to kick a character out. [Skotlex]
-		case 0x2734:
-			if (RFIFOREST(fd) < 6)
-				return 0;
-		{
-			int aid = RFIFOL(fd,2);
-			struct online_char_data* character = (struct online_char_data*)idb_get(online_char_db, aid);
-			RFIFOSKIP(fd,6);
-			if( character != NULL )
-			{// account is already marked as online!
-				if( character->server > -1 )
-				{	//Kick it from the map server it is on.
-					mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
-					if (character->waiting_disconnect == INVALID_TIMER)
-						character->waiting_disconnect = add_timer(gettick()+AUTH_TIMEOUT, chardb_waiting_disconnect, character->account_id, 0);
-				}
-				else
-				{// Manual kick from char server.
-					struct char_session_data *tsd;
-					int i;
-					ARR_FIND( 0, fd_max, i, session[i] && (tsd = (struct char_session_data*)session[i]->session_data) && tsd->account_id == aid );
-					if( i < fd_max )
-					{
-						WFIFOHEAD(i,3);
-						WFIFOW(i,0) = 0x81;
-						WFIFOB(i,2) = 2; // "Someone has already logged in with this id"
-						WFIFOSET(i,3);
-						set_eof(i);
-					}
-					else // still moving to the map-server
-						set_char_offline(-1, aid);
-				}
-			}
-			idb_remove(auth_db, aid);// reject auth attempts from map-server
-		}
-		break;
-
-		// ip address update signal from login server
-		case 0x2735:
-		{
-			unsigned char buf[2];
-			uint32 new_ip = 0;
-
-			WBUFW(buf,0) = 0x2b1e;
-			mapif_sendall(buf, 2);
-
-			new_ip = host2ip(login_ip_str);
-			if (new_ip && new_ip != login_ip)
-				login_ip = new_ip; //Update login ip, too.
-
-			new_ip = host2ip(char_ip_str);
-			if (new_ip && new_ip != char_ip)
-			{	//Update ip.
-				char_ip = new_ip;
-				ShowInfo("Updating IP for [%s].\n", char_ip_str);
-				// notify login server about the change
-				WFIFOHEAD(fd,6);
-				WFIFOW(fd,0) = 0x2736;
-				WFIFOL(fd,2) = htonl(char_ip);
-				WFIFOSET(fd,6);
-			}
-
-			RFIFOSKIP(fd,2);
-		}
-		break;
-
-		default:
-			ShowError("Unknown packet 0x%04x received from login-server, disconnecting.\n", command);
-			set_eof(fd);
-			return 0;
-		}
-	}
-
-	RFIFOFLUSH(fd);
-	return 0;
-}
-
 int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data);
 int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data);
 
@@ -2779,729 +2408,851 @@
 	mapif_server_reset(id);
 }
 
+void do_init_mapif(void)
+{
+	int i;
+	for( i = 0; i < ARRAYLENGTH(server); ++i )
+		mapif_server_init(i);
+}
 
-int parse_frommap(int fd)
+void do_final_mapif(void)
 {
+	int i;
+	for( i = 0; i < ARRAYLENGTH(server); ++i )
+		mapif_server_destroy(i);
+}
+
+// Searches for the mapserver that has a given map (and optionally ip/port, if not -1).
+// If found, returns the server's index in the 'server' array (otherwise returns -1).
+int search_mapserver(unsigned short map, uint32 ip, uint16 port)
+{
 	int i, j;
-	int id;
 
-	ARR_FIND( 0, ARRAYLENGTH(server), id, server[id].fd == fd );
-	if( id == ARRAYLENGTH(server) )
-	{// not a map server
-		ShowDebug("parse_frommap: Disconnecting invalid session #%d (is not a map-server)\n", fd);
-		do_close(fd);
-		return 0;
+	for(i = 0; i < ARRAYLENGTH(server); i++)
+	{
+		if (server[i].fd > 0
+		&& (ip == (uint32)-1 || server[i].ip == ip)
+		&& (port == (uint16)-1 || server[i].port == port))
+		{
+			for (j = 0; server[i].map[j]; j++)
+				if (server[i].map[j] == map)
+					return i;
+		}
 	}
-	if( session[fd]->flag.eof )
-	{
-		do_close(fd);
-		server[id].fd = -1;
-		mapif_on_disconnect(id);
+
+	return -1;
+}
+
+// Initialization process (currently only initialization inter_mapif)
+static int char_mapif_init(int fd)
+{
+	return inter_mapif_init(fd);
+}
+
+//--------------------------------------------
+// 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) );
+	if( i < subnet_count ) {
+		ShowInfo("Subnet check [%u.%u.%u.%u]: Matches "CL_CYAN"%u.%u.%u.%u/%u.%u.%u.%u"CL_RESET"\n", CONVIP(ip), CONVIP(subnet[i].char_ip & subnet[i].mask), CONVIP(subnet[i].mask));
+		return subnet[i].map_ip;
+	} else {
+		ShowInfo("Subnet check [%u.%u.%u.%u]: "CL_CYAN"WAN"CL_RESET"\n", CONVIP(ip));
 		return 0;
 	}
+}
 
-	while(RFIFOREST(fd) >= 2){
-		switch(RFIFOW(fd,0)){
 
-		case 0x2afa: // Receiving map names list from the map-server
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
+//For use in packets that depend on an sd being present [Skotlex]
+#define FIFOSD_CHECK(rest) { if(RFIFOREST(fd) < rest) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,rest); return 0; } }
 
-			memset(server[id].map, 0, sizeof(server[id].map));
-			j = 0;
-			for(i = 4; i < RFIFOW(fd,2); i += 4) {
-				server[id].map[j] = RFIFOW(fd,i);
-				j++;
-			}
+///
+/// Map IF
+///
 
-			ShowStatus("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n",
-						id, j, CONVIP(server[id].ip), server[id].port);
-			ShowStatus("Map-server %d loading complete.\n", id);
+int char_parsemap_getmapname(int fd, int id){
+	int j = 0, i = 0;
+	if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+		return 0;
 
-			// send name for wisp to player
-			WFIFOHEAD(fd, 3 + NAME_LENGTH);
-			WFIFOW(fd,0) = 0x2afb;
-			WFIFOB(fd,2) = 0;
-			memcpy(WFIFOP(fd,3), wisp_server_name, NAME_LENGTH);
-			WFIFOSET(fd,3+NAME_LENGTH);
+	memset(server[id].map, 0, sizeof(server[id].map));
+	for(i = 4; i < RFIFOW(fd,2); i += 4) {
+		server[id].map[j] = RFIFOW(fd,i);
+		j++;
+	}
 
-			char_send_fame_list(fd); //Send fame list.
+	ShowStatus("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n",
+				id, j, CONVIP(server[id].ip), server[id].port);
+	ShowStatus("Map-server %d loading complete.\n", id);
 
-			{
-			unsigned char buf[16384];
-			int x;
-			if (j == 0) {
-				ShowWarning("Map-server %d has NO maps.\n", id);
-			} else {
-				// Transmitting maps information to the other map-servers
-				WBUFW(buf,0) = 0x2b04;
-				WBUFW(buf,2) = j * 4 + 10;
-				WBUFL(buf,4) = htonl(server[id].ip);
-				WBUFW(buf,8) = htons(server[id].port);
-				memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 4);
-				mapif_sendallwos(fd, buf, WBUFW(buf,2));
-			}
-			// Transmitting the maps of the other map-servers to the new map-server
-			for(x = 0; x < ARRAYLENGTH(server); x++) {
-				if (server[x].fd > 0 && x != id) {
-					WFIFOHEAD(fd,10 +4*ARRAYLENGTH(server[x].map));
-					WFIFOW(fd,0) = 0x2b04;
-					WFIFOL(fd,4) = htonl(server[x].ip);
-					WFIFOW(fd,8) = htons(server[x].port);
-					j = 0;
-					for(i = 0; i < ARRAYLENGTH(server[x].map); i++)
-						if (server[x].map[i])
-							WFIFOW(fd,10+(j++)*4) = server[x].map[i];
-					if (j > 0) {
-						WFIFOW(fd,2) = j * 4 + 10;
-						WFIFOSET(fd,WFIFOW(fd,2));
-					}
+	// send name for wisp to player
+	WFIFOHEAD(fd, 3 + NAME_LENGTH);
+	WFIFOW(fd,0) = 0x2afb;
+	WFIFOB(fd,2) = 0;
+	memcpy(WFIFOP(fd,3), wisp_server_name, NAME_LENGTH);
+	WFIFOSET(fd,3+NAME_LENGTH);
+
+	char_send_fame_list(fd); //Send fame list.
+
+	{
+		unsigned char buf[16384];
+		int x;
+		if (j == 0) {
+			ShowWarning("Map-server %d has NO maps.\n", id);
+		} else {
+			// Transmitting maps information to the other map-servers
+			WBUFW(buf,0) = 0x2b04;
+			WBUFW(buf,2) = j * 4 + 10;
+			WBUFL(buf,4) = htonl(server[id].ip);
+			WBUFW(buf,8) = htons(server[id].port);
+			memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 4);
+			mapif_sendallwos(fd, buf, WBUFW(buf,2));
+		}
+		// Transmitting the maps of the other map-servers to the new map-server
+		for(x = 0; x < ARRAYLENGTH(server); x++) {
+			if (server[x].fd > 0 && x != id) {
+				WFIFOHEAD(fd,10 +4*ARRAYLENGTH(server[x].map));
+				WFIFOW(fd,0) = 0x2b04;
+				WFIFOL(fd,4) = htonl(server[x].ip);
+				WFIFOW(fd,8) = htons(server[x].port);
+				j = 0;
+				for(i = 0; i < ARRAYLENGTH(server[x].map); i++)
+					if (server[x].map[i])
+						WFIFOW(fd,10+(j++)*4) = server[x].map[i];
+				if (j > 0) {
+					WFIFOW(fd,2) = j * 4 + 10;
+					WFIFOSET(fd,WFIFOW(fd,2));
 				}
 			}
-			}
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-		break;
+		}
+	}
+	RFIFOSKIP(fd,RFIFOW(fd,2));
+	return 1;
+}
 
-		case 0x2afc: //Packet command is now used for sc_data request. [Skotlex]
-			if (RFIFOREST(fd) < 10)
-				return 0;
+int char_parsemap_askscdata(int fd, int id){
+	if (RFIFOREST(fd) < 10)
+		return 0;
+	{
+#ifdef ENABLE_SC_SAVING
+		int aid, cid;
+		aid = RFIFOL(fd,2);
+		cid = RFIFOL(fd,6);
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT type, tick, val1, val2, val3, val4 from `%s` WHERE `account_id` = '%d' AND `char_id`='%d'",
+			scdata_db, aid, cid) )
 		{
-#ifdef ENABLE_SC_SAVING
-			int aid, cid;
-			aid = RFIFOL(fd,2);
-			cid = RFIFOL(fd,6);
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT type, tick, val1, val2, val3, val4 from `%s` WHERE `account_id` = '%d' AND `char_id`='%d'",
-				scdata_db, aid, cid) )
+			Sql_ShowDebug(sql_handle);
+			return 0;
+		}
+		if( Sql_NumRows(sql_handle) > 0 )
+		{
+			struct status_change_data scdata;
+			int count;
+			char* data;
+
+			WFIFOHEAD(fd,14+50*sizeof(struct status_change_data));
+			WFIFOW(fd,0) = 0x2b1d;
+			WFIFOL(fd,4) = aid;
+			WFIFOL(fd,8) = cid;
+			for( count = 0; count < 50 && SQL_SUCCESS == Sql_NextRow(sql_handle); ++count )
 			{
-				Sql_ShowDebug(sql_handle);
-				break;
+				Sql_GetData(sql_handle, 0, &data, NULL); scdata.type = atoi(data);
+				Sql_GetData(sql_handle, 1, &data, NULL); scdata.tick = atoi(data);
+				Sql_GetData(sql_handle, 2, &data, NULL); scdata.val1 = atoi(data);
+				Sql_GetData(sql_handle, 3, &data, NULL); scdata.val2 = atoi(data);
+				Sql_GetData(sql_handle, 4, &data, NULL); scdata.val3 = atoi(data);
+				Sql_GetData(sql_handle, 5, &data, NULL); scdata.val4 = atoi(data);
+				memcpy(WFIFOP(fd, 14+count*sizeof(struct status_change_data)), &scdata, sizeof(struct status_change_data));
 			}
-			if( Sql_NumRows(sql_handle) > 0 )
+			if (count >= 50)
+				ShowWarning("Too many status changes for %d:%d, some of them were not loaded.\n", aid, cid);
+			if (count > 0)
 			{
-				struct status_change_data scdata;
-				int count;
-				char* data;
+				WFIFOW(fd,2) = 14 + count*sizeof(struct status_change_data);
+				WFIFOW(fd,12) = count;
+				WFIFOSET(fd,WFIFOW(fd,2));
 
-				WFIFOHEAD(fd,14+50*sizeof(struct status_change_data));
-				WFIFOW(fd,0) = 0x2b1d;
-				WFIFOL(fd,4) = aid;
-				WFIFOL(fd,8) = cid;
-				for( count = 0; count < 50 && SQL_SUCCESS == Sql_NextRow(sql_handle); ++count )
-				{
-					Sql_GetData(sql_handle, 0, &data, NULL); scdata.type = atoi(data);
-					Sql_GetData(sql_handle, 1, &data, NULL); scdata.tick = atoi(data);
-					Sql_GetData(sql_handle, 2, &data, NULL); scdata.val1 = atoi(data);
-					Sql_GetData(sql_handle, 3, &data, NULL); scdata.val2 = atoi(data);
-					Sql_GetData(sql_handle, 4, &data, NULL); scdata.val3 = atoi(data);
-					Sql_GetData(sql_handle, 5, &data, NULL); scdata.val4 = atoi(data);
-					memcpy(WFIFOP(fd, 14+count*sizeof(struct status_change_data)), &scdata, sizeof(struct status_change_data));
-				}
-				if (count >= 50)
-					ShowWarning("Too many status changes for %d:%d, some of them were not loaded.\n", aid, cid);
-				if (count > 0)
-				{
-					WFIFOW(fd,2) = 14 + count*sizeof(struct status_change_data);
-					WFIFOW(fd,12) = count;
-					WFIFOSET(fd,WFIFOW(fd,2));
-
-					//Clear the data once loaded.
-					if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, aid, cid) )
-						Sql_ShowDebug(sql_handle);
-				}
+				//Clear the data once loaded.
+				if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, aid, cid) )
+					Sql_ShowDebug(sql_handle);
 			}
-			Sql_FreeResult(sql_handle);
+		}
+		Sql_FreeResult(sql_handle);
 #endif
-			RFIFOSKIP(fd, 10);
-		}
-		break;
+		RFIFOSKIP(fd, 10);
+	}
+	return 1;
+}
 
-		case 0x2afe: //set MAP user count
-			if (RFIFOREST(fd) < 4)
-				return 0;
-			if (RFIFOW(fd,2) != server[id].users) {
-				server[id].users = RFIFOW(fd,2);
-				ShowInfo("User Count: %d (Server: %d)\n", server[id].users, id);
-			}
-			RFIFOSKIP(fd, 4);
-			break;
+int char_parsemap_getusercount(int fd, int id){
+	if (RFIFOREST(fd) < 4)
+		return 0;
+	if (RFIFOW(fd,2) != server[id].users) {
+		server[id].users = RFIFOW(fd,2);
+		ShowInfo("User Count: %d (Server: %d)\n", server[id].users, id);
+	}
+	RFIFOSKIP(fd, 4);
+	return 1;
+}
 
-		case 0x2aff: //set MAP users
-			if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-		{
-			//TODO: When data mismatches memory, update guild/party online/offline states.
-			int aid, cid;
-			struct online_char_data* character;
+int char_parsemap_regmapuser(int fd, int id){
+	int i;
+	if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2))
+		return 0;
+	{
+		//TODO: When data mismatches memory, update guild/party online/offline states.
+		int aid, cid;
+		struct online_char_data* character;
 
-			server[id].users = RFIFOW(fd,4);
-			online_char_db->foreach(online_char_db,char_db_setoffline,id); //Set all chars from this server as 'unknown'
-			for(i = 0; i < server[id].users; i++) {
-				aid = RFIFOL(fd,6+i*8);
-				cid = RFIFOL(fd,6+i*8+4);
-				character = idb_ensure(online_char_db, aid, create_online_char_data);
-				if( character->server > -1 && character->server != id )
-				{
-					ShowNotice("Set map user: Character (%d:%d) marked on map server %d, but map server %d claims to have (%d:%d) online!\n",
-						character->account_id, character->char_id, character->server, id, aid, cid);
-					mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
-				}
-				character->server = id;
-				character->char_id = cid;
+		server[id].users = RFIFOW(fd,4);
+		online_char_db->foreach(online_char_db,char_db_setoffline,id); //Set all chars from this server as 'unknown'
+		for(i = 0; i < server[id].users; i++) {
+			aid = RFIFOL(fd,6+i*8);
+			cid = RFIFOL(fd,6+i*8+4);
+			character = idb_ensure(online_char_db, aid, create_online_char_data);
+			if( character->server > -1 && character->server != id )
+			{
+				ShowNotice("Set map user: Character (%d:%d) marked on map server %d, but map server %d claims to have (%d:%d) online!\n",
+					character->account_id, character->char_id, character->server, id, aid, cid);
+				mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
 			}
-			//If any chars remain in -2, they will be cleaned in the cleanup timer.
-			RFIFOSKIP(fd,RFIFOW(fd,2));
+			character->server = id;
+			character->char_id = cid;
 		}
-		break;
+		//If any chars remain in -2, they will be cleaned in the cleanup timer.
+		RFIFOSKIP(fd,RFIFOW(fd,2));
+	}
+	return 1;
+}
 
-		case 0x2b01: // Receive character data from map-server for saving
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
+int char_parsemap_reqsavechar(int fd, int id){
+	if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+			return 0;
+	{
+		int aid = RFIFOL(fd,4), cid = RFIFOL(fd,8), size = RFIFOW(fd,2);
+		struct online_char_data* character;
+
+		if (size - 13 != sizeof(struct mmo_charstatus))
 		{
-			int aid = RFIFOL(fd,4), cid = RFIFOL(fd,8), size = RFIFOW(fd,2);
-			struct online_char_data* character;
-
-			if (size - 13 != sizeof(struct mmo_charstatus))
-			{
-				ShowError("parse_from_map (save-char): Size mismatch! %d != %d\n", size-13, sizeof(struct mmo_charstatus));
-				RFIFOSKIP(fd,size);
-				break;
-			}
-			//Check account only if this ain't final save. Final-save goes through because of the char-map reconnect
-			if (RFIFOB(fd,12) || RFIFOB(fd,13) || (
-				(character = (struct online_char_data*)idb_get(online_char_db, aid)) != NULL &&
-				character->char_id == cid))
-			{
-				struct mmo_charstatus char_dat;
-				memcpy(&char_dat, RFIFOP(fd,13), sizeof(struct mmo_charstatus));
-				mmo_char_tosql(cid, &char_dat);
-			} else {	//This may be valid on char-server reconnection, when re-sending characters that already logged off.
-				ShowError("parse_from_map (save-char): Received data for non-existant/offline character (%d:%d).\n", aid, cid);
-				set_char_online(id, cid, aid);
-			}
-
-			if (RFIFOB(fd,12))
-			{	//Flag, set character offline after saving. [Skotlex]
-				set_char_offline(cid, aid);
-				WFIFOHEAD(fd,10);
-				WFIFOW(fd,0) = 0x2b21; //Save ack only needed on final save.
-				WFIFOL(fd,2) = aid;
-				WFIFOL(fd,6) = cid;
-				WFIFOSET(fd,10);
-			}
+			ShowError("parse_from_map (save-char): Size mismatch! %d != %d\n", size-13, sizeof(struct mmo_charstatus));
 			RFIFOSKIP(fd,size);
+			return 0;
 		}
-		break;
+		//Check account only if this ain't final save. Final-save goes through because of the char-map reconnect
+		if (RFIFOB(fd,12) || RFIFOB(fd,13) || (
+			(character = (struct online_char_data*)idb_get(online_char_db, aid)) != NULL &&
+			character->char_id == cid))
+		{
+			struct mmo_charstatus char_dat;
+			memcpy(&char_dat, RFIFOP(fd,13), sizeof(struct mmo_charstatus));
+			mmo_char_tosql(cid, &char_dat);
+		} else {	//This may be valid on char-server reconnection, when re-sending characters that already logged off.
+			ShowError("parse_from_map (save-char): Received data for non-existant/offline character (%d:%d).\n", aid, cid);
+			set_char_online(id, cid, aid);
+		}
 
-		case 0x2b02: // req char selection
-			if( RFIFOREST(fd) < 18 )
-				return 0;
-			else{
-				int account_id = RFIFOL(fd,2);
-				uint32 login_id1 = RFIFOL(fd,6);
-				uint32 login_id2 = RFIFOL(fd,10);
-				uint32 ip = RFIFOL(fd,14);
-				RFIFOSKIP(fd,18);
+		if (RFIFOB(fd,12))
+		{	//Flag, set character offline after saving. [Skotlex]
+			set_char_offline(cid, aid);
+			WFIFOHEAD(fd,10);
+			WFIFOW(fd,0) = 0x2b21; //Save ack only needed on final save.
+			WFIFOL(fd,2) = aid;
+			WFIFOL(fd,6) = cid;
+			WFIFOSET(fd,10);
+		}
+		RFIFOSKIP(fd,size);
+	}
+	return 1;
+}
 
-				if( runflag != CHARSERVER_ST_RUNNING ){
-					WFIFOHEAD(fd,7);
-					WFIFOW(fd,0) = 0x2b03;
-					WFIFOL(fd,2) = account_id;
-					WFIFOB(fd,6) = 0;// not ok
-					WFIFOSET(fd,7);
-				}else{
-					struct auth_node* node;
+int char_parsemap_authok(int fd, int id){
+	if( RFIFOREST(fd) < 18 )
+		return 0;
+	else{
+		int account_id = RFIFOL(fd,2);
+		uint32 login_id1 = RFIFOL(fd,6);
+		uint32 login_id2 = RFIFOL(fd,10);
+		uint32 ip = RFIFOL(fd,14);
+		RFIFOSKIP(fd,18);
 
-					// create temporary auth entry
-					CREATE(node, struct auth_node, 1);
-					node->account_id = account_id;
-					node->char_id = 0;
-					node->login_id1 = login_id1;
-					node->login_id2 = login_id2;
-					//node->sex = 0;
-					node->ip = ntohl(ip);
-					//node->expiration_time = 0; // unlimited/unknown time by default (not display in map-server)
-					//node->gmlevel = 0;
-					idb_put(auth_db, account_id, node);
+		if( runflag != CHARSERVER_ST_RUNNING ){
+			WFIFOHEAD(fd,7);
+			WFIFOW(fd,0) = 0x2b03;
+			WFIFOL(fd,2) = account_id;
+			WFIFOB(fd,6) = 0;// not ok
+			WFIFOSET(fd,7);
+		}else{
+			struct auth_node* node;
 
-					//Set char to "@ char select" in online db [Kevin]
-					set_char_charselect(account_id);
+			// create temporary auth entry
+			CREATE(node, struct auth_node, 1);
+			node->account_id = account_id;
+			node->char_id = 0;
+			node->login_id1 = login_id1;
+			node->login_id2 = login_id2;
+			//node->sex = 0;
+			node->ip = ntohl(ip);
+			//node->expiration_time = 0; // unlimited/unknown time by default (not display in map-server)
+			//node->gmlevel = 0;
+			idb_put(auth_db, account_id, node);
 
-					{
-						struct online_char_data* character = (struct online_char_data*)idb_get(online_char_db, account_id);
+			//Set char to "@ char select" in online db [Kevin]
+			set_char_charselect(account_id);
 
-						if( character != NULL ){
-							character->pincode_success = true;
-						}
-					}
+			{
+				struct online_char_data* character = (struct online_char_data*)idb_get(online_char_db, account_id);
 
-					WFIFOHEAD(fd,7);
-					WFIFOW(fd,0) = 0x2b03;
-					WFIFOL(fd,2) = account_id;
-					WFIFOB(fd,6) = 1;// ok
-					WFIFOSET(fd,7);
+				if( character != NULL ){
+					character->pincode_success = true;
 				}
 			}
-		break;
 
-		case 0x2b05: // request "change map server"
-			if (RFIFOREST(fd) < 39)
-				return 0;
-		{
-			int map_id, map_fd = -1;
-			struct mmo_charstatus* char_data;
-			struct mmo_charstatus char_dat;
+			WFIFOHEAD(fd,7);
+			WFIFOW(fd,0) = 0x2b03;
+			WFIFOL(fd,2) = account_id;
+			WFIFOB(fd,6) = 1;// ok
+			WFIFOSET(fd,7);
+		}
+	}
+	return 1;
+}
 
-			map_id = search_mapserver(RFIFOW(fd,18), ntohl(RFIFOL(fd,24)), ntohs(RFIFOW(fd,28))); //Locate mapserver by ip and port.
-			if (map_id >= 0)
-				map_fd = server[map_id].fd;
-			//Char should just had been saved before this packet, so this should be safe. [Skotlex]
+int char_parsemap_reqchangemapserv(int fd, int id){
+	if (RFIFOREST(fd) < 39)
+		return 0;
+	{
+		int map_id, map_fd = -1;
+		struct mmo_charstatus* char_data;
+		struct mmo_charstatus char_dat;
+
+		map_id = search_mapserver(RFIFOW(fd,18), ntohl(RFIFOL(fd,24)), ntohs(RFIFOW(fd,28))); //Locate mapserver by ip and port.
+		if (map_id >= 0)
+			map_fd = server[map_id].fd;
+		//Char should just had been saved before this packet, so this should be safe. [Skotlex]
+		char_data = (struct mmo_charstatus*)uidb_get(char_db_,RFIFOL(fd,14));
+		if (char_data == NULL) {	//Really shouldn't happen.
+			mmo_char_fromsql(RFIFOL(fd,14), &char_dat, true);
 			char_data = (struct mmo_charstatus*)uidb_get(char_db_,RFIFOL(fd,14));
-			if (char_data == NULL) {	//Really shouldn't happen.
-				mmo_char_fromsql(RFIFOL(fd,14), &char_dat, true);
-				char_data = (struct mmo_charstatus*)uidb_get(char_db_,RFIFOL(fd,14));
-			}
+		}
 
-			if( runflag == CHARSERVER_ST_RUNNING &&
-				session_isActive(map_fd) &&
-				char_data )
-			{	//Send the map server the auth of this player.
-				struct online_char_data* data;
-				struct auth_node* node;
+		if( runflag == CHARSERVER_ST_RUNNING &&
+			session_isActive(map_fd) &&
+			char_data )
+		{	//Send the map server the auth of this player.
+			struct online_char_data* data;
+			struct auth_node* node;
 
-				//Update the "last map" as this is where the player must be spawned on the new map server.
-				char_data->last_point.map = RFIFOW(fd,18);
-				char_data->last_point.x = RFIFOW(fd,20);
-				char_data->last_point.y = RFIFOW(fd,22);
-				char_data->sex = RFIFOB(fd,30);
+			//Update the "last map" as this is where the player must be spawned on the new map server.
+			char_data->last_point.map = RFIFOW(fd,18);
+			char_data->last_point.x = RFIFOW(fd,20);
+			char_data->last_point.y = RFIFOW(fd,22);
+			char_data->sex = RFIFOB(fd,30);
 
-				// create temporary auth entry
-				CREATE(node, struct auth_node, 1);
-				node->account_id = RFIFOL(fd,2);
-				node->char_id = RFIFOL(fd,14);
-				node->login_id1 = RFIFOL(fd,6);
-				node->login_id2 = RFIFOL(fd,10);
-				node->sex = RFIFOB(fd,30);
-				node->expiration_time = 0; // FIXME (this thing isn't really supported we could as well purge it instead of fixing)
-				node->ip = ntohl(RFIFOL(fd,31));
-				node->group_id = RFIFOL(fd,35);
-				node->changing_mapservers = 1;
-				idb_put(auth_db, RFIFOL(fd,2), node);
+			// create temporary auth entry
+			CREATE(node, struct auth_node, 1);
+			node->account_id = RFIFOL(fd,2);
+			node->char_id = RFIFOL(fd,14);
+			node->login_id1 = RFIFOL(fd,6);
+			node->login_id2 = RFIFOL(fd,10);
+			node->sex = RFIFOB(fd,30);
+			node->expiration_time = 0; // FIXME (this thing isn't really supported we could as well purge it instead of fixing)
+			node->ip = ntohl(RFIFOL(fd,31));
+			node->group_id = RFIFOL(fd,35);
+			node->changing_mapservers = 1;
+			idb_put(auth_db, RFIFOL(fd,2), node);
 
-				data = idb_ensure(online_char_db, RFIFOL(fd,2), create_online_char_data);
-				data->char_id = char_data->char_id;
-				data->server = map_id; //Update server where char is.
+			data = idb_ensure(online_char_db, RFIFOL(fd,2), create_online_char_data);
+			data->char_id = char_data->char_id;
+			data->server = map_id; //Update server where char is.
 
-				//Reply with an ack.
-				WFIFOHEAD(fd,30);
-				WFIFOW(fd,0) = 0x2b06;
-				memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
-				WFIFOSET(fd,30);
-			} else { //Reply with nak
-				WFIFOHEAD(fd,30);
-				WFIFOW(fd,0) = 0x2b06;
-				memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
-				WFIFOL(fd,6) = 0; //Set login1 to 0.
-				WFIFOSET(fd,30);
-			}
-			RFIFOSKIP(fd,39);
+			//Reply with an ack.
+			WFIFOHEAD(fd,30);
+			WFIFOW(fd,0) = 0x2b06;
+			memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
+			WFIFOSET(fd,30);
+		} else { //Reply with nak
+			WFIFOHEAD(fd,30);
+			WFIFOW(fd,0) = 0x2b06;
+			memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
+			WFIFOL(fd,6) = 0; //Set login1 to 0.
+			WFIFOSET(fd,30);
 		}
-		break;
+		RFIFOSKIP(fd,39);
+	}
+	return 1;
+}
 
-		case 0x2b07: // Remove RFIFOL(fd,6) (friend_id) from RFIFOL(fd,2) (char_id) friend list [Ind]
-			if (RFIFOREST(fd) < 10)
-				return 0;
-			{
-				int char_id, friend_id;
-				char_id = RFIFOL(fd,2);
-				friend_id = RFIFOL(fd,6);
-				if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d' AND `friend_id`='%d' LIMIT 1",
-					friend_db, char_id, friend_id) ) {
-					Sql_ShowDebug(sql_handle);
-					break;
-				}
-				RFIFOSKIP(fd,10);
-			}
-		break;
+int char_parsemap_askrmfriend(int fd, int id){
+	if (RFIFOREST(fd) < 10)
+		return 0;
+	{
+		int char_id, friend_id;
+		char_id = RFIFOL(fd,2);
+		friend_id = RFIFOL(fd,6);
+		if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d' AND `friend_id`='%d' LIMIT 1",
+			friend_db, char_id, friend_id) ) {
+			Sql_ShowDebug(sql_handle);
+			return 0;
+		}
+		RFIFOSKIP(fd,10);
+	}
+	return 1;
+}
 
-		case 0x2b08: // char name request
-			if (RFIFOREST(fd) < 6)
-				return 0;
+int char_parsemap_reqcharname(int fd, int id){
+	if (RFIFOREST(fd) < 6)
+		return 0;
 
-			WFIFOHEAD(fd,30);
-			WFIFOW(fd,0) = 0x2b09;
-			WFIFOL(fd,2) = RFIFOL(fd,2);
-			char_loadName((int)RFIFOL(fd,2), (char*)WFIFOP(fd,6));
-			WFIFOSET(fd,30);
+	WFIFOHEAD(fd,30);
+	WFIFOW(fd,0) = 0x2b09;
+	WFIFOL(fd,2) = RFIFOL(fd,2);
+	char_loadName((int)RFIFOL(fd,2), (char*)WFIFOP(fd,6));
+	WFIFOSET(fd,30);
 
-			RFIFOSKIP(fd,6);
-		break;
+	RFIFOSKIP(fd,6);
+	return 1;
+}
 
-		case 0x2b0c: // Map server send information to change an email of an account -> login-server
-			if (RFIFOREST(fd) < 86)
-				return 0;
-			if (login_fd > 0) { // don't send request if no login-server
-				WFIFOHEAD(login_fd,86);
-				memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0),86); // 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B
-				WFIFOW(login_fd,0) = 0x2722;
-				WFIFOSET(login_fd,86);
-			}
-			RFIFOSKIP(fd, 86);
-		break;
+int char_parsemap_reqnewemail(int fd, int id){
+	if (RFIFOREST(fd) < 86)
+		return 0;
+	if (login_fd > 0) { // don't send request if no login-server
+		WFIFOHEAD(login_fd,86);
+		memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0),86); // 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B
+		WFIFOW(login_fd,0) = 0x2722;
+		WFIFOSET(login_fd,86);
+	}
+	RFIFOSKIP(fd, 86);
+	return 1;
+}
 
-		case 0x2b0e: // Request from map-server to change an account's status (will just be forwarded to login server)
-			if (RFIFOREST(fd) < 44)
-				return 0;
-		{
-			int result = 0; // 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
-			char esc_name[NAME_LENGTH*2+1];
+int char_parsemap_fwlog_changestatus(int fd, int id){
+	if (RFIFOREST(fd) < 44)
+		return 0;
+	{
+		int result = 0; // 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
+		char esc_name[NAME_LENGTH*2+1];
 
-			int acc = RFIFOL(fd,2); // account_id of who ask (-1 if server itself made this request)
-			const char* name = (char*)RFIFOP(fd,6); // name of the target character
-			int type = RFIFOW(fd,30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban
-			short year = RFIFOW(fd,32);
-			short month = RFIFOW(fd,34);
-			short day = RFIFOW(fd,36);
-			short hour = RFIFOW(fd,38);
-			short minute = RFIFOW(fd,40);
-			short second = RFIFOW(fd,42);
-			RFIFOSKIP(fd,44);
+		int acc = RFIFOL(fd,2); // account_id of who ask (-1 if server itself made this request)
+		const char* name = (char*)RFIFOP(fd,6); // name of the target character
+		int type = RFIFOW(fd,30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban
+		short year = RFIFOW(fd,32);
+		short month = RFIFOW(fd,34);
+		short day = RFIFOW(fd,36);
+		short hour = RFIFOW(fd,38);
+		short minute = RFIFOW(fd,40);
+		short second = RFIFOW(fd,42);
+		RFIFOSKIP(fd,44);
 
-			Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`name` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
-				Sql_ShowDebug(sql_handle);
-			else
-			if( Sql_NumRows(sql_handle) == 0 )
-			{
-				result = 1; // 1-player not found
-			}
-			else
-			if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
-				Sql_ShowDebug(sql_handle);
-				//FIXME: set proper result value?
-			else
-			{
-				char name[NAME_LENGTH];
-				int account_id;
-				char* data;
+		Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`name` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
+			Sql_ShowDebug(sql_handle);
+		else
+		if( Sql_NumRows(sql_handle) == 0 )
+		{
+			result = 1; // 1-player not found
+		}
+		else
+		if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+			Sql_ShowDebug(sql_handle);
+			//FIXME: set proper result value?
+		else
+		{
+			char name[NAME_LENGTH];
+			int account_id;
+			char* data;
 
-				Sql_GetData(sql_handle, 0, &data, NULL); account_id = atoi(data);
-				Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(name, data, sizeof(name));
+			Sql_GetData(sql_handle, 0, &data, NULL); account_id = atoi(data);
+			Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(name, data, sizeof(name));
 
-				if( login_fd <= 0 )
-					result = 3; // 3-login-server offline
-				//FIXME: need to move this check to login server [ultramage]
+			if( login_fd <= 0 )
+				result = 3; // 3-login-server offline
+			//FIXME: need to move this check to login server [ultramage]
 //				else
 //				if( acc != -1 && isGM(acc) < isGM(account_id) )
 //					result = 2; // 2-gm level too low
-				else
-				switch( type ) {
-				case 1: // block
-						WFIFOHEAD(login_fd,10);
-						WFIFOW(login_fd,0) = 0x2724;
-						WFIFOL(login_fd,2) = account_id;
-						WFIFOL(login_fd,6) = 5; // new account status
-						WFIFOSET(login_fd,10);
-				break;
-				case 2: // ban
-						WFIFOHEAD(login_fd,18);
-						WFIFOW(login_fd, 0) = 0x2725;
-						WFIFOL(login_fd, 2) = account_id;
-						WFIFOW(login_fd, 6) = year;
-						WFIFOW(login_fd, 8) = month;
-						WFIFOW(login_fd,10) = day;
-						WFIFOW(login_fd,12) = hour;
-						WFIFOW(login_fd,14) = minute;
-						WFIFOW(login_fd,16) = second;
-						WFIFOSET(login_fd,18);
-				break;
-				case 3: // unblock
-						WFIFOHEAD(login_fd,10);
-						WFIFOW(login_fd,0) = 0x2724;
-						WFIFOL(login_fd,2) = account_id;
-						WFIFOL(login_fd,6) = 0; // new account status
-						WFIFOSET(login_fd,10);
-				break;
-				case 4: // unban
-						WFIFOHEAD(login_fd,6);
-						WFIFOW(login_fd,0) = 0x272a;
-						WFIFOL(login_fd,2) = account_id;
-						WFIFOSET(login_fd,6);
-				break;
-				case 5: // changesex
-						WFIFOHEAD(login_fd,6);
-						WFIFOW(login_fd,0) = 0x2727;
-						WFIFOL(login_fd,2) = account_id;
-						WFIFOSET(login_fd,6);
-				break;
-				}
+			else
+			switch( type ) {
+			case 1: // block
+					WFIFOHEAD(login_fd,10);
+					WFIFOW(login_fd,0) = 0x2724;
+					WFIFOL(login_fd,2) = account_id;
+					WFIFOL(login_fd,6) = 5; // new account status
+					WFIFOSET(login_fd,10);
+			break;
+			case 2: // ban
+					WFIFOHEAD(login_fd,18);
+					WFIFOW(login_fd, 0) = 0x2725;
+					WFIFOL(login_fd, 2) = account_id;
+					WFIFOW(login_fd, 6) = year;
+					WFIFOW(login_fd, 8) = month;
+					WFIFOW(login_fd,10) = day;
+					WFIFOW(login_fd,12) = hour;
+					WFIFOW(login_fd,14) = minute;
+					WFIFOW(login_fd,16) = second;
+					WFIFOSET(login_fd,18);
+			break;
+			case 3: // unblock
+					WFIFOHEAD(login_fd,10);
+					WFIFOW(login_fd,0) = 0x2724;
+					WFIFOL(login_fd,2) = account_id;
+					WFIFOL(login_fd,6) = 0; // new account status
+					WFIFOSET(login_fd,10);
+			break;
+			case 4: // unban
+					WFIFOHEAD(login_fd,6);
+					WFIFOW(login_fd,0) = 0x272a;
+					WFIFOL(login_fd,2) = account_id;
+					WFIFOSET(login_fd,6);
+			break;
+			case 5: // changesex
+					WFIFOHEAD(login_fd,6);
+					WFIFOW(login_fd,0) = 0x2727;
+					WFIFOL(login_fd,2) = account_id;
+					WFIFOSET(login_fd,6);
+			break;
 			}
+		}
 
-			Sql_FreeResult(sql_handle);
+		Sql_FreeResult(sql_handle);
 
-			// send answer if a player ask, not if the server ask
-			if( acc != -1 && type != 5) { // Don't send answer for changesex
-				WFIFOHEAD(fd,34);
-				WFIFOW(fd, 0) = 0x2b0f;
-				WFIFOL(fd, 2) = acc;
-				safestrncpy((char*)WFIFOP(fd,6), name, NAME_LENGTH);
-				WFIFOW(fd,30) = type;
-				WFIFOW(fd,32) = result;
-				WFIFOSET(fd,34);
-			}
+		// send answer if a player ask, not if the server ask
+		if( acc != -1 && type != 5) { // Don't send answer for changesex
+			WFIFOHEAD(fd,34);
+			WFIFOW(fd, 0) = 0x2b0f;
+			WFIFOL(fd, 2) = acc;
+			safestrncpy((char*)WFIFOP(fd,6), name, NAME_LENGTH);
+			WFIFOW(fd,30) = type;
+			WFIFOW(fd,32) = result;
+			WFIFOSET(fd,34);
 		}
-		break;
+	}
+	return 1;
+}
 
-		case 0x2b10: // Update and send fame ranking list
-			if (RFIFOREST(fd) < 11)
-				return 0;
+int char_parsemap_updfamelist(int fd, int id){
+	if (RFIFOREST(fd) < 11)
+		return 0;
+	{
+		int cid = RFIFOL(fd, 2);
+		int fame = RFIFOL(fd, 6);
+		char type = RFIFOB(fd, 10);
+		int size;
+		struct fame_list* list;
+		int player_pos;
+		int fame_pos;
+
+		switch(type)
 		{
-			int cid = RFIFOL(fd, 2);
-			int fame = RFIFOL(fd, 6);
-			char type = RFIFOB(fd, 10);
-			int size;
-			struct fame_list* list;
-			int player_pos;
-			int fame_pos;
+			case 1:  size = fame_list_size_smith;   list = smith_fame_list;   break;
+			case 2:  size = fame_list_size_chemist; list = chemist_fame_list; break;
+			case 3:  size = fame_list_size_taekwon; list = taekwon_fame_list; break;
+			default: size = 0;                      list = NULL;              break;
+		}
 
-			switch(type)
-			{
-				case 1:  size = fame_list_size_smith;   list = smith_fame_list;   break;
-				case 2:  size = fame_list_size_chemist; list = chemist_fame_list; break;
-				case 3:  size = fame_list_size_taekwon; list = taekwon_fame_list; break;
-				default: size = 0;                      list = NULL;              break;
-			}
+		ARR_FIND(0, size, player_pos, list[player_pos].id == cid);// position of the player
+		ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);// where the player should be
 
-			ARR_FIND(0, size, player_pos, list[player_pos].id == cid);// position of the player
-			ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);// where the player should be
-
-			if( player_pos == size && fame_pos == size )
-				;// not on list and not enough fame to get on it
-			else if( fame_pos == player_pos )
-			{// same position
-				list[player_pos].fame = fame;
-				char_update_fame_list(type, player_pos, fame);
+		if( player_pos == size && fame_pos == size )
+			;// not on list and not enough fame to get on it
+		else if( fame_pos == player_pos )
+		{// same position
+			list[player_pos].fame = fame;
+			char_update_fame_list(type, player_pos, fame);
+		}
+		else
+		{// move in the list
+			if( player_pos == size )
+			{// new ranker - not in the list
+				ARR_MOVE(size - 1, fame_pos, list, struct fame_list);
+				list[fame_pos].id = cid;
+				list[fame_pos].fame = fame;
+				char_loadName(cid, list[fame_pos].name);
 			}
 			else
-			{// move in the list
-				if( player_pos == size )
-				{// new ranker - not in the list
-					ARR_MOVE(size - 1, fame_pos, list, struct fame_list);
-					list[fame_pos].id = cid;
-					list[fame_pos].fame = fame;
-					char_loadName(cid, list[fame_pos].name);
-				}
-				else
-				{// already in the list
-					if( fame_pos == size )
-						--fame_pos;// move to the end of the list
-					ARR_MOVE(player_pos, fame_pos, list, struct fame_list);
-					list[fame_pos].fame = fame;
-				}
-				char_send_fame_list(-1);
+			{// already in the list
+				if( fame_pos == size )
+					--fame_pos;// move to the end of the list
+				ARR_MOVE(player_pos, fame_pos, list, struct fame_list);
+				list[fame_pos].fame = fame;
 			}
-
-			RFIFOSKIP(fd,11);
+			char_send_fame_list(-1);
 		}
-		break;
 
-		// Divorce chars
-		case 0x2b11:
-			if( RFIFOREST(fd) < 10 )
-				return 0;
-			divorce_char_sql(RFIFOL(fd,2), RFIFOL(fd,6));
-			RFIFOSKIP(fd,10);
-		break;
+		RFIFOSKIP(fd,11);
+	}
+	return 1;
+}
 
-		case 0x2b16: // Receive rates [Wizputer]
-			if( RFIFOREST(fd) < 14 )
-				return 0;
-		{
-			char esc_server_name[sizeof(server_name)*2+1];
+int char_parsemap_reqdivorce(int fd, int id){
+	if( RFIFOREST(fd) < 10 )
+		return 0;
+	divorce_char_sql(RFIFOL(fd,2), RFIFOL(fd,6));
+	RFIFOSKIP(fd,10);
+	return 1;
+}
+int char_parsemap_updmapinfo(int fd, int id){
+	if( RFIFOREST(fd) < 14 )
+		return 0;
+	{
+		char esc_server_name[sizeof(server_name)*2+1];
 
-			Sql_EscapeString(sql_handle, esc_server_name, server_name);
+		Sql_EscapeString(sql_handle, esc_server_name, server_name);
 
-			if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` SET `index`='%d',`name`='%s',`exp`='%d',`jexp`='%d',`drop`='%d'",
-				ragsrvinfo_db, fd, esc_server_name, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)) )
-				Sql_ShowDebug(sql_handle);
-			RFIFOSKIP(fd,14);
-		}
-		break;
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` SET `index`='%d',`name`='%s',`exp`='%d',`jexp`='%d',`drop`='%d'",
+			ragsrvinfo_db, fd, esc_server_name, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)) )
+			Sql_ShowDebug(sql_handle);
+		RFIFOSKIP(fd,14);
+	}
+	return 1;
+}
+int char_parsemap_setcharoffline(int fd, int id){
+	if (RFIFOREST(fd) < 6)
+		return 0;
+	set_char_offline(RFIFOL(fd,2),RFIFOL(fd,6));
+	RFIFOSKIP(fd,10);
+	return 1;
+}
+int char_parsemap_setalloffline(int fd, int id){
+	set_all_offline(id);
+	RFIFOSKIP(fd,2);
+	return 1;
+}
+int char_parsemap_setcharonline(int fd, int id){
+	if (RFIFOREST(fd) < 10)
+		return 0;
+	set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6));
+	RFIFOSKIP(fd,10);
+	return 1;
+}
+int char_parsemap_reqfamelist(int fd, int id){
+	if (RFIFOREST(fd) < 2)
+		return 0;
+	char_read_fame_list();
+	char_send_fame_list(-1);
+	RFIFOSKIP(fd,2);
+	return 1;
+}
 
-		case 0x2b17: // Character disconnected set online 0 [Wizputer]
-			if (RFIFOREST(fd) < 6)
-				return 0;
-			set_char_offline(RFIFOL(fd,2),RFIFOL(fd,6));
-			RFIFOSKIP(fd,10);
-		break;
+int char_parsemap_save_scdata(int fd, int id){
+	if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+		return 0;
+	{
+#ifdef ENABLE_SC_SAVING
+		int count, aid, cid;
 
-		case 0x2b18: // Reset all chars to offline [Wizputer]
-			set_all_offline(id);
-			RFIFOSKIP(fd,2);
-		break;
+		aid = RFIFOL(fd, 4);
+		cid = RFIFOL(fd, 8);
+		count = RFIFOW(fd, 12);
 
-		case 0x2b19: // Character set online [Wizputer]
-			if (RFIFOREST(fd) < 10)
-				return 0;
-			set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6));
-			RFIFOSKIP(fd,10);
-		break;
-
-		case 0x2b1a: // Build and send fame ranking lists [DracoRPG]
-			if (RFIFOREST(fd) < 2)
-				return 0;
-			char_read_fame_list();
-			char_send_fame_list(-1);
-			RFIFOSKIP(fd,2);
-		break;
-
-		case 0x2b1c: //Request to save status change data. [Skotlex]
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
+		if( count > 0 )
 		{
-#ifdef ENABLE_SC_SAVING
-			int count, aid, cid;
+			struct status_change_data data;
+			StringBuf buf;
+			int i;
 
-			aid = RFIFOL(fd, 4);
-			cid = RFIFOL(fd, 8);
-			count = RFIFOW(fd, 12);
-
-			if( count > 0 )
+			StringBuf_Init(&buf);
+			StringBuf_Printf(&buf, "INSERT INTO `%s` (`account_id`, `char_id`, `type`, `tick`, `val1`, `val2`, `val3`, `val4`) VALUES ", scdata_db);
+			for( i = 0; i < count; ++i )
 			{
-				struct status_change_data data;
-				StringBuf buf;
-				int i;
-
-				StringBuf_Init(&buf);
-				StringBuf_Printf(&buf, "INSERT INTO `%s` (`account_id`, `char_id`, `type`, `tick`, `val1`, `val2`, `val3`, `val4`) VALUES ", scdata_db);
-				for( i = 0; i < count; ++i )
-				{
-					memcpy (&data, RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data));
-					if( i > 0 )
-						StringBuf_AppendStr(&buf, ", ");
-					StringBuf_Printf(&buf, "('%d','%d','%hu','%d','%d','%d','%d','%d')", aid, cid,
-						data.type, data.tick, data.val1, data.val2, data.val3, data.val4);
-				}
-				if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
-					Sql_ShowDebug(sql_handle);
-				StringBuf_Destroy(&buf);
+				memcpy (&data, RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data));
+				if( i > 0 )
+					StringBuf_AppendStr(&buf, ", ");
+				StringBuf_Printf(&buf, "('%d','%d','%hu','%d','%d','%d','%d','%d')", aid, cid,
+					data.type, data.tick, data.val1, data.val2, data.val3, data.val4);
 			}
+			if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+				Sql_ShowDebug(sql_handle);
+			StringBuf_Destroy(&buf);
+		}
 #endif
-			RFIFOSKIP(fd, RFIFOW(fd, 2));
-		}
-		break;
+		RFIFOSKIP(fd, RFIFOW(fd, 2));
+	}
+	return 1;
+}
 
-		case 0x2b23: // map-server alive packet
-			WFIFOHEAD(fd,2);
-			WFIFOW(fd,0) = 0x2b24;
-			WFIFOSET(fd,2);
-			RFIFOSKIP(fd,2);
-		break;
+int char_parsemap_keepalive(int fd, int id){
+	WFIFOHEAD(fd,2);
+	WFIFOW(fd,0) = 0x2b24;
+	WFIFOSET(fd,2);
+	RFIFOSKIP(fd,2);
+	return 1;
+}
 
-		case 0x2b26: // auth request from map-server
-			if (RFIFOREST(fd) < 19)
-				return 0;
+int char_parsemap_reqauth(int fd, int id){
+	if (RFIFOREST(fd) < 19)
+		return 0;
 
-		{
-			int account_id;
-			int char_id;
-			int login_id1;
-			char sex;
-			uint32 ip;
-			struct auth_node* node;
-			struct mmo_charstatus* cd;
-			struct mmo_charstatus char_dat;
+	{
+		int account_id;
+		int char_id;
+		int login_id1;
+		char sex;
+		uint32 ip;
+		struct auth_node* node;
+		struct mmo_charstatus* cd;
+		struct mmo_charstatus char_dat;
 
-			account_id = RFIFOL(fd,2);
-			char_id    = RFIFOL(fd,6);
-			login_id1  = RFIFOL(fd,10);
-			sex        = RFIFOB(fd,14);
-			ip         = ntohl(RFIFOL(fd,15));
-			RFIFOSKIP(fd,19);
+		account_id = RFIFOL(fd,2);
+		char_id    = RFIFOL(fd,6);
+		login_id1  = RFIFOL(fd,10);
+		sex        = RFIFOB(fd,14);
+		ip         = ntohl(RFIFOL(fd,15));
+		RFIFOSKIP(fd,19);
 
-			node = (struct auth_node*)idb_get(auth_db, account_id);
+		node = (struct auth_node*)idb_get(auth_db, account_id);
+		cd = (struct mmo_charstatus*)uidb_get(char_db_,char_id);
+		if( cd == NULL )
+		{	//Really shouldn't happen.
+			mmo_char_fromsql(char_id, &char_dat, true);
 			cd = (struct mmo_charstatus*)uidb_get(char_db_,char_id);
-			if( cd == NULL )
-			{	//Really shouldn't happen.
-				mmo_char_fromsql(char_id, &char_dat, true);
-				cd = (struct mmo_charstatus*)uidb_get(char_db_,char_id);
-			}
-			if( runflag == CHARSERVER_ST_RUNNING &&
-				cd != NULL &&
-				node != NULL &&
-				node->account_id == account_id &&
-				node->char_id == char_id &&
-				node->login_id1 == login_id1 &&
-				node->sex == sex /*&&
-				node->ip == ip*/ )
-			{// auth ok
-				cd->sex = sex;
+		}
+		if( runflag == CHARSERVER_ST_RUNNING &&
+			cd != NULL &&
+			node != NULL &&
+			node->account_id == account_id &&
+			node->char_id == char_id &&
+			node->login_id1 == login_id1 &&
+			node->sex == sex /*&&
+			node->ip == ip*/ )
+		{// auth ok
+			cd->sex = sex;
 
-				WFIFOHEAD(fd,25 + sizeof(struct mmo_charstatus));
-				WFIFOW(fd,0) = 0x2afd;
-				WFIFOW(fd,2) = 25 + sizeof(struct mmo_charstatus);
-				WFIFOL(fd,4) = account_id;
-				WFIFOL(fd,8) = node->login_id1;
-				WFIFOL(fd,12) = node->login_id2;
-				WFIFOL(fd,16) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
-				WFIFOL(fd,20) = node->group_id;
-				WFIFOB(fd,24) = node->changing_mapservers;
-				memcpy(WFIFOP(fd,25), cd, sizeof(struct mmo_charstatus));
-				WFIFOSET(fd, WFIFOW(fd,2));
+			WFIFOHEAD(fd,25 + sizeof(struct mmo_charstatus));
+			WFIFOW(fd,0) = 0x2afd;
+			WFIFOW(fd,2) = 25 + sizeof(struct mmo_charstatus);
+			WFIFOL(fd,4) = account_id;
+			WFIFOL(fd,8) = node->login_id1;
+			WFIFOL(fd,12) = node->login_id2;
+			WFIFOL(fd,16) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
+			WFIFOL(fd,20) = node->group_id;
+			WFIFOB(fd,24) = node->changing_mapservers;
+			memcpy(WFIFOP(fd,25), cd, sizeof(struct mmo_charstatus));
+			WFIFOSET(fd, WFIFOW(fd,2));
 
-				// only use the auth once and mark user online
-				idb_remove(auth_db, account_id);
-				set_char_online(id, char_id, account_id);
-			}
-			else
-			{// auth failed
-				WFIFOHEAD(fd,19);
-				WFIFOW(fd,0) = 0x2b27;
-				WFIFOL(fd,2) = account_id;
-				WFIFOL(fd,6) = char_id;
-				WFIFOL(fd,10) = login_id1;
-				WFIFOB(fd,14) = sex;
-				WFIFOL(fd,15) = htonl(ip);
-				WFIFOSET(fd,19);
-			}
+			// only use the auth once and mark user online
+			idb_remove(auth_db, account_id);
+			set_char_online(id, char_id, account_id);
 		}
-		break;
+		else
+		{// auth failed
+			WFIFOHEAD(fd,19);
+			WFIFOW(fd,0) = 0x2b27;
+			WFIFOL(fd,2) = account_id;
+			WFIFOL(fd,6) = char_id;
+			WFIFOL(fd,10) = login_id1;
+			WFIFOB(fd,14) = sex;
+			WFIFOL(fd,15) = htonl(ip);
+			WFIFOSET(fd,19);
+		}
+	}
+	return 1;
+}
 
-		case 0x2736: // ip address update
-			if (RFIFOREST(fd) < 6) return 0;
-			server[id].ip = ntohl(RFIFOL(fd, 2));
-			ShowInfo("Updated IP address of map-server #%d to %d.%d.%d.%d.\n", id, CONVIP(server[id].ip));
-			RFIFOSKIP(fd,6);
-		break;
+int char_parsemap_updmapip(int fd, int id){
+	if (RFIFOREST(fd) < 6) return 0;
+	server[id].ip = ntohl(RFIFOL(fd, 2));
+	ShowInfo("Updated IP address of map-server #%d to %d.%d.%d.%d.\n", id, CONVIP(server[id].ip));
+	RFIFOSKIP(fd,6);
+	return 1;
+}
 
-		case 0x3008:
-			if( RFIFOREST(fd) < RFIFOW(fd,4) )
-				return 0;/* packet wasn't fully received yet (still fragmented) */
-			else {
-				int sfd;/* stat server fd */
-				RFIFOSKIP(fd, 2);/* we skip first 2 bytes which are the 0x3008, so we end up with a buffer equal to the one we send */
+int char_parsemap_fw_configstats(int fd, int id){
+	if( RFIFOREST(fd) < RFIFOW(fd,4) )
+		return 0;/* packet wasn't fully received yet (still fragmented) */
+	else {
+		int sfd;/* stat server fd */
+		RFIFOSKIP(fd, 2);/* we skip first 2 bytes which are the 0x3008, so we end up with a buffer equal to the one we send */
 
-				if( (sfd = make_connection(host2ip("stats.rathena.org"),(uint16)25421,true,10) ) == -1 ) {
-					RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
-					break;/* connection not possible, we drop the report */
-				}
-
-				session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
-				WFIFOHEAD(sfd, RFIFOW(fd,2) );
-				memcpy((char*)WFIFOP(sfd,0), (char*)RFIFOP(fd, 0), RFIFOW(fd,2));
-				WFIFOSET(sfd, RFIFOW(fd,2) );
-				flush_fifo(sfd);
-				do_close(sfd);
-				RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+		if( (sfd = make_connection(host2ip("stats.rathena.org"),(uint16)25421,true,10) ) == -1 ) {
+			RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+			return 0;/* connection not possible, we drop the report */
 		}
-		break;
 
+		session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
+		WFIFOHEAD(sfd, RFIFOW(fd,2) );
+		memcpy((char*)WFIFOP(sfd,0), (char*)RFIFOP(fd, 0), RFIFOW(fd,2));
+		WFIFOSET(sfd, RFIFOW(fd,2) );
+		flush_fifo(sfd);
+		do_close(sfd);
+		RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+	}
+	return 1;
+}
+
+int parse_frommap(int fd){
+	int id; //mapserv id
+	ARR_FIND( 0, ARRAYLENGTH(server), id, server[id].fd == fd );
+	if( id == ARRAYLENGTH(server) )
+	{// not a map server
+		ShowDebug("parse_frommap: Disconnecting invalid session #%d (is not a map-server)\n", fd);
+		do_close(fd);
+		return 0;
+	}
+	if( session[fd]->flag.eof )
+	{
+		do_close(fd);
+		server[id].fd = -1;
+		mapif_on_disconnect(id);
+		return 0;
+	}
+
+	while(RFIFOREST(fd) >= 2){
+		switch(RFIFOW(fd,0)){
+		// Receiving map names list from the map-server
+		case 0x2afa: char_parsemap_getmapname(fd,id); break;
+		//Packet command is now used for sc_data request. [Skotlex]
+		case 0x2afc: char_parsemap_askscdata(fd,id); break;
+		//MAP user count
+		case 0x2afe: char_parsemap_getusercount(fd,id); break; //get nb user
+		case 0x2aff: char_parsemap_regmapuser(fd,id); break; //register users
+		// Receive character data from map-server for saving
+		case 0x2b01: char_parsemap_reqsavechar(fd,id); break;
+		// req char selection;
+		case 0x2b02: char_parsemap_authok(fd,id); break;
+		// request "change map server"
+		case 0x2b05: char_parsemap_reqchangemapserv(fd,id); break;
+		// Remove RFIFOL(fd,6) (friend_id) from RFIFOL(fd,2) (char_id) friend list [Ind]
+		case 0x2b07: char_parsemap_askrmfriend(fd,id); break;
+		// char name request
+		case 0x2b08: char_parsemap_reqcharname(fd,id); break;
+		// Map server send information to change an email of an account -> login-server
+		case 0x2b0c: char_parsemap_reqnewemail(fd,id); break;
+		// Request from map-server to change an account's status (will just be forwarded to login server)
+		case 0x2b0e: char_parsemap_fwlog_changestatus(fd,id); break;
+		// Update and send fame ranking list
+		case 0x2b10: char_parsemap_updfamelist(fd,id); break;
+		// Divorce chars
+		case 0x2b11: char_parsemap_reqdivorce(fd,id); break;
+		// Receive rates [Wizputer]
+		case 0x2b16: char_parsemap_updmapinfo(fd,id); break;
+		// Character disconnected set online 0 [Wizputer]
+		case 0x2b17: char_parsemap_setcharoffline(fd,id); break;
+		// Reset all chars to offline [Wizputer]
+		case 0x2b18: char_parsemap_setalloffline(fd,id); break;
+		// Character set online [Wizputer]
+		case 0x2b19: char_parsemap_setcharonline(fd,id); break;
+		// Build and send fame ranking lists [DracoRPG]
+		case 0x2b1a: char_parsemap_reqfamelist(fd,id); break;
+		//Request to save status change data. [Skotlex]
+		case 0x2b1c: char_parsemap_save_scdata(fd,id); break;
+		// map-server alive packet
+		case 0x2b23: char_parsemap_keepalive(fd,id); break;
+		// auth request from map-server
+		case 0x2b26: char_parsemap_reqauth(fd,id); break;
+		// ip address update
+		case 0x2736: char_parsemap_updmapip(fd,id); break;
+		// transmit emu usage for anom stats
+		case 0x3008: char_parsemap_fw_configstats(fd,id); break;
 		default:
 		{
 			// inter server - packet
 			int r = inter_parse_frommap(fd);
 			if (r == 1) break;		// processed
 			if (r == 2) return 0;	// need more packet
-
 			// no inter server packet. no char server packet -> disconnect
 			ShowError("Unknown packet 0x%04x from map server, disconnecting.\n", RFIFOW(fd,0));
 			set_eof(fd);
@@ -3513,64 +3264,10 @@
 	return 0;
 }
 
-void do_init_mapif(void)
-{
-	int i;
-	for( i = 0; i < ARRAYLENGTH(server); ++i )
-		mapif_server_init(i);
-}
+//
+// Client IF
+//
 
-void do_final_mapif(void)
-{
-	int i;
-	for( i = 0; i < ARRAYLENGTH(server); ++i )
-		mapif_server_destroy(i);
-}
-
-// Searches for the mapserver that has a given map (and optionally ip/port, if not -1).
-// If found, returns the server's index in the 'server' array (otherwise returns -1).
-int search_mapserver(unsigned short map, uint32 ip, uint16 port)
-{
-	int i, j;
-
-	for(i = 0; i < ARRAYLENGTH(server); i++)
-	{
-		if (server[i].fd > 0
-		&& (ip == (uint32)-1 || server[i].ip == ip)
-		&& (port == (uint16)-1 || server[i].port == port))
-		{
-			for (j = 0; server[i].map[j]; j++)
-				if (server[i].map[j] == map)
-					return i;
-		}
-	}
-
-	return -1;
-}
-
-// Initialization process (currently only initialization inter_mapif)
-static int char_mapif_init(int fd)
-{
-	return inter_mapif_init(fd);
-}
-
-//--------------------------------------------
-// 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) );
-	if( i < subnet_count ) {
-		ShowInfo("Subnet check [%u.%u.%u.%u]: Matches "CL_CYAN"%u.%u.%u.%u/%u.%u.%u.%u"CL_RESET"\n", CONVIP(ip), CONVIP(subnet[i].char_ip & subnet[i].mask), CONVIP(subnet[i].mask));
-		return subnet[i].map_ip;
-	} else {
-		ShowInfo("Subnet check [%u.%u.%u.%u]: "CL_CYAN"WAN"CL_RESET"\n", CONVIP(ip));
-		return 0;
-	}
-}
-
-
 /// @param result
 /// 0 (0x718): An unknown error has occurred.
 /// 1: none/success
@@ -3588,7 +3285,6 @@
 	WFIFOSET(fd,14);
 }
 
-
 /// @param result
 /// 0 (0x718): An unknown error has occurred.
 /// 1: none/success
@@ -3606,7 +3302,6 @@
 	WFIFOSET(fd,10);
 }
 
-
 /// @param result
 /// 1 (0x718): none/success, (if char id not in deletion process): An unknown error has occurred.
 /// 2 (0x719): A database error occurred.
@@ -3620,34 +3315,37 @@
 	WFIFOSET(fd,10);
 }
 
-
-static void char_delete2_req(int fd, struct char_session_data* sd)
-{// CH: <0827>.W <char id>.L
+// CH: <0827>.W <char id>.L
+int char_parse_delete2_req(int fd, struct char_session_data* sd)
+{
 	int char_id, i;
 	char* data;
 	time_t delete_date;
 
+	FIFOSD_CHECK(6)
+
 	char_id = RFIFOL(fd,2);
+	RFIFOSKIP(fd,6);
 
 	ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == char_id );
 	if( i == MAX_CHARS )
 	{// character not found
 		char_delete2_ack(fd, char_id, 3, 0);
-		return;
+		return 0;
 	}
 
 	if( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT `delete_date` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) || SQL_SUCCESS != Sql_NextRow(sql_handle) )
 	{
 		Sql_ShowDebug(sql_handle);
 		char_delete2_ack(fd, char_id, 3, 0);
-		return;
+		return 0;
 	}
 
 	Sql_GetData(sql_handle, 0, &data, NULL); delete_date = strtoul(data, NULL, 10);
 
 	if( delete_date ) {// character already queued for deletion
 		char_delete2_ack(fd, char_id, 0, 0);
-		return;
+		return 0;
 	}
 
 /*
@@ -3674,14 +3372,14 @@
 	{
 		Sql_ShowDebug(sql_handle);
 		char_delete2_ack(fd, char_id, 3, 0);
-		return;
+		return 0;
 	}
 
 	char_delete2_ack(fd, char_id, 1, delete_date);
+	return 1;
 }
 
-
-static void char_delete2_accept(int fd, struct char_session_data* sd)
+int char_parse_delete2_accept(int fd, struct char_session_data* sd)
 {// CH: <0829>.W <char id>.L <birth date:YYMMDD>.6B
 	char birthdate[8+1];
 	int char_id, i, k;
@@ -3689,6 +3387,8 @@
 	char* data;
 	time_t delete_date;
 
+	FIFOSD_CHECK(12)
+
 	char_id = RFIFOL(fd,2);
 
 	ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, char_id);
@@ -3703,19 +3403,20 @@
 	birthdate[6] = RFIFOB(fd,10);
 	birthdate[7] = RFIFOB(fd,11);
 	birthdate[8] = 0;
+	RFIFOSKIP(fd,12);
 
 	ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == char_id );
 	if( i == MAX_CHARS )
 	{// character not found
 		char_delete2_accept_ack(fd, char_id, 3);
-		return;
+		return 0;
 	}
 
 	if( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT `base_level`,`delete_date` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) || SQL_SUCCESS != Sql_NextRow(sql_handle) )
 	{// data error
 		Sql_ShowDebug(sql_handle);
 		char_delete2_accept_ack(fd, char_id, 3);
-		return;
+		return 0;
 	}
 
 	Sql_GetData(sql_handle, 0, &data, NULL); base_level = (unsigned int)strtoul(data, NULL, 10);
@@ -3724,26 +3425,26 @@
 	if( !delete_date || delete_date>time(NULL) )
 	{// not queued or delay not yet passed
 		char_delete2_accept_ack(fd, char_id, 4);
-		return;
+		return 0;
 	}
 
 	if( strcmp(sd->birthdate+2, birthdate) )  // +2 to cut off the century
 	{// birth date is wrong
 		char_delete2_accept_ack(fd, char_id, 5);
-		return;
+		return 0;
 	}
 
 	if( ( char_del_level > 0 && base_level >= (unsigned int)char_del_level ) || ( char_del_level < 0 && base_level <= (unsigned int)(-char_del_level) ) )
 	{// character level config restriction
 		char_delete2_accept_ack(fd, char_id, 2);
-		return;
+		return 0;
 	}
 
 	// success
 	if( delete_char_sql(char_id) < 0 )
 	{
 		char_delete2_accept_ack(fd, char_id, 3);
-		return;
+		return 0;
 	}
 
 	// refresh character list cache
@@ -3754,20 +3455,24 @@
 	sd->found_char[MAX_CHARS-1] = -1;
 
 	char_delete2_accept_ack(fd, char_id, 1);
+	return 1;
 }
 
-
-static void char_delete2_cancel(int fd, struct char_session_data* sd)
-{// CH: <082b>.W <char id>.L
+// CH: <082b>.W <char id>.L
+int char_parse_delete2_cancel(int fd, struct char_session_data* sd)
+{
 	int char_id, i;
 
+	FIFOSD_CHECK(6)
+
 	char_id = RFIFOL(fd,2);
+	RFIFOSKIP(fd,6);
 
 	ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == char_id );
 	if( i == MAX_CHARS )
 	{// character not found
 		char_delete2_cancel_ack(fd, char_id, 2);
-		return;
+		return 0;
 	}
 
 	// there is no need to check, whether or not the character was
@@ -3777,637 +3482,52 @@
 	{
 		Sql_ShowDebug(sql_handle);
 		char_delete2_cancel_ack(fd, char_id, 2);
-		return;
+		return 0;
 	}
 
 	char_delete2_cancel_ack(fd, char_id, 1);
+	return 1;
 }
 
+int char_parse_maplogin(int fd){
+	int i;
 
-int parse_char(int fd)
-{
-	int i, ch;
-	char email[40];
-	unsigned short cmd;
-	int map_fd;
-	struct char_session_data* sd;
-	uint32 ipl = session[fd]->client_addr;
-
-	sd = (struct char_session_data*)session[fd]->session_data;
-
-	// disconnect any player if no login-server.
-	if(login_fd < 0)
-		set_eof(fd);
-
-	if(session[fd]->flag.eof)
-	{
-		if( sd != NULL && sd->auth )
-		{	// already authed client
-			struct online_char_data* data = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
-			if( data != NULL && data->fd == fd)
-				data->fd = -1;
-			if( data == NULL || data->server == -1) //If it is not in any server, send it offline. [Skotlex]
-				set_char_offline(-1,sd->account_id);
-		}
-		do_close(fd);
+	if (RFIFOREST(fd) < 60)
 		return 0;
-	}
-
-	while( RFIFOREST(fd) >= 2 )
-	{
-		//For use in packets that depend on an sd being present [Skotlex]
-		#define FIFOSD_CHECK(rest) { if(RFIFOREST(fd) < rest) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,rest); return 0; } }
-
-		cmd = RFIFOW(fd,0);
-		switch( cmd )
+	else {
+		char* l_user = (char*)RFIFOP(fd,2);
+		char* l_pass = (char*)RFIFOP(fd,26);
+		l_user[23] = '\0';
+		l_pass[23] = '\0';
+		ARR_FIND( 0, ARRAYLENGTH(server), i, server[i].fd <= 0 );
+		if( runflag != CHARSERVER_ST_RUNNING ||
+			i == ARRAYLENGTH(server) ||
+			strcmp(l_user, userid) != 0 ||
+			strcmp(l_pass, passwd) != 0 )
 		{
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x2af9;
+			WFIFOB(fd,2) = 3;
+			WFIFOSET(fd,3);
+		} else {
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x2af9;
+			WFIFOB(fd,2) = 0;
+			WFIFOSET(fd,3);
 
-		// request to connect
-		// 0065 <account id>.L <login id1>.L <login id2>.L <???>.W <sex>.B
-		case 0x65:
-			if( RFIFOREST(fd) < 17 )
-				return 0;
-		{
-			struct auth_node* node;
-
-			int account_id = RFIFOL(fd,2);
-			uint32 login_id1 = RFIFOL(fd,6);
-			uint32 login_id2 = RFIFOL(fd,10);
-			int sex = RFIFOB(fd,16);
-			RFIFOSKIP(fd,17);
-
-			ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", account_id, login_id1, login_id2);
-
-			if (sd) {
-				//Received again auth packet for already authentified account?? Discard it.
-				//TODO: Perhaps log this as a hack attempt?
-				//TODO: and perhaps send back a reply?
-				break;
-			}
-
-			CREATE(session[fd]->session_data, struct char_session_data, 1);
-			sd = (struct char_session_data*)session[fd]->session_data;
-			sd->account_id = account_id;
-			sd->login_id1 = login_id1;
-			sd->login_id2 = login_id2;
-			sd->sex = sex;
-			sd->auth = false; // not authed yet
-
-			// send back account_id
-			WFIFOHEAD(fd,4);
-			WFIFOL(fd,0) = account_id;
-			WFIFOSET(fd,4);
-
-			if( runflag != CHARSERVER_ST_RUNNING )
-			{
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x6c;
-				WFIFOB(fd,2) = 0;// rejected from server
-				WFIFOSET(fd,3);
-				break;
-			}
-
-			// search authentification
-			node = (struct auth_node*)idb_get(auth_db, account_id);
-			if( node != NULL &&
-			    node->account_id == account_id &&
-				node->login_id1  == login_id1 &&
-				node->login_id2  == login_id2 /*&&
-				node->ip         == ipl*/ )
-			{// authentication found (coming from map server)
-				idb_remove(auth_db, account_id);
-				char_auth_ok(fd, sd);
-			}
-			else
-			{// authentication not found (coming from login server)
-				if (login_fd > 0) { // don't send request if no login-server
-					WFIFOHEAD(login_fd,23);
-					WFIFOW(login_fd,0) = 0x2712; // ask login-server to authentify an account
-					WFIFOL(login_fd,2) = sd->account_id;
-					WFIFOL(login_fd,6) = sd->login_id1;
-					WFIFOL(login_fd,10) = sd->login_id2;
-					WFIFOB(login_fd,14) = sd->sex;
-					WFIFOL(login_fd,15) = htonl(ipl);
-					WFIFOL(login_fd,19) = fd;
-					WFIFOSET(login_fd,23);
-				} else { // if no login-server, we must refuse connection
-					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x6c;
-					WFIFOB(fd,2) = 0;
-					WFIFOSET(fd,3);
-				}
-			}
+			server[i].fd = fd;
+			server[i].ip = ntohl(RFIFOL(fd,54));
+			server[i].port = ntohs(RFIFOW(fd,58));
+			server[i].users = 0;
+			memset(server[i].map, 0, sizeof(server[i].map));
+			session[fd]->func_parse = parse_frommap;
+			session[fd]->flag.server = 1;
+			realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
+			char_mapif_init(fd);
 		}
-		break;
-
-		// char select
-		case 0x66:
-			FIFOSD_CHECK(3);
-		{
-			struct mmo_charstatus char_dat;
-			struct mmo_charstatus *cd;
-			char* data;
-			int char_id;
-			uint32 subnet_map_ip;
-			struct auth_node* node;
-
-			int slot = RFIFOB(fd,2);
-			RFIFOSKIP(fd,3);
-
-			if ( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT `char_id` FROM `%s` WHERE `account_id`='%d' AND `char_num`='%d'", char_db, sd->account_id, slot)
-			  || SQL_SUCCESS != Sql_NextRow(sql_handle)
-			  || SQL_SUCCESS != Sql_GetData(sql_handle, 0, &data, NULL) )
-			{	//Not found?? May be forged packet.
-				Sql_ShowDebug(sql_handle);
-				Sql_FreeResult(sql_handle);
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x6c;
-				WFIFOB(fd,2) = 0; // rejected from server
-				WFIFOSET(fd,3);
-				break;
-			}
-
-			char_id = atoi(data);
-			Sql_FreeResult(sql_handle);
-
-			/* set char as online prior to loading its data so 3rd party applications will realise the sql data is not reliable */
-			set_char_online(-2,char_id,sd->account_id);
-			if( !mmo_char_fromsql(char_id, &char_dat, true) ) { /* failed? set it back offline */
-				set_char_offline(char_id, sd->account_id);
-				/* failed to load something. REJECT! */
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x6c;
-				WFIFOB(fd,2) = 0;
-				WFIFOSET(fd,3);
-				break;/* jump off this boat */
-			}
-
-			//Have to switch over to the DB instance otherwise data won't propagate [Kevin]
-			cd = (struct mmo_charstatus *)idb_get(char_db_, char_id);
-			cd->sex = sd->sex;
-
-			if (log_char) {
-				char esc_name[NAME_LENGTH*2+1];
-
-				Sql_EscapeStringLen(sql_handle, esc_name, char_dat.name, strnlen(char_dat.name, NAME_LENGTH));
-				if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
-					charlog_db, sd->account_id, slot, esc_name) )
-					Sql_ShowDebug(sql_handle);
-			}
-			ShowInfo("Selected char: (Account %d: %d - %s)\n", sd->account_id, slot, char_dat.name);
-
-			// searching map server
-			i = search_mapserver(cd->last_point.map, -1, -1);
-
-			// if map is not found, we check major cities
-			if (i < 0 || !cd->last_point.map) {
-				unsigned short j;
-				//First check that there's actually a map server online.
-				ARR_FIND( 0, ARRAYLENGTH(server), j, server[j].fd >= 0 && server[j].map[0] );
-				if (j == ARRAYLENGTH(server)) {
-					ShowInfo("Connection Closed. No map servers available.\n");
-					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x81;
-					WFIFOB(fd,2) = 1; // 01 = Server closed
-					WFIFOSET(fd,3);
-					break;
-				}
-				if ((i = search_mapserver((j=mapindex_name2id(MAP_PRONTERA)),-1,-1)) >= 0) {
-					cd->last_point.x = 273;
-					cd->last_point.y = 354;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_GEFFEN)),-1,-1)) >= 0) {
-					cd->last_point.x = 120;
-					cd->last_point.y = 100;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_MORROC)),-1,-1)) >= 0) {
-					cd->last_point.x = 160;
-					cd->last_point.y = 94;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_ALBERTA)),-1,-1)) >= 0) {
-					cd->last_point.x = 116;
-					cd->last_point.y = 57;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_PAYON)),-1,-1)) >= 0) {
-					cd->last_point.x = 87;
-					cd->last_point.y = 117;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_IZLUDE)),-1,-1)) >= 0) {
-					cd->last_point.x = 94;
-					cd->last_point.y = 103;
-				} else {
-					ShowInfo("Connection Closed. No map server available that has a major city, and unable to find map-server for '%s'.\n", mapindex_id2name(cd->last_point.map));
-					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x81;
-					WFIFOB(fd,2) = 1; // 01 = Server closed
-					WFIFOSET(fd,3);
-					break;
-				}
-				ShowWarning("Unable to find map-server for '%s', sending to major city '%s'.\n", mapindex_id2name(cd->last_point.map), mapindex_id2name(j));
-				cd->last_point.map = j;
-			}
-
-			//Send NEW auth packet [Kevin]
-			//FIXME: is this case even possible? [ultramage]
-			if ((map_fd = server[i].fd) < 1 || session[map_fd] == NULL)
-			{
-				ShowError("parse_char: Attempting to write to invalid session %d! Map Server #%d disconnected.\n", map_fd, i);
-				server[i].fd = -1;
-				memset(&server[i], 0, sizeof(struct mmo_map_server));
-				//Send server closed.
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x81;
-				WFIFOB(fd,2) = 1; // 01 = Server closed
-				WFIFOSET(fd,3);
-				break;
-			}
-
-			//Send player to map
-			WFIFOHEAD(fd,28);
-			WFIFOW(fd,0) = 0x71;
-			WFIFOL(fd,2) = cd->char_id;
-			mapindex_getmapname_ext(mapindex_id2name(cd->last_point.map), (char*)WFIFOP(fd,6));
-			subnet_map_ip = lan_subnetcheck(ipl); // Advanced subnet check [LuzZza]
-			WFIFOL(fd,22) = htonl((subnet_map_ip) ? subnet_map_ip : server[i].ip);
-			WFIFOW(fd,26) = ntows(htons(server[i].port)); // [!] LE byte order here [!]
-			WFIFOSET(fd,28);
-
-			// create temporary auth entry
-			CREATE(node, struct auth_node, 1);
-			node->account_id = sd->account_id;
-			node->char_id = cd->char_id;
-			node->login_id1 = sd->login_id1;
-			node->login_id2 = sd->login_id2;
-			node->sex = sd->sex;
-			node->expiration_time = sd->expiration_time;
-			node->group_id = sd->group_id;
-			node->ip = ipl;
-			idb_put(auth_db, sd->account_id, node);
-
-		}
-		break;
-
-		// create new char
-#if PACKETVER >= 20120307
-		// S 0970 <name>.24B <slot>.B <hair color>.W <hair style>.W
-		case 0x970:
-			FIFOSD_CHECK(31);
-#else
-		// S 0067 <name>.24B <str>.B <agi>.B <vit>.B <int>.B <dex>.B <luk>.B <slot>.B <hair color>.W <hair style>.W
-		case 0x67:
-			FIFOSD_CHECK(37);
-#endif
-
-			if( !char_new ) //turn character creation on/off [Kevin]
-				i = -2;
-			else
-#if PACKETVER >= 20120307
-				i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
-#else
-				i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
-#endif
-
-			//'Charname already exists' (-1), 'Char creation denied' (-2) and 'You are underaged' (-3)
-			if (i < 0) {
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x6e;
-				/* Others I found [Ind] */
-				/* 0x02 = Symbols in Character Names are forbidden */
-				/* 0x03 = You are not elegible to open the Character Slot. */
-				switch (i) {
-					case -1: WFIFOB(fd,2) = 0x00; break;
-					case -2: WFIFOB(fd,2) = 0xFF; break;
-					case -3: WFIFOB(fd,2) = 0x01; break;
-					case -4: WFIFOB(fd,2) = 0x03; break;
-				}
-				WFIFOSET(fd,3);
-			} else {
-				int len;
-				// retrieve data
-				struct mmo_charstatus char_dat;
-				mmo_char_fromsql(i, &char_dat, false); //Only the short data is needed.
-
-				// send to player
-				WFIFOHEAD(fd,2+MAX_CHAR_BUF);
-				WFIFOW(fd,0) = 0x6d;
-				len = 2 + mmo_char_tobuf(WFIFOP(fd,2), &char_dat);
-				WFIFOSET(fd,len);
-
-				// add new entry to the chars list
-				ARR_FIND( 0, MAX_CHARS, ch, sd->found_char[ch] == -1 );
-				if( ch < MAX_CHARS )
-					sd->found_char[ch] = i; // the char_id of the new char
-			}
-#if PACKETVER >= 20120307
-			RFIFOSKIP(fd,31);
-#else
-			RFIFOSKIP(fd,37);
-#endif
-		break;
-
-		// delete char
-		case 0x68:
-		// 2004-04-19aSakexe+ langtype 12 char deletion packet
-		case 0x1fb:
-			if (cmd == 0x68) FIFOSD_CHECK(46);
-			if (cmd == 0x1fb) FIFOSD_CHECK(56);
-		{
-			int cid = RFIFOL(fd,2);
-
-			ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
-			memcpy(email, RFIFOP(fd,6), 40);
-			RFIFOSKIP(fd,( cmd == 0x68) ? 46 : 56);
-
-			// Check if e-mail is correct
-			if(strcmpi(email, sd->email) && //email does not matches and
-			(
-				strcmp("a@a.com", sd->email) || //it is not default email, or
-				(strcmp("a@a.com", email) && strcmp("", email)) //email sent does not matches default
-			)) {	//Fail
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x70;
-				WFIFOB(fd,2) = 0; // 00 = Incorrect Email address
-				WFIFOSET(fd,3);
-				break;
-			}
-
-			// check if this char exists
-			ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
-			if( i == MAX_CHARS )
-			{ // Such a character does not exist in the account
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x70;
-				WFIFOB(fd,2) = 0;
-				WFIFOSET(fd,3);
-				break;
-			}
-
-			// remove char from list and compact it
-			for(ch = i; ch < MAX_CHARS-1; ch++)
-				sd->found_char[ch] = sd->found_char[ch+1];
-			sd->found_char[MAX_CHARS-1] = -1;
-
-			/* Delete character */
-			if(delete_char_sql(cid)<0){
-				//can't delete the char
-				//either SQL error or can't delete by some CONFIG conditions
-				//del fail
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd, 0) = 0x70;
-				WFIFOB(fd, 2) = 0;
-				WFIFOSET(fd, 3);
-				break;
-			}
-			/* Char successfully deleted.*/
-			WFIFOHEAD(fd,2);
-			WFIFOW(fd,0) = 0x6f;
-			WFIFOSET(fd,2);
-		}
-		break;
-
-		// client keep-alive packet (every 12 seconds)
-		// R 0187 <account ID>.l
-		case 0x187:
-			if (RFIFOREST(fd) < 6)
-				return 0;
-			RFIFOSKIP(fd,6);
-		break;
-		// char rename request
-		// R 08fc <char ID>.l <new name>.24B
-		case 0x8fc:
-			FIFOSD_CHECK(30);
-			{
-				int i, cid =RFIFOL(fd,2);
-				char name[NAME_LENGTH];
-				char esc_name[NAME_LENGTH*2+1];
-				safestrncpy(name, (char *)RFIFOP(fd,6), NAME_LENGTH);
-				RFIFOSKIP(fd,30);
-
-				ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
-				if( i == MAX_CHARS )
-					break;
-
-				normalize_name(name,TRIM_CHARS);
-				Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-				if( !check_char_name(name,esc_name) ) {
-					i = 1;
-					safestrncpy(sd->new_name, name, NAME_LENGTH);
-				} else
-					i = 0;
-
-				WFIFOHEAD(fd, 4);
-				WFIFOW(fd,0) = 0x28e;
-				WFIFOW(fd,2) = i;
-				WFIFOSET(fd,4);
-			}
-			break;
-
-		// char rename request
-		// R 028d <account ID>.l <char ID>.l <new name>.24B
-		case 0x28d:
-			FIFOSD_CHECK(34);
-			{
-				int i, aid = RFIFOL(fd,2), cid =RFIFOL(fd,6);
-				char name[NAME_LENGTH];
- 				char esc_name[NAME_LENGTH*2+1];
-				safestrncpy(name, (char *)RFIFOP(fd,10), NAME_LENGTH);
-				RFIFOSKIP(fd,34);
-
-				if( aid != sd->account_id )
-					break;
-				ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
-				if( i == MAX_CHARS )
-					break;
-
-				normalize_name(name,TRIM_CHARS);
-				Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-				if( !check_char_name(name,esc_name) )
-				{
-					i = 1;
-					safestrncpy(sd->new_name, name, NAME_LENGTH);
-				}
-				else
-					i = 0;
-
-				WFIFOHEAD(fd, 4);
-				WFIFOW(fd,0) = 0x28e;
-				WFIFOW(fd,2) = i;
-				WFIFOSET(fd,4);
-			}
-			break;
-		//Confirm change name.
-		// 0x28f <char_id>.L
-		case 0x28f:
-			// 0: Sucessfull
-			// 1: This character's name has already been changed. You cannot change a character's name more than once.
-			// 2: User information is not correct.
-			// 3: You have failed to change this character's name.
-			// 4: Another user is using this character name, so please select another one.
-			FIFOSD_CHECK(6);
-			{
-				int i;
-				int cid = RFIFOL(fd,2);
-				RFIFOSKIP(fd,6);
-
-				ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
-				if( i == MAX_CHARS )
-					break;
-				i = rename_char_sql(sd, cid);
-
-				WFIFOHEAD(fd, 4);
-				WFIFOW(fd,0) = 0x290;
-				WFIFOW(fd,2) = i;
-				WFIFOSET(fd,4);
-			}
-			break;
-
-		// captcha code request (not implemented)
-		// R 07e5 <?>.w <aid>.l
-		case 0x7e5:
-			WFIFOHEAD(fd,5);
-			WFIFOW(fd,0) = 0x7e9;
-			WFIFOW(fd,2) = 5;
-			WFIFOB(fd,4) = 1;
-			WFIFOSET(fd,5);
-			RFIFOSKIP(fd,8);
-			break;
-
-		// captcha code check (not implemented)
-		// R 07e7 <len>.w <aid>.l <code>.b10 <?>.b14
-		case 0x7e7:
-			WFIFOHEAD(fd,5);
-			WFIFOW(fd,0) = 0x7e9;
-			WFIFOW(fd,2) = 5;
-			WFIFOB(fd,4) = 1;
-			WFIFOSET(fd,5);
-			RFIFOSKIP(fd,32);
-		break;
-
-		// deletion timer request
-		case 0x827:
-			FIFOSD_CHECK(6);
-			char_delete2_req(fd, sd);
-			RFIFOSKIP(fd,6);
-		break;
-
-		// deletion accept request
-		case 0x829:
-			FIFOSD_CHECK(12);
-			char_delete2_accept(fd, sd);
-			RFIFOSKIP(fd,12);
-		break;
-
-		// deletion cancel request
-		case 0x82b:
-			FIFOSD_CHECK(6);
-			char_delete2_cancel(fd, sd);
-			RFIFOSKIP(fd,6);
-		break;
-
-		// login as map-server
-		case 0x2af8:
-			if (RFIFOREST(fd) < 60)
-				return 0;
-			else {
-				char* l_user = (char*)RFIFOP(fd,2);
-				char* l_pass = (char*)RFIFOP(fd,26);
-				l_user[23] = '\0';
-				l_pass[23] = '\0';
-				ARR_FIND( 0, ARRAYLENGTH(server), i, server[i].fd <= 0 );
-				if( runflag != CHARSERVER_ST_RUNNING ||
-					i == ARRAYLENGTH(server) ||
-					strcmp(l_user, userid) != 0 ||
-					strcmp(l_pass, passwd) != 0 )
-				{
-					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x2af9;
-					WFIFOB(fd,2) = 3;
-					WFIFOSET(fd,3);
-				} else {
-					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x2af9;
-					WFIFOB(fd,2) = 0;
-					WFIFOSET(fd,3);
-
-					server[i].fd = fd;
-					server[i].ip = ntohl(RFIFOL(fd,54));
-					server[i].port = ntohs(RFIFOW(fd,58));
-					server[i].users = 0;
-					memset(server[i].map, 0, sizeof(server[i].map));
-					session[fd]->func_parse = parse_frommap;
-					session[fd]->flag.server = 1;
-					realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-					char_mapif_init(fd);
-				}
-				RFIFOSKIP(fd,60);
-			}
-			return 0; // avoid processing of followup packets here
-
-		// checks the entered pin
-		case 0x8b8:
-			if( RFIFOREST(fd) < 10 )
-				return 0;
-			if( pincode_enabled && RFIFOL(fd,2) == sd->account_id )
-				pincode_check( fd, sd );
-			RFIFOSKIP(fd,10);
-		break;
-
-		// request for PIN window
-		case 0x8c5:
-			if( RFIFOREST(fd) < 6 )
-				return 0;
-			if( pincode_enabled && RFIFOL(fd,2) == sd->account_id ){
-				if( strlen( sd->pincode ) <= 0 ){
-					pincode_sendstate( fd, sd, PINCODE_NEW );
-				}else{
-					pincode_sendstate( fd, sd, PINCODE_ASK );
-				}
-			}
-			RFIFOSKIP(fd,6);
-		break;
-
-		// pincode change request
-		case 0x8be:
-			if( RFIFOREST(fd) < 14 )
-				return 0;
-
-			if( pincode_enabled && RFIFOL(fd,2) == sd->account_id )
-				pincode_change( fd, sd );
-
-			RFIFOSKIP(fd,14);
-		break;
-
-		// activate PIN system and set first PIN
-		case 0x8ba:
-			if( RFIFOREST(fd) < 10 )
-				return 0;
-			if( pincode_enabled && RFIFOL(fd,2) == sd->account_id )
-				pincode_setnew( fd, sd );
-			RFIFOSKIP(fd,10);
-		break;
-
-		// character movement request
-		case 0x8d4:
-			if( RFIFOREST(fd) < 8 )
-				return 0;
-
-			moveCharSlot( fd, sd, RFIFOW(fd, 2), RFIFOW(fd, 4) );
-			mmo_char_send(fd, sd);
-			RFIFOSKIP(fd,8);
-		break;
-
-		case 0x9a1:
-			if( RFIFOREST(fd) < 2 )
-				return 0;
-			char_parse_req_charlist(fd,sd);
-			RFIFOSKIP(fd,2);
-			break;
-
-		// unknown packet received
-		default:
-			ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
-			set_eof(fd);
-			return 0;
-		}
+		RFIFOSKIP(fd,60);
 	}
-
-	RFIFOFLUSH(fd);
-	return 0;
+	return 1;
 }
 
 // Console Command Parser [Wizputer]
@@ -4563,53 +3683,84 @@
 	return 0;
 }
 
-int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data)
-{
-	if (login_fd > 0 && session[login_fd] != NULL)
-		return 0;
+//------------------------------------------------
+//Pincode system
+//------------------------------------------------
 
-	ShowInfo("Attempt to connect to login-server...\n");
-	login_fd = make_connection(login_ip, login_port, false,10);
-	if (login_fd == -1)
-	{	//Try again later. [Skotlex]
-		login_fd = 0;
+/* pincode_sendstate transmist the pincode state to client
+ * S 08b9 <seed>.L <aid>.L <state>.W (HC_SECOND_PASSWD_LOGIN)
+ * state :
+ *   0 = disabled / pin is correct
+ *   1 = ask for pin - client sends 0x8b8
+ *   2 = create new pin - client sends 0x8ba
+ *   3 = pin must be changed - client 0x8be
+ *   4 = create new pin - client sends 0x8ba
+ *   5 = client shows msgstr(1896)
+ *   6 = client shows msgstr(1897) Unable to use your KSSN number
+ *   7 = char select window shows a button - client sends 0x8c5
+ *   8 = pincode was incorrect
+*/
+void pincode_sendstate( int fd, struct char_session_data* sd, enum pincode_state state ){
+	WFIFOHEAD(fd, 12);
+	WFIFOW(fd, 0) = 0x8b9;
+	WFIFOL(fd, 2) = sd->pincode_seed = rnd() % 0xFFFF;
+	WFIFOL(fd, 6) = sd->account_id;
+	WFIFOW(fd,10) = state;
+	WFIFOSET(fd,12);
+}
+
+void pincode_notifyLoginPinError( int account_id ){
+	WFIFOHEAD(login_fd,6);
+	WFIFOW(login_fd,0) = 0x2739;
+	WFIFOL(login_fd,2) = account_id;
+	WFIFOSET(login_fd,6);
+}
+
+void pincode_notifyLoginPinUpdate( int account_id, char* pin ){
+	WFIFOHEAD(login_fd,11);
+	WFIFOW(login_fd,0) = 0x2738;
+	WFIFOL(login_fd,2) = account_id;
+	strncpy( (char*)WFIFOP(login_fd,6), pin, PINCODE_LENGTH+1 );
+	WFIFOSET(login_fd,11);
+}
+
+int char_parse_reqpincode_window(int fd, struct char_session_data* sd){
+	if( RFIFOREST(fd) < 6 )
 		return 0;
+	if( pincode_enabled && RFIFOL(fd,2) == sd->account_id ){
+		if( strlen( sd->pincode ) <= 0 ){
+			pincode_sendstate( fd, sd, PINCODE_NEW );
+		}else{
+			pincode_sendstate( fd, sd, PINCODE_ASK );
+		}
 	}
-	session[login_fd]->func_parse = parse_fromlogin;
-	session[login_fd]->flag.server = 1;
-	realloc_fifo(login_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-
-	WFIFOHEAD(login_fd,86);
-	WFIFOW(login_fd,0) = 0x2710;
-	memcpy(WFIFOP(login_fd,2), userid, 24);
-	memcpy(WFIFOP(login_fd,26), passwd, 24);
-	WFIFOL(login_fd,50) = 0;
-	WFIFOL(login_fd,54) = htonl(char_ip);
-	WFIFOW(login_fd,58) = htons(char_port);
-	memcpy(WFIFOP(login_fd,60), server_name, 20);
-	WFIFOW(login_fd,80) = 0;
-	WFIFOW(login_fd,82) = char_maintenance;
-	WFIFOW(login_fd,84) = char_new_display; //only display (New) if they want to [Kevin]
-	WFIFOSET(login_fd,86);
-
+	RFIFOSKIP(fd,6);
 	return 1;
 }
 
-//------------------------------------------------
-//Pincode system
-//------------------------------------------------
-void pincode_check( int fd, struct char_session_data* sd ){
-	char pin[PINCODE_LENGTH+1];
+void pincode_decrypt( uint32 userSeed, char* pin ){
+	int i, pos;
+	char tab[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+	char *buf;
+	uint32 multiplier = 0x3498, baseSeed = 0x881234;
 
-	memset(pin,0,PINCODE_LENGTH+1);
+	for( i = 1; i < 10; i++ ){
+		userSeed = baseSeed + userSeed * multiplier;
+		pos = userSeed % ( i + 1 );
+		if( i != pos ){
+			tab[i] ^= tab[pos];
+			tab[pos] ^= tab[i];
+			tab[i] ^= tab[pos];
+		}
+	}
 
-	strncpy((char*)pin, (char*)RFIFOP(fd, 6), PINCODE_LENGTH);
-
-	pincode_decrypt(sd->pincode_seed, pin );
-
-	if( pincode_compare( fd, sd, pin ) ){
-		pincode_sendstate( fd, sd, PINCODE_PASSED );
+	buf = (char *)malloc( sizeof(char) * ( PINCODE_LENGTH + 1 ) );
+	memset( buf, 0, PINCODE_LENGTH + 1 );
+	for( i = 0; i < PINCODE_LENGTH; i++ ){
+		sprintf( buf + i, "%d", tab[pin[i] - '0'] );
 	}
+	strcpy( pin, buf );
+	free( buf );
 }
 
 int pincode_compare( int fd, struct char_session_data* sd, char* pin ){
@@ -4627,114 +3778,110 @@
 	}
 }
 
-void pincode_change( int fd, struct char_session_data* sd ){
+int char_parse_pincode_check( int fd, struct char_session_data* sd ){
+	char pin[PINCODE_LENGTH+1];
+
+	if( RFIFOREST(fd) < 10 )
+		return 0;
+	if( pincode_enabled==0 || RFIFOL(fd,2) != sd->account_id )
+		return 0;
+
+	memset(pin,0,PINCODE_LENGTH+1);
+	strncpy((char*)pin, (char*)RFIFOP(fd, 6), PINCODE_LENGTH);
+	RFIFOSKIP(fd,10);
+
+	pincode_decrypt(sd->pincode_seed, pin );
+	if( pincode_compare( fd, sd, pin ) ){
+		pincode_sendstate( fd, sd, PINCODE_PASSED );
+	}
+	return 1;
+}
+
+int char_parse_pincode_change( int fd, struct char_session_data* sd ){
 	char oldpin[PINCODE_LENGTH+1];
 	char newpin[PINCODE_LENGTH+1];
 
+	if( RFIFOREST(fd) < 14 )
+		return 0;
+	if( pincode_enabled==0 || RFIFOL(fd,2) != sd->account_id )
+		return 0;
+
 	memset(oldpin,0,PINCODE_LENGTH+1);
 	memset(newpin,0,PINCODE_LENGTH+1);
+	strncpy(oldpin, (char*)RFIFOP(fd,6), PINCODE_LENGTH);
+	strncpy(newpin, (char*)RFIFOP(fd,10), PINCODE_LENGTH);
+	RFIFOSKIP(fd,14);
 
-	strncpy(oldpin, (char*)RFIFOP(fd,6), PINCODE_LENGTH);
 	pincode_decrypt(sd->pincode_seed,oldpin);
-
 	if( !pincode_compare( fd, sd, oldpin ) )
-		return;
-
-	strncpy(newpin, (char*)RFIFOP(fd,10), PINCODE_LENGTH);
+		return 0;
 	pincode_decrypt(sd->pincode_seed,newpin);
 
 	pincode_notifyLoginPinUpdate( sd->account_id, newpin );
 	strncpy(sd->pincode, newpin, sizeof(newpin));
 
 	pincode_sendstate( fd, sd, PINCODE_PASSED );
+	return 1;
 }
 
-void pincode_setnew( int fd, struct char_session_data* sd ){
+int char_parse_pincode_setnew( int fd, struct char_session_data* sd ){
 	char newpin[PINCODE_LENGTH+1];
 
 	memset(newpin,0,PINCODE_LENGTH+1);
 
+	if( RFIFOREST(fd) < 10 )
+		return 0;
+
+	if( pincode_enabled==0 || RFIFOL(fd,2) != sd->account_id )
+		return 0;
 	strncpy( newpin, (char*)RFIFOP(fd,6), PINCODE_LENGTH );
+	RFIFOSKIP(fd,10);
+
 	pincode_decrypt( sd->pincode_seed, newpin );
 
 	pincode_notifyLoginPinUpdate( sd->account_id, newpin );
 	strncpy( sd->pincode, newpin, strlen( newpin ) );
 
 	pincode_sendstate( fd, sd, PINCODE_PASSED );
+	return 1;
 }
 
-// 0 = disabled / pin is correct
-// 1 = ask for pin - client sends 0x8b8
-// 2 = create new pin - client sends 0x8ba
-// 3 = pin must be changed - client 0x8be
-// 4 = create new pin - client sends 0x8ba
-// 5 = client shows msgstr(1896)
-// 6 = client shows msgstr(1897) Unable to use your KSSN number
-// 7 = char select window shows a button - client sends 0x8c5
-// 8 = pincode was incorrect
-void pincode_sendstate( int fd, struct char_session_data* sd, uint16 state ){
-	WFIFOHEAD(fd, 12);
-	WFIFOW(fd, 0) = 0x8b9;
-	WFIFOL(fd, 2) = sd->pincode_seed = rnd() % 0xFFFF;
-	WFIFOL(fd, 6) = sd->account_id;
-	WFIFOW(fd,10) = state;
-	WFIFOSET(fd,12);
-}
 
-void pincode_notifyLoginPinUpdate( int account_id, char* pin ){
-	WFIFOHEAD(login_fd,11);
-	WFIFOW(login_fd,0) = 0x2738;
-	WFIFOL(login_fd,2) = account_id;
-	strncpy( (char*)WFIFOP(login_fd,6), pin, PINCODE_LENGTH+1 );
-	WFIFOSET(login_fd,11);
+//------------------------------------------------
+//Add On system
+//------------------------------------------------
+// reason
+// 0: success
+// 1: failed
+void moveCharSlotReply( int fd, struct char_session_data* sd, unsigned short index, short reason ){
+	WFIFOHEAD(fd,8);
+	WFIFOW(fd,0) = 0x8d5;
+	WFIFOW(fd,2) = 8;
+	WFIFOW(fd,4) = reason;
+	WFIFOW(fd,6) = sd->char_moves[index];
+	WFIFOSET(fd,8);
 }
 
-void pincode_notifyLoginPinError( int account_id ){
-	WFIFOHEAD(login_fd,6);
-	WFIFOW(login_fd,0) = 0x2739;
-	WFIFOL(login_fd,2) = account_id;
-	WFIFOSET(login_fd,6);
-}
+int char_parse_moveCharSlot( int fd, struct char_session_data* sd){
+	uint16 from, to;
 
-void pincode_decrypt( uint32 userSeed, char* pin ){
-	int i, pos;
-	char tab[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-	char *buf;
-	uint32 multiplier = 0x3498, baseSeed = 0x881234;
+	if( RFIFOREST(fd) < 8 )
+		return 0;
+	from = RFIFOW(fd,2);
+	to = RFIFOW(fd,4);
+	//Cnt = RFIFOW(fd,6); //how many time we have left to change (client.. lol we don't trust him)
+	RFIFOSKIP(fd,8);
 
-	for( i = 1; i < 10; i++ ){
-		userSeed = baseSeed + userSeed * multiplier;
-		pos = userSeed % ( i + 1 );
-		if( i != pos ){
-			tab[i] ^= tab[pos];
-			tab[pos] ^= tab[i];
-			tab[i] ^= tab[pos];
-		}
-	}
-
-	buf = (char *)malloc( sizeof(char) * ( PINCODE_LENGTH + 1 ) );
-	memset( buf, 0, PINCODE_LENGTH + 1 );
-	for( i = 0; i < PINCODE_LENGTH; i++ ){
-		sprintf( buf + i, "%d", tab[pin[i] - '0'] );
-	}
-	strcpy( pin, buf );
-	free( buf );
-}
-
-//------------------------------------------------
-//Add On system
-//------------------------------------------------
-void moveCharSlot( int fd, struct char_session_data* sd, unsigned short from, unsigned short to ){
 	// Have we changed to often or is it disabled?
 	if( !char_move_enabled || ( !char_moves_unlimited && sd->char_moves[from] <= 0 ) ){
 		moveCharSlotReply( fd, sd, from, 1 );
-		return;
+		return 0;
 	}
 
 	// We dont even have a character on the chosen slot?
 	if( sd->found_char[from] <= 0 ){
 		moveCharSlotReply( fd, sd, from, 1 );
-		return;
+		return 0;
 	}
 
 	if( sd->found_char[to] > 0 ){
@@ -4749,17 +3896,17 @@
 				moveCharSlotReply( fd, sd, from, 1 );
 				Sql_ShowDebug(sql_handle);
 				Sql_QueryStr(sql_handle,"ROLLBACK");
-				return;
+				return 0;
 			}
 		}else{
 			// Admin doesnt allow us to
 			moveCharSlotReply( fd, sd, from, 1 );
-			return;
+			return 0;
 		}
 	}else if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `char_num`='%d' WHERE `char_id`='%d'", char_db, to, sd->found_char[from] ) ){
 		Sql_ShowDebug(sql_handle);
 		moveCharSlotReply( fd, sd, from, 1 );
-		return;
+		return 0;
 	}
 
 	if( !char_moves_unlimited ){
@@ -4770,20 +3917,9 @@
 	// We successfully moved the char - time to notify the client
 	moveCharSlotReply( fd, sd, from, 0 );
 	mmo_char_send(fd, sd);
+	return 1;
 }
 
-// reason
-// 0: success
-// 1: failed
-void moveCharSlotReply( int fd, struct char_session_data* sd, unsigned short index, short reason ){
-	WFIFOHEAD(fd,8);
-	WFIFOW(fd,0) = 0x8d5;
-	WFIFOW(fd,2) = 8;
-	WFIFOW(fd,4) = reason;
-	WFIFOW(fd,6) = sd->char_moves[index];
-	WFIFOSET(fd,8);
-}
-
 //------------------------------------------------
 //Invoked 15 seconds after mapif_disconnectplayer in case the map server doesn't
 //replies/disconnect the player we tried to kick. [Skotlex]
@@ -5154,6 +4290,986 @@
 	return 0;
 }
 
+
+
+// 0065 <account id>.L <login id1>.L <login id2>.L <???>.W <sex>.B
+int char_parse_reqtoconnect(int fd, struct char_session_data* sd,uint32 ipl){
+	if( RFIFOREST(fd) < 17 ) // request to connect
+		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);
+		int sex = RFIFOB(fd,16);
+		RFIFOSKIP(fd,17);
+
+		ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", account_id, login_id1, login_id2);
+
+		if (sd) {
+			//Received again auth packet for already authentified account?? Discard it.
+			//TODO: Perhaps log this as a hack attempt?
+			//TODO: and perhaps send back a reply?
+			ShowInfo("Already registered break\n");
+			return 0;
+		}
+
+		CREATE(session[fd]->session_data, struct char_session_data, 1);
+		sd = (struct char_session_data*)session[fd]->session_data;
+		sd->account_id = account_id;
+		sd->login_id1 = login_id1;
+		sd->login_id2 = login_id2;
+		sd->sex = sex;
+		sd->auth = false; // not authed yet
+
+		// send back account_id
+		WFIFOHEAD(fd,4);
+		WFIFOL(fd,0) = account_id;
+		WFIFOSET(fd,4);
+
+		if( runflag != CHARSERVER_ST_RUNNING )
+		{
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x6c;
+			WFIFOB(fd,2) = 0;// rejected from server
+			WFIFOSET(fd,3);
+			return 0;
+		}
+
+		// search authentification
+		node = (struct auth_node*)idb_get(auth_db, account_id);
+		if( node != NULL &&
+		    node->account_id == account_id &&
+			node->login_id1  == login_id1 &&
+			node->login_id2  == login_id2 /*&&
+			node->ip         == ipl*/ )
+		{// authentication found (coming from map server)
+			idb_remove(auth_db, account_id);
+			char_auth_ok(fd, sd);
+		}
+		else
+		{// authentication not found (coming from login server)
+			if (login_fd > 0) { // don't send request if no login-server
+				WFIFOHEAD(login_fd,23);
+				WFIFOW(login_fd,0) = 0x2712; // ask login-server to authentify an account
+				WFIFOL(login_fd,2) = sd->account_id;
+				WFIFOL(login_fd,6) = sd->login_id1;
+				WFIFOL(login_fd,10) = sd->login_id2;
+				WFIFOB(login_fd,14) = sd->sex;
+				WFIFOL(login_fd,15) = htonl(ipl);
+				WFIFOL(login_fd,19) = fd;
+				WFIFOSET(login_fd,23);
+			} else { // if no login-server, we must refuse connection
+				WFIFOHEAD(fd,3);
+				WFIFOW(fd,0) = 0x6c;
+				WFIFOB(fd,2) = 0;
+				WFIFOSET(fd,3);
+			}
+		}
+	}
+	return 1;
+}
+
+int char_parse_charselect(int fd, struct char_session_data* sd,uint32 ipl){
+	FIFOSD_CHECK(3);
+	{
+		struct mmo_charstatus char_dat;
+		struct mmo_charstatus *cd;
+		char* data;
+		int char_id;
+		uint32 subnet_map_ip;
+		struct auth_node* node;
+		int i, map_fd;
+
+		int slot = RFIFOB(fd,2);
+		RFIFOSKIP(fd,3);
+
+		if ( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT `char_id` FROM `%s` WHERE `account_id`='%d' AND `char_num`='%d'", char_db, sd->account_id, slot)
+		  || SQL_SUCCESS != Sql_NextRow(sql_handle)
+		  || SQL_SUCCESS != Sql_GetData(sql_handle, 0, &data, NULL) )
+		{	//Not found?? May be forged packet.
+			Sql_ShowDebug(sql_handle);
+			Sql_FreeResult(sql_handle);
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x6c;
+			WFIFOB(fd,2) = 0; // rejected from server
+			WFIFOSET(fd,3);
+			return 0;
+		}
+
+		char_id = atoi(data);
+		Sql_FreeResult(sql_handle);
+
+		/* set char as online prior to loading its data so 3rd party applications will realise the sql data is not reliable */
+		set_char_online(-2,char_id,sd->account_id);
+		if( !mmo_char_fromsql(char_id, &char_dat, true) ) { /* failed? set it back offline */
+			set_char_offline(char_id, sd->account_id);
+			/* failed to load something. REJECT! */
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x6c;
+			WFIFOB(fd,2) = 0;
+			WFIFOSET(fd,3);
+			return 0;/* jump off this boat */
+		}
+
+		//Have to switch over to the DB instance otherwise data won't propagate [Kevin]
+		cd = (struct mmo_charstatus *)idb_get(char_db_, char_id);
+		cd->sex = sd->sex;
+
+		if (log_char) {
+			char esc_name[NAME_LENGTH*2+1];
+
+			Sql_EscapeStringLen(sql_handle, esc_name, char_dat.name, strnlen(char_dat.name, NAME_LENGTH));
+			if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
+				charlog_db, sd->account_id, slot, esc_name) )
+				Sql_ShowDebug(sql_handle);
+		}
+		ShowInfo("Selected char: (Account %d: %d - %s)\n", sd->account_id, slot, char_dat.name);
+
+		// searching map server
+		i = search_mapserver(cd->last_point.map, -1, -1);
+
+		// if map is not found, we check major cities
+		if (i < 0 || !cd->last_point.map) {
+			unsigned short j;
+			//First check that there's actually a map server online.
+			ARR_FIND( 0, ARRAYLENGTH(server), j, server[j].fd >= 0 && server[j].map[0] );
+			if (j == ARRAYLENGTH(server)) {
+				ShowInfo("Connection Closed. No map servers available.\n");
+				WFIFOHEAD(fd,3);
+				WFIFOW(fd,0) = 0x81;
+				WFIFOB(fd,2) = 1; // 01 = Server closed
+				WFIFOSET(fd,3);
+				return 0;
+			}
+			if ((i = search_mapserver((j=mapindex_name2id(MAP_PRONTERA)),-1,-1)) >= 0) {
+				cd->last_point.x = 273;
+				cd->last_point.y = 354;
+			} else if ((i = search_mapserver((j=mapindex_name2id(MAP_GEFFEN)),-1,-1)) >= 0) {
+				cd->last_point.x = 120;
+				cd->last_point.y = 100;
+			} else if ((i = search_mapserver((j=mapindex_name2id(MAP_MORROC)),-1,-1)) >= 0) {
+				cd->last_point.x = 160;
+				cd->last_point.y = 94;
+			} else if ((i = search_mapserver((j=mapindex_name2id(MAP_ALBERTA)),-1,-1)) >= 0) {
+				cd->last_point.x = 116;
+				cd->last_point.y = 57;
+			} else if ((i = search_mapserver((j=mapindex_name2id(MAP_PAYON)),-1,-1)) >= 0) {
+				cd->last_point.x = 87;
+				cd->last_point.y = 117;
+			} else if ((i = search_mapserver((j=mapindex_name2id(MAP_IZLUDE)),-1,-1)) >= 0) {
+				cd->last_point.x = 94;
+				cd->last_point.y = 103;
+			} else {
+				ShowInfo("Connection Closed. No map server available that has a major city, and unable to find map-server for '%s'.\n", mapindex_id2name(cd->last_point.map));
+				WFIFOHEAD(fd,3);
+				WFIFOW(fd,0) = 0x81;
+				WFIFOB(fd,2) = 1; // 01 = Server closed
+				WFIFOSET(fd,3);
+				return 0;
+			}
+			ShowWarning("Unable to find map-server for '%s', sending to major city '%s'.\n", mapindex_id2name(cd->last_point.map), mapindex_id2name(j));
+			cd->last_point.map = j;
+		}
+
+		//Send NEW auth packet [Kevin]
+		//FIXME: is this case even possible? [ultramage]
+		if ((map_fd = server[i].fd) < 1 || session[map_fd] == NULL)
+		{
+			ShowError("parse_char: Attempting to write to invalid session %d! Map Server #%d disconnected.\n", map_fd, i);
+			server[i].fd = -1;
+			memset(&server[i], 0, sizeof(struct mmo_map_server));
+			//Send server closed.
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x81;
+			WFIFOB(fd,2) = 1; // 01 = Server closed
+			WFIFOSET(fd,3);
+			return 0;
+		}
+
+		//Send player to map
+		WFIFOHEAD(fd,28);
+		WFIFOW(fd,0) = 0x71;
+		WFIFOL(fd,2) = cd->char_id;
+		mapindex_getmapname_ext(mapindex_id2name(cd->last_point.map), (char*)WFIFOP(fd,6));
+		subnet_map_ip = lan_subnetcheck(ipl); // Advanced subnet check [LuzZza]
+		WFIFOL(fd,22) = htonl((subnet_map_ip) ? subnet_map_ip : server[i].ip);
+		WFIFOW(fd,26) = ntows(htons(server[i].port)); // [!] LE byte order here [!]
+		WFIFOSET(fd,28);
+
+		// create temporary auth entry
+		CREATE(node, struct auth_node, 1);
+		node->account_id = sd->account_id;
+		node->char_id = cd->char_id;
+		node->login_id1 = sd->login_id1;
+		node->login_id2 = sd->login_id2;
+		node->sex = sd->sex;
+		node->expiration_time = sd->expiration_time;
+		node->group_id = sd->group_id;
+		node->ip = ipl;
+		idb_put(auth_db, sd->account_id, node);
+
+	}
+	return 1;
+}
+
+// S 0970 <name>.24B <slot>.B <hair color>.W <hair style>.W
+// S 0067 <name>.24B <str>.B <agi>.B <vit>.B <int>.B <dex>.B <luk>.B <slot>.B <hair color>.W <hair style>.W
+int char_parse_createnewchar(int fd, struct char_session_data* sd,int cmd){
+	int i=0, ch;
+
+	if (cmd == 0x970) FIFOSD_CHECK(31) //>=20120307
+	else if (cmd == 0x67) FIFOSD_CHECK(37)
+	else return 0;
+
+	if( !char_new ) //turn character creation on/off [Kevin]
+		i = -2;
+	else {
+		if (cmd == 0x970){
+			i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
+			RFIFOSKIP(fd,31);
+		}
+		else if(cmd == 0x67){
+#if PACKETVER < 20120307
+			i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
+			RFIFOSKIP(fd,37);
+#endif
+		}
+	}
+
+	//'Charname already exists' (-1), 'Char creation denied' (-2) and 'You are underaged' (-3)
+	if (i < 0) {
+		WFIFOHEAD(fd,3);
+		WFIFOW(fd,0) = 0x6e;
+		/* Others I found [Ind] */
+		/* 0x02 = Symbols in Character Names are forbidden */
+		/* 0x03 = You are not elegible to open the Character Slot. */
+		switch (i) {
+			case -1: WFIFOB(fd,2) = 0x00; break;
+			case -2: WFIFOB(fd,2) = 0xFF; break;
+			case -3: WFIFOB(fd,2) = 0x01; break;
+			case -4: WFIFOB(fd,2) = 0x03; break;
+		}
+		WFIFOSET(fd,3);
+	} else {
+		int len;
+		// retrieve data
+		struct mmo_charstatus char_dat;
+		mmo_char_fromsql(i, &char_dat, false); //Only the short data is needed.
+
+		// send to player
+		WFIFOHEAD(fd,2+MAX_CHAR_BUF);
+		WFIFOW(fd,0) = 0x6d;
+		len = 2 + mmo_char_tobuf(WFIFOP(fd,2), &char_dat);
+		WFIFOSET(fd,len);
+
+		// add new entry to the chars list
+		ARR_FIND( 0, MAX_CHARS, ch, sd->found_char[ch] == -1 );
+		if( ch < MAX_CHARS )
+			sd->found_char[ch] = i; // the char_id of the new char
+	}
+	return 1;
+}
+
+int char_parse_delchar(int fd,struct char_session_data* sd, int cmd){
+	char email[40];
+	int i, ch;
+
+	if (cmd == 0x68) FIFOSD_CHECK(46)
+	else if (cmd == 0x1fb) FIFOSD_CHECK(56)
+	else return 0;
+
+	{
+		int cid = RFIFOL(fd,2);
+
+		ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
+		memcpy(email, RFIFOP(fd,6), 40);
+		RFIFOSKIP(fd,( cmd == 0x68) ? 46 : 56);
+
+		// Check if e-mail is correct
+		if(strcmpi(email, sd->email) && //email does not matches and
+		(
+			strcmp("a@a.com", sd->email) || //it is not default email, or
+			(strcmp("a@a.com", email) && strcmp("", email)) //email sent does not matches default
+		)) {	//Fail
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x70;
+			WFIFOB(fd,2) = 0; // 00 = Incorrect Email address
+			WFIFOSET(fd,3);
+			return 0;
+		}
+
+		// check if this char exists
+		ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+		if( i == MAX_CHARS )
+		{ // Such a character does not exist in the account
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x70;
+			WFIFOB(fd,2) = 0;
+			WFIFOSET(fd,3);
+			return 0;
+		}
+
+		// remove char from list and compact it
+		for(ch = i; ch < MAX_CHARS-1; ch++)
+			sd->found_char[ch] = sd->found_char[ch+1];
+		sd->found_char[MAX_CHARS-1] = -1;
+
+		/* Delete character */
+		if(delete_char_sql(cid)<0){
+			//can't delete the char
+			//either SQL error or can't delete by some CONFIG conditions
+			//del fail
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd, 0) = 0x70;
+			WFIFOB(fd, 2) = 0;
+			WFIFOSET(fd, 3);
+			return 0;
+		}
+		/* Char successfully deleted.*/
+		WFIFOHEAD(fd,2);
+		WFIFOW(fd,0) = 0x6f;
+		WFIFOSET(fd,2);
+	}
+	return 1;
+}
+
+// R 0187 <account ID>.l
+int char_parse_keepalive(int fd){
+	if (RFIFOREST(fd) < 6)
+		return 0;
+	//int aid = RFIFOL(fd,2);
+	RFIFOSKIP(fd,6);
+	return 1;
+}
+
+// R 08fc <char ID>.l <new name>.24B
+// R 028d <account ID>.l <char ID>.l <new name>.24B
+int char_parse_reqrename(int fd, struct char_session_data* sd, int cmd){
+	if(cmd == 0x8fc) FIFOSD_CHECK(30)
+	if(cmd == 0x28d) FIFOSD_CHECK(34)
+	else return 0;
+
+	{
+		int i, cid=0;
+		char name[NAME_LENGTH];
+		char esc_name[NAME_LENGTH*2+1];
+		safestrncpy(name, (char *)RFIFOP(fd,10), NAME_LENGTH);
+
+		if(cmd == 0x8fc){
+			cid =RFIFOL(fd,2);
+			RFIFOSKIP(fd,30);
+		}
+		else if(cmd == 0x28d) {
+			int aid = RFIFOL(fd,2);
+			cid =RFIFOL(fd,6);
+			if( aid != sd->account_id )
+				return 0;
+			RFIFOSKIP(fd,34);
+		}
+
+		ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+		if( i == MAX_CHARS )
+			return 0;
+
+		normalize_name(name,TRIM_CHARS);
+		Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+		if( !check_char_name(name,esc_name) )
+		{
+			i = 1;
+			safestrncpy(sd->new_name, name, NAME_LENGTH);
+		}
+		else
+			i = 0;
+
+		WFIFOHEAD(fd, 4);
+		WFIFOW(fd,0) = 0x28e;
+		WFIFOW(fd,2) = i;
+		WFIFOSET(fd,4);
+	}
+	return 1;
+}
+
+// 0x28f <char_id>.L
+int char_parse_ackrename(int fd, struct char_session_data* sd){
+	// 0: Sucessfull
+	// 1: This character's name has already been changed. You cannot change a character's name more than once.
+	// 2: User information is not correct.
+	// 3: You have failed to change this character's name.
+	// 4: Another user is using this character name, so please select another one.
+	FIFOSD_CHECK(6)
+
+	{
+		int i;
+		int cid = RFIFOL(fd,2);
+		RFIFOSKIP(fd,6);
+
+		ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+		if( i == MAX_CHARS )
+			return 0;
+		i = rename_char_sql(sd, cid);
+
+		WFIFOHEAD(fd, 4);
+		WFIFOW(fd,0) = 0x290;
+		WFIFOW(fd,2) = i;
+		WFIFOSET(fd,4);
+	}
+	return 1;
+}
+
+// R 07e5 <?>.w <aid>.l
+int char_parse_reqcaptcha(int fd){
+	WFIFOHEAD(fd,5);
+	WFIFOW(fd,0) = 0x7e9;
+	WFIFOW(fd,2) = 5;
+	WFIFOB(fd,4) = 1;
+	WFIFOSET(fd,5);
+	RFIFOSKIP(fd,8);
+	return 1;
+}
+
+// R 07e7 <len>.w <aid>.l <code>.b10 <?>.b14
+int char_parse_chkcaptcha(int fd){
+	WFIFOHEAD(fd,5);
+	WFIFOW(fd,0) = 0x7e9;
+	WFIFOW(fd,2) = 5;
+	WFIFOB(fd,4) = 1;
+	WFIFOSET(fd,5);
+	RFIFOSKIP(fd,32);
+	return 1;
+}
+
+
+int parse_char(int fd)
+{
+	unsigned short cmd;
+	struct char_session_data* sd = (struct char_session_data*)session[fd]->session_data;
+	uint32 ipl = session[fd]->client_addr;
+
+	// disconnect any player if no login-server.
+	if(login_fd < 0)
+		set_eof(fd);
+
+	if(session[fd]->flag.eof)
+	{
+		if( sd != NULL && sd->auth )
+		{	// already authed client
+			struct online_char_data* data = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
+			if( data != NULL && data->fd == fd)
+				data->fd = -1;
+			if( data == NULL || data->server == -1) //If it is not in any server, send it offline. [Skotlex]
+				set_char_offline(-1,sd->account_id);
+		}
+		do_close(fd);
+		return 0;
+	}
+
+	while( RFIFOREST(fd) >= 2 )
+	{
+		cmd = RFIFOW(fd,0);
+		switch( cmd )
+		{
+
+		case 0x65: char_parse_reqtoconnect(fd,sd,ipl); break;
+		// char select
+		case 0x66: char_parse_charselect(fd,sd,ipl); break;
+		// createnewchar
+		case 0x970: char_parse_createnewchar(fd,sd,cmd); break;
+		case 0x67: char_parse_createnewchar(fd,sd,cmd); break;
+		// delete char
+		case 0x68: char_parse_delchar(fd,sd,cmd); break; //
+		case 0x1fb: char_parse_delchar(fd,sd,cmd); break; // 2004-04-19aSakexe+ langtype 12 char deletion packet
+		// client keep-alive packet (every 12 seconds)
+		case 0x187: char_parse_keepalive(fd); break;
+		// char rename
+		case 0x8fc: char_parse_reqrename(fd,sd,cmd); break; //request <date/version?>
+		case 0x28d: char_parse_reqrename(fd,sd,cmd); break; //request <date/version?>
+		case 0x28f: char_parse_ackrename(fd,sd); break; //Confirm change name.
+		// captcha
+		case 0x7e5: char_parse_reqcaptcha(fd); break; // captcha code request (not implemented)
+		case 0x7e7: char_parse_chkcaptcha(fd); break; // captcha code check (not implemented)
+		// deletion timer request
+		case 0x827: char_parse_delete2_req(fd, sd); break;
+		// deletion accept request
+		case 0x829: char_parse_delete2_accept(fd, sd); break;
+		// deletion cancel request
+		case 0x82b: char_parse_delete2_cancel(fd, sd); break;
+		// login as map-server
+		case 0x2af8: char_parse_maplogin(fd); return 0; // avoid processing of followup packets here
+		//pincode
+		case 0x8b8: char_parse_pincode_check( fd, sd ); break; // checks the entered pin
+		case 0x8c5: char_parse_reqpincode_window(fd,sd); break; // request for PIN window
+		case 0x8be: char_parse_pincode_change( fd, sd ); break; // pincode change request
+		case 0x8ba: char_parse_pincode_setnew( fd, sd ); break; // activate PIN system and set first PIN
+		// character movement request
+		case 0x8d4: char_parse_moveCharSlot(fd,sd); break;
+		case 0x9a1: char_parse_req_charlist(fd,sd); break;
+		// unknown packet received
+		default:
+			ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
+			set_eof(fd);
+			return 0;
+		}
+	}
+
+	RFIFOFLUSH(fd);
+	return 0;
+}
+
+///
+/// Login IF
+///
+
+int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data)
+{
+	if (login_fd > 0 && session[login_fd] != NULL)
+		return 0;
+
+	ShowInfo("Attempt to connect to login-server...\n");
+	login_fd = make_connection(login_ip, login_port, false,10);
+	if (login_fd == -1)
+	{	//Try again later. [Skotlex]
+		login_fd = 0;
+		return 0;
+	}
+	session[login_fd]->func_parse = parse_fromlogin;
+	session[login_fd]->flag.server = 1;
+	realloc_fifo(login_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
+
+	WFIFOHEAD(login_fd,86);
+	WFIFOW(login_fd,0) = 0x2710;
+	memcpy(WFIFOP(login_fd,2), userid, 24);
+	memcpy(WFIFOP(login_fd,26), passwd, 24);
+	WFIFOL(login_fd,50) = 0;
+	WFIFOL(login_fd,54) = htonl(char_ip);
+	WFIFOW(login_fd,58) = htons(char_port);
+	memcpy(WFIFOP(login_fd,60), server_name, 20);
+	WFIFOW(login_fd,80) = 0;
+	WFIFOW(login_fd,82) = char_maintenance;
+	WFIFOW(login_fd,84) = char_new_display; //only display (New) if they want to [Kevin]
+	WFIFOSET(login_fd,86);
+
+	return 1;
+}
+
+int char_parselog_ackconnect(int fd, struct char_session_data* sd){
+	if (RFIFOREST(fd) < 3)
+		return 0;
+
+	if (RFIFOB(fd,2)) {
+		//printf("connect login server error : %d\n", RFIFOB(fd,2));
+		ShowError("Can not connect to login-server.\n");
+		ShowError("The server communication passwords (default s1/p1) are probably invalid.\n");
+		ShowError("Also, please make sure your login db has the correct communication username/passwords and the gender of the account is S.\n");
+		ShowError("The communication passwords are set in map_athena.conf and char_athena.conf\n");
+		set_eof(fd);
+		return 0;
+	} else {
+		ShowStatus("Connected to login-server (connection #%d).\n", fd);
+		loginif_on_ready();
+	}
+	RFIFOSKIP(fd,3);
+	return 1;
+}
+
+int char_parselog_ackaccreq(int fd, struct char_session_data* sd){
+	if (RFIFOREST(fd) < 25)
+		return 0;
+	{
+		int account_id = RFIFOL(fd,2);
+		uint32 login_id1 = RFIFOL(fd,6);
+		uint32 login_id2 = RFIFOL(fd,10);
+		uint8 sex = RFIFOB(fd,14);
+		uint8 result = RFIFOB(fd,15);
+		int request_id = RFIFOL(fd,16);
+		uint32 version = RFIFOL(fd,20);
+		uint8 clienttype = RFIFOB(fd,24);
+		RFIFOSKIP(fd,25);
+
+		if( session_isActive(request_id) && (sd=(struct char_session_data*)session[request_id]->session_data) &&
+			!sd->auth && sd->account_id == account_id && sd->login_id1 == login_id1 && sd->login_id2 == login_id2 && sd->sex == sex )
+		{
+			int client_fd = request_id;
+			sd->version = version;
+			sd->clienttype = clienttype;
+			switch( result )
+			{
+			case 0:// ok
+				char_auth_ok(client_fd, sd);
+				break;
+			case 1:// auth failed
+				WFIFOHEAD(client_fd,3);
+				WFIFOW(client_fd,0) = 0x6c;
+				WFIFOB(client_fd,2) = 0;// rejected from server
+				WFIFOSET(client_fd,3);
+				break;
+			}
+		}
+	}
+	return 1;
+}
+
+int char_parselog_reqaccdata(int fd, struct char_session_data* sd){
+	int i;
+	if (RFIFOREST(fd) < 73)
+		return 0;
+
+	// find the authenticated session with this account id
+	ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) );
+	if( i < fd_max )
+	{
+		int server_id;
+		memcpy(sd->email, RFIFOP(fd,6), 40);
+		sd->expiration_time = (time_t)RFIFOL(fd,46);
+		sd->group_id = RFIFOB(fd,50);
+		sd->char_slots = RFIFOB(fd,51);
+		if( sd->char_slots > MAX_CHARS ) {
+			ShowError("Account '%d' `character_slots` column is higher than supported MAX_CHARS (%d), update MAX_CHARS in mmo.h! capping to MAX_CHARS...\n",sd->account_id,sd->char_slots);
+			sd->char_slots = MAX_CHARS;/* cap to maximum */
+		} else if ( !sd->char_slots )/* no value aka 0 in sql */
+			sd->char_slots = MAX_CHARS;/* cap to maximum */
+		safestrncpy(sd->birthdate, (const char*)RFIFOP(fd,52), sizeof(sd->birthdate));
+		safestrncpy(sd->pincode, (const char*)RFIFOP(fd,63), sizeof(sd->pincode));
+		sd->pincode_change = (time_t)RFIFOL(fd,68);
+		sd->version = RFIFOB(fd,72);
+		ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map[0] );
+		// continued from char_auth_ok...
+		if( server_id == ARRAYLENGTH(server) || //server not online, bugreport:2359
+			(max_connect_user == 0 && sd->group_id != gm_allow_group) ||
+			( max_connect_user > 0 && count_users() >= max_connect_user && sd->group_id != gm_allow_group ) ) {
+			// refuse connection (over populated)
+			WFIFOHEAD(i,3);
+			WFIFOW(i,0) = 0x6c;
+			WFIFOW(i,2) = 0;
+			WFIFOSET(i,3);
+		} else {
+			// send characters to player
+			mmo_char_send(i, sd);
+#if PACKETVER >=  20110309
+			if( pincode_enabled ){
+				// PIN code system enabled
+				if( strlen( sd->pincode ) <= 0 ){
+					// No PIN code has been set yet
+					if( pincode_force ){
+						pincode_sendstate( i, sd, PINCODE_NEW );
+					}else{
+						pincode_sendstate( i, sd, PINCODE_PASSED );
+					}
+				}else{
+					if( !pincode_changetime || ( sd->pincode_change + pincode_changetime ) > time(NULL) ){
+						struct online_char_data* node = (struct online_char_data*)idb_get( online_char_db, sd->account_id );
+
+						if( node != NULL && node->pincode_success ){
+							// User has already passed the check
+							pincode_sendstate( i, sd, PINCODE_PASSED );
+						}else{
+							// Ask user for his PIN code
+							pincode_sendstate( i, sd, PINCODE_ASK );
+						}
+					}else{
+						// User hasnt changed his PIN code too long
+						pincode_sendstate( i, sd, PINCODE_EXPIRED );
+					}
+				}
+			}else{
+				// PIN code system disabled
+				pincode_sendstate( i, sd, PINCODE_OK );
+			}
+#endif
+		}
+	}
+	RFIFOSKIP(fd,73);
+	return 1;
+}
+
+int char_parselog_keepalive(int fd, struct char_session_data* sd){
+	if (RFIFOREST(fd) < 2)
+		return 0;
+	RFIFOSKIP(fd,2);
+	session[fd]->flag.ping = 0;
+	return 1;
+}
+
+int char_parselog_ackchangesex(int fd, struct char_session_data* sd){
+	if (RFIFOREST(fd) < 7)
+		return 0;
+	{
+		unsigned char buf[7];
+		int i;
+
+		int acc = RFIFOL(fd,2);
+		int sex = RFIFOB(fd,6);
+		RFIFOSKIP(fd,7);
+
+		if( acc > 0 )
+		{// TODO: Is this even possible?
+			int char_id[MAX_CHARS];
+			int class_[MAX_CHARS];
+			int guild_id[MAX_CHARS];
+			int num;
+			char* data;
+
+			struct auth_node* node = (struct auth_node*)idb_get(auth_db, acc);
+			if( node != NULL )
+				node->sex = sex;
+
+			// get characters
+			if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `char_id`,`class`,`guild_id` FROM `%s` WHERE `account_id` = '%d'", char_db, acc) )
+				Sql_ShowDebug(sql_handle);
+			for( i = 0; i < MAX_CHARS && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+			{
+				Sql_GetData(sql_handle, 0, &data, NULL); char_id[i] = atoi(data);
+				Sql_GetData(sql_handle, 1, &data, NULL); class_[i] = atoi(data);
+				Sql_GetData(sql_handle, 2, &data, NULL); guild_id[i] = atoi(data);
+			}
+			num = i;
+			for( i = 0; i < num; ++i )
+			{
+				if( class_[i] == JOB_BARD || class_[i] == JOB_DANCER ||
+					class_[i] == JOB_CLOWN || class_[i] == JOB_GYPSY ||
+					class_[i] == JOB_BABY_BARD || class_[i] == JOB_BABY_DANCER ||
+					class_[i] == JOB_MINSTREL || class_[i] == JOB_WANDERER ||
+					class_[i] == JOB_MINSTREL_T || class_[i] == JOB_WANDERER_T ||
+					class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER ||
+					class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
+				{
+					// job modification
+					if( class_[i] == JOB_BARD || class_[i] == JOB_DANCER )
+						class_[i] = (sex ? JOB_BARD : JOB_DANCER);
+					else if( class_[i] == JOB_CLOWN || class_[i] == JOB_GYPSY )
+						class_[i] = (sex ? JOB_CLOWN : JOB_GYPSY);
+					else if( class_[i] == JOB_BABY_BARD || class_[i] == JOB_BABY_DANCER )
+						class_[i] = (sex ? JOB_BABY_BARD : JOB_BABY_DANCER);
+					else if( class_[i] == JOB_MINSTREL || class_[i] == JOB_WANDERER )
+						class_[i] = (sex ? JOB_MINSTREL : JOB_WANDERER);
+					else if( class_[i] == JOB_MINSTREL_T || class_[i] == JOB_WANDERER_T )
+						class_[i] = (sex ? JOB_MINSTREL_T : JOB_WANDERER_T);
+					else if( class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER )
+						class_[i] = (sex ? JOB_BABY_MINSTREL : JOB_BABY_WANDERER);
+					else if( class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
+						class_[i] = (sex ? JOB_KAGEROU : JOB_OBORO);
+				}
+
+				if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `class`='%d', `weapon`='0', `shield`='0', `head_top`='0', `head_mid`='0', `head_bottom`='0' WHERE `char_id`='%d'", char_db, class_[i], char_id[i]) )
+					Sql_ShowDebug(sql_handle);
+
+				if( guild_id[i] )// If there is a guild, update the guild_member data [Skotlex]
+					inter_guild_sex_changed(guild_id[i], acc, char_id[i], sex);
+			}
+			Sql_FreeResult(sql_handle);
+
+			// disconnect player if online on char-server
+			disconnect_player(acc);
+		}
+
+		// notify all mapservers about this change
+		WBUFW(buf,0) = 0x2b0d;
+		WBUFL(buf,2) = acc;
+		WBUFB(buf,6) = sex;
+		mapif_sendall(buf, 7);
+	}
+	return 1;
+}
+
+int char_parselog_ackacc2req(int fd, struct char_session_data* sd){
+	if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+		return 0;
+
+	{	//Receive account_reg2 registry, forward to map servers.
+		unsigned char buf[13+ACCOUNT_REG2_NUM*sizeof(struct global_reg)];
+		memcpy(buf,RFIFOP(fd,0), RFIFOW(fd,2));
+		WBUFW(buf,0) = 0x3804; //Map server can now receive all kinds of reg values with the same packet. [Skotlex]
+		mapif_sendall(buf, WBUFW(buf,2));
+		RFIFOSKIP(fd, RFIFOW(fd,2));
+	}
+	return 1;
+}
+
+int char_parselog_accbannotification(int fd, struct char_session_data* sd){
+	if (RFIFOREST(fd) < 11)
+		return 0;
+
+	{	// send to all map-servers to disconnect the player
+		unsigned char buf[11];
+		WBUFW(buf,0) = 0x2b14;
+		WBUFL(buf,2) = RFIFOL(fd,2);
+		WBUFB(buf,6) = RFIFOB(fd,6); // 0: change of statut, 1: ban
+		WBUFL(buf,7) = RFIFOL(fd,7); // status or final date of a banishment
+		mapif_sendall(buf, 11);
+	}
+	// disconnect player if online on char-server
+	disconnect_player(RFIFOL(fd,2));
+	RFIFOSKIP(fd,11);
+	return 1;
+}
+
+int char_parselog_askkick(int fd, struct char_session_data* sd){
+	if (RFIFOREST(fd) < 6)
+		return 0;
+	{
+		int aid = RFIFOL(fd,2);
+		struct online_char_data* character = (struct online_char_data*)idb_get(online_char_db, aid);
+		RFIFOSKIP(fd,6);
+		if( character != NULL )
+		{// account is already marked as online!
+			if( character->server > -1 )
+			{	//Kick it from the map server it is on.
+				mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
+				if (character->waiting_disconnect == INVALID_TIMER)
+					character->waiting_disconnect = add_timer(gettick()+AUTH_TIMEOUT, chardb_waiting_disconnect, character->account_id, 0);
+			}
+			else
+			{// Manual kick from char server.
+				struct char_session_data *tsd;
+				int i;
+				ARR_FIND( 0, fd_max, i, session[i] && (tsd = (struct char_session_data*)session[i]->session_data) && tsd->account_id == aid );
+				if( i < fd_max )
+				{
+					WFIFOHEAD(i,3);
+					WFIFOW(i,0) = 0x81;
+					WFIFOB(i,2) = 2; // "Someone has already logged in with this id"
+					WFIFOSET(i,3);
+					set_eof(i);
+				}
+				else // still moving to the map-server
+					set_char_offline(-1, aid);
+			}
+		}
+		idb_remove(auth_db, aid);// reject auth attempts from map-server
+	}
+	return 1;
+}
+
+int char_parselog_updip(int fd, struct char_session_data* sd){
+	if (RFIFOREST(fd) < 2)
+		return 0;
+	{
+		unsigned char buf[2];
+		uint32 new_ip = 0;
+
+		WBUFW(buf,0) = 0x2b1e;
+		mapif_sendall(buf, 2);
+
+		new_ip = host2ip(login_ip_str);
+		if (new_ip && new_ip != login_ip)
+			login_ip = new_ip; //Update login ip, too.
+
+		new_ip = host2ip(char_ip_str);
+		if (new_ip && new_ip != char_ip)
+		{	//Update ip.
+			char_ip = new_ip;
+			ShowInfo("Updating IP for [%s].\n", char_ip_str);
+			// notify login server about the change
+			WFIFOHEAD(fd,6);
+			WFIFOW(fd,0) = 0x2736;
+			WFIFOL(fd,2) = htonl(char_ip);
+			WFIFOSET(fd,6);
+		}
+
+		RFIFOSKIP(fd,2);
+	}
+	return 1;
+}
+
+int parse_fromlogin(int fd) {
+	struct char_session_data* sd = NULL;
+
+	// only process data from the login-server
+	if( fd != login_fd ) {
+		ShowDebug("parse_fromlogin: Disconnecting invalid session #%d (is not the login-server)\n", fd);
+		do_close(fd);
+		return 0;
+	}
+
+	if( session[fd]->flag.eof ) {
+		do_close(fd);
+		login_fd = -1;
+		loginif_on_disconnect();
+		return 0;
+	} else if ( session[fd]->flag.ping ) {/* we've reached stall time */
+		if( DIFF_TICK(last_tick, session[fd]->rdata_tick) > (stall_time * 2) ) {/* we can't wait any longer */
+			set_eof(fd);
+			return 0;
+		} else if( session[fd]->flag.ping != 2 ) { /* we haven't sent ping out yet */
+			WFIFOHEAD(fd,2);// sends a ping packet to login server (will receive pong 0x2718)
+			WFIFOW(fd,0) = 0x2719;
+			WFIFOSET(fd,2);
+
+			session[fd]->flag.ping = 2;
+		}
+	}
+
+	sd = (struct char_session_data*)session[fd]->session_data;
+
+	while(RFIFOREST(fd) >= 2) {
+		uint16 command = RFIFOW(fd,0);
+
+		switch( command )
+		{
+		// acknowledgement of connect-to-loginserver request
+		case 0x2711: char_parselog_ackconnect(fd,sd); break;
+		// acknowledgement of account authentication request
+		case 0x2713: char_parselog_ackaccreq(fd, sd); break;
+		// account data
+		case 0x2717: char_parselog_reqaccdata(fd, sd); break;
+		// login-server alive packet
+		case 0x2718: char_parselog_keepalive(fd, sd); break;
+		// changesex reply
+		case 0x2723: char_parselog_ackchangesex(fd, sd); break;
+		// reply to an account_reg2 registry request
+		case 0x2729: char_parselog_ackacc2req(fd, sd); break;
+		// State change of account/ban notification (from login-server)
+		case 0x2731: char_parselog_accbannotification(fd, sd); break;
+		// Login server request to kick a character out. [Skotlex]
+		case 0x2734: char_parselog_askkick(fd,sd); break;
+		// ip address update signal from login server
+		case 0x2735: char_parselog_updip(fd,sd); break;
+		default:
+			ShowError("Unknown packet 0x%04x received from login-server, disconnecting.\n", command);
+			set_eof(fd);
+			return 0;
+		}
+	}
+
+	RFIFOFLUSH(fd);
+	return 0;
+}
+
+
+
+
+/*======================================================
+ * Login-Server help option info
+ *------------------------------------------------------*/
+void display_helpscreen(bool do_exit)
+{
+	ShowInfo("Usage: %s [options]\n", SERVER_NAME);
+	ShowInfo("\n");
+	ShowInfo("Options:\n");
+	ShowInfo("  -?, -h [--help]\t\tDisplays this help screen.\n");
+	ShowInfo("  -v [--version]\t\tDisplays the server's version.\n");
+	ShowInfo("  --run-once\t\t\tCloses server after loading (testing).\n");
+	ShowInfo("  --char-config <file>\t\tAlternative char-server configuration.\n");
+	ShowInfo("  --lan-config <file>\t\tAlternative lag configuration.\n");
+	ShowInfo("  --inter-config <file>\t\tAlternative inter-server configuration.\n");
+	ShowInfo("  --msg-config <file>\t\tAlternative message configuration.\n");
+	if( do_exit )
+		exit(EXIT_SUCCESS);
+}
+
+int char_msg_config_read(char *cfgName){
+	return _msg_config_read(cfgName,CHAR_MAX_MSG,msg_table);
+}
+const char* char_msg_txt(int msg_number){
+	return _msg_txt(msg_number,CHAR_MAX_MSG,msg_table);
+}
+void char_do_final_msg(void){
+	_do_final_msg(CHAR_MAX_MSG,msg_table);
+}
+
+
+
 void do_final(void)
 {
 	ShowStatus("Terminating...\n");
@@ -5188,6 +5304,12 @@
 	ShowStatus("Finished.\n");
 }
 
+
+void set_server_type(void)
+{
+	SERVER_TYPE = ATHENA_SERVER_CHAR;
+}
+
 //------------------------------
 // Function called when the server
 // has received a crash signal.
@@ -5196,12 +5318,6 @@
 {
 }
 
-void set_server_type(void)
-{
-	SERVER_TYPE = ATHENA_SERVER_CHAR;
-}
-
-
 /// Called when a terminate signal is received.
 void do_shutdown(void)
 {
@@ -5317,33 +5433,4 @@
 		add_timer_interval(gettick()+1000, parse_console_timer, 0, 0, 1000); //start in 1s each 1sec
 	}
 	return 0;
-}
-
-int char_msg_config_read(char *cfgName){
-	return _msg_config_read(cfgName,CHAR_MAX_MSG,msg_table);
-}
-const char* char_msg_txt(int msg_number){
-	return _msg_txt(msg_number,CHAR_MAX_MSG,msg_table);
-}
-void char_do_final_msg(void){
-	_do_final_msg(CHAR_MAX_MSG,msg_table);
-}
-
-/*======================================================
- * Login-Server help option info
- *------------------------------------------------------*/
-void display_helpscreen(bool do_exit)
-{
-	ShowInfo("Usage: %s [options]\n", SERVER_NAME);
-	ShowInfo("\n");
-	ShowInfo("Options:\n");
-	ShowInfo("  -?, -h [--help]\t\tDisplays this help screen.\n");
-	ShowInfo("  -v [--version]\t\tDisplays the server's version.\n");
-	ShowInfo("  --run-once\t\t\tCloses server after loading (testing).\n");
-	ShowInfo("  --char-config <file>\t\tAlternative char-server configuration.\n");
-	ShowInfo("  --lan-config <file>\t\tAlternative lag configuration.\n");
-	ShowInfo("  --inter-config <file>\t\tAlternative inter-server configuration.\n");
-	ShowInfo("  --msg-config <file>\t\tAlternative message configuration.\n");
-	if( do_exit )
-		exit(EXIT_SUCCESS);
-}
+}
\ No newline at end of file