From 97bb21a79949779df76269b087f3bce7ef8179ee Mon Sep 17 00:00:00 2001 From: Dennis Friis Date: Wed, 2 Apr 2008 15:09:18 +0000 Subject: initial checkin --- misc/src/char/GNUmakefile | 17 + misc/src/char/Makefile | 17 + misc/src/char/char.c | 3149 ++++++++++++++++++++++++++++++++ misc/src/char/char.h | 31 + misc/src/char/diff.diff | 4242 +++++++++++++++++++++++++++++++++++++++++++ misc/src/char/int_guild.c | 1441 +++++++++++++++ misc/src/char/int_guild.h | 16 + misc/src/char/int_party.c | 595 ++++++ misc/src/char/int_party.h | 14 + misc/src/char/int_pet.c | 364 ++++ misc/src/char/int_pet.h | 13 + misc/src/char/int_storage.c | 504 +++++ misc/src/char/int_storage.h | 16 + misc/src/char/inter.c | 561 ++++++ misc/src/char/inter.h | 19 + 15 files changed, 10999 insertions(+) create mode 100644 misc/src/char/GNUmakefile create mode 100644 misc/src/char/Makefile create mode 100644 misc/src/char/char.c create mode 100644 misc/src/char/char.h create mode 100644 misc/src/char/diff.diff create mode 100644 misc/src/char/int_guild.c create mode 100644 misc/src/char/int_guild.h create mode 100644 misc/src/char/int_party.c create mode 100644 misc/src/char/int_party.h create mode 100644 misc/src/char/int_pet.c create mode 100644 misc/src/char/int_pet.h create mode 100644 misc/src/char/int_storage.c create mode 100644 misc/src/char/int_storage.h create mode 100644 misc/src/char/inter.c create mode 100644 misc/src/char/inter.h (limited to 'misc/src/char') diff --git a/misc/src/char/GNUmakefile b/misc/src/char/GNUmakefile new file mode 100644 index 0000000..dd21288 --- /dev/null +++ b/misc/src/char/GNUmakefile @@ -0,0 +1,17 @@ +all: char-server +txt: char-server + +COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/lock.o ../common/malloc.o +COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/db.h ../common/lock.h ../common/timer.h ../common/malloc.h +char-server: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o $(COMMON_OBJ) + $(CC) -o ../../$@ $^ + +char.o: char.c char.h inter.h int_pet.h $(COMMON_H) ../common/version.h +inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h char.h $(COMMON_H) +int_party.o: int_party.c int_party.h inter.h char.h $(COMMON_H) +int_guild.o: int_guild.c int_guild.h int_storage.h inter.h char.h $(COMMON_H) +int_storage.o: int_storage.c int_storage.h int_guild.h inter.h char.h $(COMMON_H) +int_pet.o: int_pet.c int_pet.h inter.h char.h $(COMMON_H) + +clean: + rm -f *.o ../../char-server diff --git a/misc/src/char/Makefile b/misc/src/char/Makefile new file mode 100644 index 0000000..6eaae48 --- /dev/null +++ b/misc/src/char/Makefile @@ -0,0 +1,17 @@ +all: char-server +txt: char-server + +COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/lock.o ../common/malloc.o +COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/db.h ../common/lock.h ../common/timer.h ../common/malloc.h +char-server: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o $(COMMON_OBJ) + $(CC) -o ../../$@ $> + +char.o: char.c char.h inter.h int_pet.h $(COMMON_H) ../common/version.h +inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h char.h $(COMMON_H) +int_party.o: int_party.c int_party.h inter.h char.h $(COMMON_H) +int_guild.o: int_guild.c int_guild.h int_storage.h inter.h char.h $(COMMON_H) +int_storage.o: int_storage.c int_storage.h int_guild.h inter.h char.h $(COMMON_H) +int_pet.o: int_pet.c int_pet.h inter.h char.h $(COMMON_H) + +clean: + rm -f *.o ../../char-server diff --git a/misc/src/char/char.c b/misc/src/char/char.c new file mode 100644 index 0000000..c279102 --- /dev/null +++ b/misc/src/char/char.c @@ -0,0 +1,3149 @@ +// $Id: char.c,v 1.3 2004/09/13 16:52:16 Yor Exp $ +// original : char2.c 2003/03/14 11:58:35 Rev.1.5 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "core.h" +#include "socket.h" +#include "timer.h" +#include "mmo.h" +#include "version.h" +#include "lock.h" +#include "char.h" + +#include "inter.h" +#include "int_pet.h" +#include "int_guild.h" +#include "int_party.h" +#include "int_storage.h" + +#ifdef MEMWATCH +#include "memwatch.h" +#endif + +struct mmo_map_server server[MAX_MAP_SERVERS]; +int server_fd[MAX_MAP_SERVERS]; +int server_freezeflag[MAX_MAP_SERVERS]; // Map-server anti-freeze system. Counter. 5 ok, 4...0 freezed +int anti_freeze_enable = 0; +int ANTI_FREEZE_INTERVAL = 6; + +int login_fd, char_fd; +char userid[24]; +char passwd[24]; +char server_name[20]; +char wisp_server_name[24] = "Server"; +char login_ip_str[16]; +int login_ip; +int login_port = 6900; +char char_ip_str[16]; +int char_ip; +int char_port = 6121; +int char_maintenance; +int char_new; +int email_creation = 0; // disabled by default +char char_txt[1024]; +char backup_txt[1024]; //By zanetheinsane +char backup_txt_flag = 0; // The backup_txt file was created because char deletion bug existed. Now it's finish and that take a lot of time to create a second file when there are a lot of characters. => option By [Yor] +char unknown_char_name[1024] = "Unknown"; +char char_log_filename[1024] = "log/char.log"; +//Added for lan support +char lan_map_ip[128]; +int subneti[4]; +int subnetmaski[4]; +int name_ignoring_case = 0; // Allow or not identical name for characters but with a different case by [Yor] +int char_name_option = 0; // Option to know which letters/symbols are authorised in the name of a character (0: all, 1: only those in char_name_letters, 2: all EXCEPT those in char_name_letters) by [Yor] +char char_name_letters[1024] = ""; // list of letters/symbols authorised (or not) in a character name. by [Yor] + +struct char_session_data{ + int account_id, login_id1, login_id2, sex; + int found_char[9]; + char email[40]; // e-mail (default: a@a.com) by [Yor] + time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited) +}; + +#define AUTH_FIFO_SIZE 256 +struct { + int account_id, char_id, login_id1, login_id2, ip, char_pos, delflag, sex; + time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited) +} auth_fifo[AUTH_FIFO_SIZE]; +int auth_fifo_pos = 0; + +int check_ip_flag = 1; // It's to check IP of a player between char-server and other servers (part of anti-hacking system) + +int char_id_count = 150000; +struct mmo_charstatus *char_dat; +int char_num, char_max; +int max_connect_user = 0; +int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; +int start_zeny = 500; +int start_weapon = 1201; +int start_armor = 1202; + +// Initial position (it's possible to set it in conf file) +struct point start_point = {"new_1-1.gat", 53, 111}; + +struct gm_account *gm_account = NULL; +int GM_num = 0; + +// online players by [Yor] +char online_txt_filename[1024] = "online.txt"; +char online_html_filename[1024] = "online.html"; +int online_sorting_option = 0; // sorting option to display online players in online files +int online_display_option = 1; // display options: to know which columns must be displayed +int online_refresh_html = 20; // refresh time (in sec) of the html file in the explorer +int online_gm_display_min_level = 20; // minimum GM level to display 'GM' when we want to display it + +int *online_chars; // same size of char_dat, and id value of current server (or -1) +time_t update_online; // to update online files when we receiving information from a server (not less than 8 seconds) + +//------------------------------ +// Writing function of logs file +//------------------------------ +int char_log(char *fmt, ...) { + FILE *logfp; + va_list ap; + struct timeval tv; + char tmpstr[2048]; + + va_start(ap, fmt); + + logfp = fopen(char_log_filename, "a"); + if (logfp) { + if (fmt[0] == '\0') // jump a line if no message + fprintf(logfp, RETCODE); + else { + gettimeofday(&tv, NULL); + strftime(tmpstr, 24, "%d-%m-%Y %H:%M:%S", localtime(&(tv.tv_sec))); + sprintf(tmpstr + 19, ".%03d: %s", (int)tv.tv_usec / 1000, fmt); + vfprintf(logfp, tmpstr, ap); + } + fclose(logfp); + } + + va_end(ap); + return 0; +} + +//----------------------------------------------------- +// Function to suppress control characters in a string. +//----------------------------------------------------- +int remove_control_chars(unsigned char *str) { + int i; + int change = 0; + + for(i = 0; str[i]; i++) { + if (str[i] < 32) { + str[i] = '_'; + change = 1; + } + } + + return change; +} + +//---------------------------------------------------------------------- +// Determine if an account (id) is a GM account +// and returns its level (or 0 if it isn't a GM account or if not found) +//---------------------------------------------------------------------- +int isGM(int account_id) { + int i; + + for(i = 0; i < GM_num; i++) + if (gm_account[i].account_id == account_id) + return gm_account[i].level; + return 0; +} + +//---------------------------------------------- +// Search an character id +// (return character index or -1 (if not found)) +// If exact character name is not found, +// the function checks without case sensitive +// and returns index if only 1 character is found +// and similar to the searched name. +//---------------------------------------------- +int search_character_index(char* character_name) { + int i, quantity, index; + + quantity = 0; + index = -1; + for(i = 0; i < char_num; i++) { + // Without case sensitive check (increase the number of similar character names found) + if (stricmp(char_dat[i].name, character_name) == 0) { + // Strict comparison (if found, we finish the function immediatly with correct value) + if (strcmp(char_dat[i].name, character_name) == 0) + return i; + quantity++; + index = i; + } + } + // Here, the exact character name is not found + // We return the found index of a similar account ONLY if there is 1 similar character + if (quantity == 1) + return index; + + // Exact character name is not found and 0 or more than 1 similar characters have been found ==> we say not found + return -1; +} + +//------------------------------------- +// Return character name with the index +//------------------------------------- +char * search_character_name(int index) { + + if (index >= 0 && index < char_num) + return char_dat[index].name; + + return unknown_char_name; +} + +//------------------------------------------------- +// Function to create the character line (for save) +//------------------------------------------------- +int mmo_char_tostr(char *str, struct mmo_charstatus *p) { + int i; + char *str_p = str; + + // on multi-map server, sometimes it's posssible that last_point become void. (reason???) We check that to not lost character at restart. + if (p->last_point.map[0] == '\0') { + memcpy(p->last_point.map, "prontera.gat", 16); + p->last_point.x = 273; + p->last_point.y = 354; + } + + str_p += sprintf(str_p, "%d\t%d,%d\t%s\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" + "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" + "\t%s,%d,%d\t%s,%d,%d,%d\t", + p->char_id, p->account_id, p->char_num, p->name, // + p->class, p->base_level, p->job_level, + p->base_exp, p->job_exp, p->zeny, + p->hp, p->max_hp, p->sp, p->max_sp, + p->str, p->agi, p->vit, p->int_, p->dex, p->luk, + p->status_point, p->skill_point, + p->option, p->karma, p->manner, // + p->party_id, p->guild_id, p->pet_id, + p->hair, p->hair_color, p->clothes_color, + p->weapon, p->shield, p->head_top, p->head_mid, p->head_bottom, + p->last_point.map, p->last_point.x, p->last_point.y, // + p->save_point.map, p->save_point.x, p->save_point.y, + p->partner_id); + for(i = 0; i < 10; i++) + if (p->memo_point[i].map[0]) { + str_p += sprintf(str_p, "%s,%d,%d", p->memo_point[i].map, p->memo_point[i].x, p->memo_point[i].y); + } + *(str_p++) = '\t'; + + for(i = 0; i < MAX_INVENTORY; i++) + if (p->inventory[i].nameid) { + str_p += sprintf(str_p, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ", + p->inventory[i].id, p->inventory[i].nameid, p->inventory[i].amount, p->inventory[i].equip, + p->inventory[i].identify, p->inventory[i].refine, p->inventory[i].attribute, + p->inventory[i].card[0], p->inventory[i].card[1], p->inventory[i].card[2], p->inventory[i].card[3], + p->inventory[i].broken); + } + *(str_p++) = '\t'; + + for(i = 0; i < MAX_CART; i++) + if (p->cart[i].nameid) { + str_p += sprintf(str_p, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ", + p->cart[i].id, p->cart[i].nameid, p->cart[i].amount, p->cart[i].equip, + p->cart[i].identify, p->cart[i].refine, p->cart[i].attribute, + p->cart[i].card[0], p->cart[i].card[1], p->cart[i].card[2], p->cart[i].card[3], + p->cart[i].broken); + } + *(str_p++) = '\t'; + + for(i = 0; i < MAX_SKILL; i++) + if (p->skill[i].id && p->skill[i].flag != 1) { + str_p += sprintf(str_p, "%d,%d ", p->skill[i].id, (p->skill[i].flag == 0) ? p->skill[i].lv : p->skill[i].flag-2); + } + *(str_p++) = '\t'; + + for(i = 0; i < p->global_reg_num; i++) + if (p->global_reg[i].str[0]) + str_p += sprintf(str_p, "%s,%d ", p->global_reg[i].str, p->global_reg[i].value); + *(str_p++) = '\t'; + + *str_p = '\0'; + return 0; +} + +//------------------------------------------------------------------------- +// Function to set the character from the line (at read of characters file) +//------------------------------------------------------------------------- +int mmo_char_fromstr(char *str, struct mmo_charstatus *p) { + int tmp_int[256]; + int set, next, len, i; + + // initilialise character + memset(p, '\0', sizeof(struct mmo_charstatus)); + + // If it's not char structure of version 1008 and after + if ((set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" + "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" + "\t%[^,],%d,%d\t%[^,],%d,%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, // + &tmp_int[3], &tmp_int[4], &tmp_int[5], + &tmp_int[6], &tmp_int[7], &tmp_int[8], + &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], + &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], + &tmp_int[19], &tmp_int[20], + &tmp_int[21], &tmp_int[22], &tmp_int[23], // + &tmp_int[24], &tmp_int[25], &tmp_int[26], + &tmp_int[27], &tmp_int[28], &tmp_int[29], + &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34], + p->last_point.map, &tmp_int[35], &tmp_int[36], // + p->save_point.map, &tmp_int[37], &tmp_int[38], &tmp_int[39], &next)) != 43) { + tmp_int[39] = 0; // partner id + // If not char structure from version 384 to 1007 + if ((set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" + "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" + "\t%[^,],%d,%d\t%[^,],%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, // + &tmp_int[3], &tmp_int[4], &tmp_int[5], + &tmp_int[6], &tmp_int[7], &tmp_int[8], + &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], + &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], + &tmp_int[19], &tmp_int[20], + &tmp_int[21], &tmp_int[22], &tmp_int[23], // + &tmp_int[24], &tmp_int[25], &tmp_int[26], + &tmp_int[27], &tmp_int[28], &tmp_int[29], + &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34], + p->last_point.map, &tmp_int[35], &tmp_int[36], // + p->save_point.map, &tmp_int[37], &tmp_int[38], &next)) != 42) { + // It's char structure of a version before 384 + tmp_int[26] = 0; // pet id + set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" + "\t%d,%d,%d\t%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" + "\t%[^,],%d,%d\t%[^,],%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, // + &tmp_int[3], &tmp_int[4], &tmp_int[5], + &tmp_int[6], &tmp_int[7], &tmp_int[8], + &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], + &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], + &tmp_int[19], &tmp_int[20], + &tmp_int[21], &tmp_int[22], &tmp_int[23], // + &tmp_int[24], &tmp_int[25], // + &tmp_int[27], &tmp_int[28], &tmp_int[29], + &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34], + p->last_point.map, &tmp_int[35], &tmp_int[36], // + p->save_point.map, &tmp_int[37], &tmp_int[38], &next); + set += 2; + //printf("char: old char data ver.1\n"); + // Char structure of version 1007 or older + } else { + set++; + //printf("char: old char data ver.2\n"); + } + // Char structure of version 1008+ + } else { + //printf("char: new char data ver.3\n"); + } + if (set != 43) + return 0; + + p->char_id = tmp_int[0]; + p->account_id = tmp_int[1]; + p->char_num = tmp_int[2]; + p->class = tmp_int[3]; + p->base_level = tmp_int[4]; + p->job_level = tmp_int[5]; + p->base_exp = tmp_int[6]; + p->job_exp = tmp_int[7]; + p->zeny = tmp_int[8]; + p->hp = tmp_int[9]; + p->max_hp = tmp_int[10]; + p->sp = tmp_int[11]; + p->max_sp = tmp_int[12]; + p->str = tmp_int[13]; + p->agi = tmp_int[14]; + p->vit = tmp_int[15]; + p->int_ = tmp_int[16]; + p->dex = tmp_int[17]; + p->luk = tmp_int[18]; + p->status_point = tmp_int[19]; + p->skill_point = tmp_int[20]; + p->option = tmp_int[21]; + p->karma = tmp_int[22]; + p->manner = tmp_int[23]; + p->party_id = tmp_int[24]; + p->guild_id = tmp_int[25]; + p->pet_id = tmp_int[26]; + p->hair = tmp_int[27]; + p->hair_color = tmp_int[28]; + p->clothes_color = tmp_int[29]; + p->weapon = tmp_int[30]; + p->shield = tmp_int[31]; + p->head_top = tmp_int[32]; + p->head_mid = tmp_int[33]; + p->head_bottom = tmp_int[34]; + p->last_point.x = tmp_int[35]; + p->last_point.y = tmp_int[36]; + p->save_point.x = tmp_int[37]; + p->save_point.y = tmp_int[38]; + p->partner_id = tmp_int[39]; + + // Some checks + for(i = 0; i < char_num; i++) { + if (char_dat[i].char_id == p->char_id) { + printf("\033[1;31mmmo_auth_init: ******Error: a character has an identical id to another.\n"); + printf(" character id #%d -> new character not readed.\n", p->char_id); + printf(" Character saved in log file.\033[0m\n"); + return -1; + } else if (strcmp(char_dat[i].name, p->name) == 0) { + printf("\033[1;31mmmo_auth_init: ******Error: character name already exists.\n"); + printf(" character name '%s' -> new character not readed.\n", p->name); + printf(" Character saved in log file.\033[0m\n"); + return -2; + } + } + + if (strcmpi(wisp_server_name, p->name) == 0) { + printf("mmo_auth_init: ******WARNING: character name has wisp server name.\n"); + printf(" Character name '%s' = wisp server name '%s'.\n", p->name, wisp_server_name); + printf(" Character readed. Suggestion: change the wisp server name.\n"); + char_log("mmo_auth_init: ******WARNING: character name has wisp server name: Character name '%s' = wisp server name '%s'." RETCODE, + p->name, wisp_server_name); + } + + if (str[next] == '\n' || str[next] == '\r') + return 1; // 新規データ + + next++; + + for(i = 0; str[next] && str[next] != '\t'; i++) { + if (sscanf(str+next, "%[^,],%d,%d%n", p->memo_point[i].map, &tmp_int[0], &tmp_int[1], &len) != 3) + return -3; + p->memo_point[i].x = tmp_int[0]; + p->memo_point[i].y = tmp_int[1]; + next += len; + if (str[next] == ' ') + next++; + } + + next++; + + for(i = 0; str[next] && str[next] != '\t'; i++) { + if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], + &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &len) == 12) { + // do nothing, it's ok + } else if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], + &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) { + tmp_int[11] = 0; // broken doesn't exist in this version -> 0 + } else // invalid structure + return -4; + p->inventory[i].id = tmp_int[0]; + p->inventory[i].nameid = tmp_int[1]; + p->inventory[i].amount = tmp_int[2]; + p->inventory[i].equip = tmp_int[3]; + p->inventory[i].identify = tmp_int[4]; + p->inventory[i].refine = tmp_int[5]; + p->inventory[i].attribute = tmp_int[6]; + p->inventory[i].card[0] = tmp_int[7]; + p->inventory[i].card[1] = tmp_int[8]; + p->inventory[i].card[2] = tmp_int[9]; + p->inventory[i].card[3] = tmp_int[10]; + p->inventory[i].broken = tmp_int[11]; + next += len; + if (str[next] == ' ') + next++; + } + + next++; + + for(i = 0; str[next] && str[next] != '\t'; i++) { + if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], + &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &len) == 12) { + // do nothing, it's ok + } else if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], + &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) { + tmp_int[11] = 0; // broken doesn't exist in this version -> 0 + } else // invalid structure + return -5; + p->cart[i].id = tmp_int[0]; + p->cart[i].nameid = tmp_int[1]; + p->cart[i].amount = tmp_int[2]; + p->cart[i].equip = tmp_int[3]; + p->cart[i].identify = tmp_int[4]; + p->cart[i].refine = tmp_int[5]; + p->cart[i].attribute = tmp_int[6]; + p->cart[i].card[0] = tmp_int[7]; + p->cart[i].card[1] = tmp_int[8]; + p->cart[i].card[2] = tmp_int[9]; + p->cart[i].card[3] = tmp_int[10]; + p->cart[i].broken = tmp_int[11]; + next += len; + if (str[next] == ' ') + next++; + } + + next++; + + for(i = 0; str[next] && str[next] != '\t'; i++) { + if (sscanf(str + next, "%d,%d%n", &tmp_int[0], &tmp_int[1], &len) != 2) + return -6; + p->skill[tmp_int[0]].id = tmp_int[0]; + p->skill[tmp_int[0]].lv = tmp_int[1]; + next += len; + if (str[next] == ' ') + next++; + } + + next++; + + for(i = 0; str[next] && str[next] != '\t' && str[next] != '\n' && str[next] != '\r'; i++) { // global_reg実装以前のathena.txt互換のため一応'\n'チェック + if (sscanf(str + next, "%[^,],%d%n", p->global_reg[i].str, &p->global_reg[i].value, &len) != 2) { + // because some scripts are not correct, the str can be "". So, we must check that. + // If it's, we must not refuse the character, but just this REG value. + // Character line will have something like: nov_2nd_cos,9 ,9 nov_1_2_cos_c,1 (here, ,9 is not good) + if (str[next] == ',' && sscanf(str + next, ",%d%n", &p->global_reg[i].value, &len) == 1) + i--; + else + return -7; + } + next += len; + if (str[next] == ' ') + next++; + } + p->global_reg_num = i; + + return 1; +} + +//--------------------------------- +// Function to read characters file +//--------------------------------- +int mmo_char_init(void) { + char line[65536]; + int i; + int ret, line_count; + FILE *fp; + + char_max = 256; + char_dat = calloc(sizeof(struct mmo_charstatus) * 256, 1); + if (!char_dat) { + printf("out of memory: mmo_char_init (calloc of char_dat).\n"); + exit(1); + } + online_chars = calloc(sizeof(int) * 256, 1); + if (!online_chars) { + printf("out of memory: mmo_char_init (calloc of online_chars).\n"); + exit(1); + } + for(i = 0; i < char_max; i++) + online_chars[i] = -1; + + char_num = 0; + + fp = fopen(char_txt, "r"); + if (fp == NULL) { + printf("Characters file not found: %s.\n", char_txt); + char_log("Characters file not found: %s." RETCODE, char_txt); + char_log("Id for the next created character: %d." RETCODE, char_id_count); + return 0; + } + + line_count = 0; + while(fgets(line, sizeof(line)-1, fp)) { + int i, j; + line_count++; + + if (line[0] == '/' && line[1] == '/') + continue; + line[sizeof(line)-1] = '\0'; + + j = 0; + if (sscanf(line, "%d\t%%newid%%%n", &i, &j) == 1 && j > 0) { + if (char_id_count < i) + char_id_count = i; + continue; + } + + if (char_num >= char_max) { + char_max += 256; + char_dat = realloc(char_dat, sizeof(struct mmo_charstatus) * char_max); + if (!char_dat) { + printf("Out of memory: mmo_char_init (realloc of char_dat).\n"); + char_log("Out of memory: mmo_char_init (realloc of char_dat)." RETCODE); + exit(1); + } + online_chars = realloc(online_chars, sizeof(int) * char_max); + if (!online_chars) { + printf("Out of memory: mmo_char_init (realloc of online_chars).\n"); + char_log("Out of memory: mmo_char_init (realloc of online_chars)." RETCODE); + exit(1); + } + for(i = char_max - 256; i < char_max; i++) + online_chars[i] = -1; + } + + ret = mmo_char_fromstr(line, &char_dat[char_num]); + if (ret > 0) { // negative value or zero for errors + if (char_dat[char_num].char_id >= char_id_count) + char_id_count = char_dat[char_num].char_id + 1; + char_num++; + } else { + printf("mmo_char_init: in characters file, unable to read the line #%d.\n", line_count); + printf(" -> Character saved in log file.\n"); + switch (ret) { + case -1: + char_log("Duplicate character id in the next character line (character not readed):" RETCODE); + break; + case -2: + char_log("Duplicate character name in the next character line (character not readed):" RETCODE); + break; + case -3: + char_log("Invalid memo point structure in the next character line (character not readed):" RETCODE); + break; + case -4: + char_log("Invalid inventory item structure in the next character line (character not readed):" RETCODE); + break; + case -5: + char_log("Invalid cart item structure in the next character line (character not readed):" RETCODE); + break; + case -6: + char_log("Invalid skill structure in the next character line (character not readed):" RETCODE); + break; + case -7: + char_log("Invalid register structure in the next character line (character not readed):" RETCODE); + break; + default: // 0 + char_log("Unabled to get a character in the next line - Basic structure of line (before inventory) is incorrect (character not readed):" RETCODE); + break; + } + char_log("%s", line); + } + } + fclose(fp); + + if (char_num == 0) { + printf("mmo_char_init: No character found in %s.\n", char_txt); + char_log("mmo_char_init: No character found in %s." RETCODE, char_txt); + } else if (char_num == 1) { + printf("mmo_char_init: 1 character read in %s.\n", char_txt); + char_log("mmo_char_init: 1 character read in %s." RETCODE, char_txt); + } else { + printf("mmo_char_init: %d characters read in %s.\n", char_num, char_txt); + char_log("mmo_char_init: %d characters read in %s." RETCODE, char_num, char_txt); + } + + char_log("Id for the next created character: %d." RETCODE, char_id_count); + + return 0; +} + +//--------------------------------------------------------- +// Function to save characters in files (speed up by [Yor]) +//--------------------------------------------------------- +void mmo_char_sync(void) { + char line[65536]; + int i, j, k; + int lock; + FILE *fp; + int id[char_num]; + + // Sorting before save (by [Yor]) + for(i = 0; i < char_num; i++) { + id[i] = i; + for(j = 0; j < i; j++) { + if ((char_dat[i].account_id < char_dat[id[j]].account_id) || + // if same account id, we sort by slot. + (char_dat[i].account_id == char_dat[id[j]].account_id && + char_dat[i].char_num < char_dat[id[j]].char_num)) { + for(k = i; k > j; k--) + id[k] = id[k-1]; + id[j] = i; // id[i] + break; + } + } + } + + // Data save + fp = lock_fopen(char_txt, &lock); + if (fp == NULL) { + printf("WARNING: Server can't not save characters.\n"); + char_log("WARNING: Server can't not save characters." RETCODE); + } else { + for(i = 0; i < char_num; i++) { + // create only once the line, and save it in the 2 files (it's speeder than repeat twice the loop and create twice the line) + mmo_char_tostr(line, &char_dat[id[i]]); // use of sorted index + fprintf(fp, "%s" RETCODE, line); + } + fprintf(fp, "%d\t%%newid%%" RETCODE, char_id_count); + lock_fclose(fp, char_txt, &lock); + } + + // Data save (backup) + if (backup_txt_flag) { // The backup_txt file was created because char deletion bug existed. Now it's finish and that take a lot of time to create a second file when there are a lot of characters. => option By [Yor] + fp = lock_fopen(backup_txt, &lock); + if (fp == NULL) { + printf("WARNING: Server can't not create backup of characters file.\n"); + char_log("WARNING: Server can't not create backup of characters file." RETCODE); + return; + } + for(i = 0; i < char_num; i++) { + // create only once the line, and save it in the 2 files (it's speeder than repeat twice the loop and create twice the line) + mmo_char_tostr(line, &char_dat[id[i]]); // use of sorted index + fprintf(fp, "%s" RETCODE, line); + } + fprintf(fp, "%d\t%%newid%%" RETCODE, char_id_count); + lock_fclose(fp, backup_txt, &lock); + } + + return; +} + +//---------------------------------------------------- +// Function to save (in a periodic way) datas in files +//---------------------------------------------------- +int mmo_char_sync_timer(int tid, unsigned int tick, int id, int data) { + mmo_char_sync(); + inter_save(); + return 0; +} + +//----------------------------------- +// Function to create a new character +//----------------------------------- +int make_new_char(int fd, unsigned char *dat) { + int i, j; + struct char_session_data *sd; + + sd = session[fd]->session_data; + + // remove control characters from the name + dat[23] = '\0'; + if (remove_control_chars(dat)) { + char_log("Make new char error (control char received in the name): (connection #%d, account: %d)." RETCODE, + fd, sd->account_id); + return -1; + } + + // check lenght of character name + if (strlen(dat) < 4) { + char_log("Make new char error (character name too small): (connection #%d, account: %d, name: '%s')." RETCODE, + fd, sd->account_id, dat); + return -1; + } + + // Check Authorised letters/symbols in the name of the character + if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised + for (i = 0; dat[i]; i++) + if (strchr(char_name_letters, dat[i]) == NULL) { + char_log("Make new char error (invalid letter in the name): (connection #%d, account: %d), name: %s, invalid letter: %c." RETCODE, + fd, sd->account_id, dat, dat[i]); + return -1; + } + } else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden + for (i = 0; dat[i]; i++) + if (strchr(char_name_letters, dat[i]) != NULL) { + char_log("Make new char error (invalid letter in the name): (connection #%d, account: %d), name: %s, invalid letter: %c." RETCODE, + fd, sd->account_id, dat, dat[i]); + return -1; + } + } // else, all letters/symbols are authorised (except control char removed before) + + if (dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29] != 5*6 || // stats + dat[30] >= 9 || // slots (dat[30] can not be negativ) + dat[33] <= 0 || dat[33] >= 20 || // hair style + dat[31] >= 12) { // hair color (dat[31] can not be negativ) + char_log("Make new char error (invalid values): (connection #%d, account: %d) slot %d, name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d" RETCODE, + fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; + } + + // check individual stat value + for(i = 24; i <= 29; i++) { + if (dat[i] < 1 || dat[i] > 9) { + char_log("Make new char error (invalid stat value: not between 1 to 9): (connection #%d, account: %d) slot %d, name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d" RETCODE, + fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; + } + } + + for(i = 0; i < char_num; i++) { + if ((name_ignoring_case != 0 && strcmp(char_dat[i].name, dat) == 0) || + (name_ignoring_case == 0 && strcmpi(char_dat[i].name, dat) == 0)) { + char_log("Make new char error (name already exists): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %d), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE, + fd, sd->account_id, dat[30], dat, char_dat[i].name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; + } + if (char_dat[i].account_id == sd->account_id && char_dat[i].char_num == dat[30]) { + char_log("Make new char error (slot already used): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %d), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE, + fd, sd->account_id, dat[30], dat, char_dat[i].name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; + } + } + + if (strcmp(wisp_server_name, dat) == 0) { + char_log("Make new char error (name used is wisp name for server): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %d), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE, + fd, sd->account_id, dat[30], dat, char_dat[i].name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; + } + + if (char_num >= char_max) { + char_max += 256; + char_dat = realloc(char_dat, sizeof(struct mmo_charstatus) * char_max); + if (!char_dat) { + printf("Out of memory: make_new_char (realloc of char_dat).\n"); + char_log("Out of memory: make_new_char (realloc of char_dat)." RETCODE); + exit(1); + } + online_chars = realloc(online_chars, sizeof(int) * char_max); + if (!online_chars) { + printf("Out of memory: make_new_char (realloc of online_chars).\n"); + char_log("Out of memory: make_new_char (realloc of online_chars)." RETCODE); + exit(1); + } + for(j = char_max - 256; j < char_max; j++) + online_chars[j] = -1; + } + + char_log("Creation of New Character: (connection #%d, account: %d) slot %d, character Name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE, + fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + + memset(&char_dat[i], 0, sizeof(struct mmo_charstatus)); + + char_dat[i].char_id = char_id_count++; + char_dat[i].account_id = sd->account_id; + char_dat[i].char_num = dat[30]; + strcpy(char_dat[i].name, dat); + char_dat[i].class = 0; + char_dat[i].base_level = 1; + char_dat[i].job_level = 1; + char_dat[i].base_exp = 0; + char_dat[i].job_exp = 0; + char_dat[i].zeny = start_zeny; + char_dat[i].str = dat[24]; + char_dat[i].agi = dat[25]; + char_dat[i].vit = dat[26]; + char_dat[i].int_ = dat[27]; + char_dat[i].dex = dat[28]; + char_dat[i].luk = dat[29]; + char_dat[i].max_hp = 40 * (100 + char_dat[i].vit) / 100; + char_dat[i].max_sp = 11 * (100 + char_dat[i].int_) / 100; + char_dat[i].hp = char_dat[i].max_hp; + char_dat[i].sp = char_dat[i].max_sp; + char_dat[i].status_point = 0; + char_dat[i].skill_point = 0; + char_dat[i].option = 0; + char_dat[i].karma = 0; + char_dat[i].manner = 0; + char_dat[i].party_id = 0; + char_dat[i].guild_id = 0; + char_dat[i].hair = dat[33]; + char_dat[i].hair_color = dat[31]; + char_dat[i].clothes_color = 0; + char_dat[i].inventory[0].nameid = start_weapon; // Knife + char_dat[i].inventory[0].amount = 1; + char_dat[i].inventory[0].equip = 0x02; + char_dat[i].inventory[0].identify = 1; + char_dat[i].inventory[0].broken = 0; + char_dat[i].inventory[1].nameid = start_armor; // Cotton Shirt + char_dat[i].inventory[1].amount = 1; + char_dat[i].inventory[1].equip = 0x10; + char_dat[i].inventory[1].identify = 1; + char_dat[i].inventory[1].broken = 0; + char_dat[i].weapon = 1; + char_dat[i].shield = 0; + char_dat[i].head_top = 0; + char_dat[i].head_mid = 0; + char_dat[i].head_bottom = 0; + memcpy(&char_dat[i].last_point, &start_point, sizeof(start_point)); + memcpy(&char_dat[i].save_point, &start_point, sizeof(start_point)); + char_num++; + + mmo_char_sync(); + return i; +} + +//---------------------------------------------------- +// This function return the name of the job (by [Yor]) +//---------------------------------------------------- +char * job_name(int class) { + switch (class) { + case 0: return "Novice"; + case 1: return "Swordsman"; + case 2: return "Mage"; + case 3: return "Archer"; + case 4: return "Acolyte"; + case 5: return "Merchant"; + case 6: return "Thief"; + case 7: return "Knight"; + case 8: return "Priest"; + case 9: return "Wizard"; + case 10: return "Blacksmith"; + case 11: return "Hunter"; + case 12: return "Assassin"; + case 13: return "Knight 2"; + case 14: return "Crusader"; + case 15: return "Monk"; + case 16: return "Sage"; + case 17: return "Rogue"; + case 18: return "Alchemist"; + case 19: return "Bard"; + case 20: return "Dancer"; + case 21: return "Crusader 2"; + case 22: return "Wedding"; + case 23: return "Super Novice"; + case 4001: return "Novice High"; + case 4002: return "Swordsman High"; + case 4003: return "Mage High"; + case 4004: return "Archer High"; + case 4005: return "Acolyte High"; + case 4006: return "Merchant High"; + case 4007: return "Thief High"; + case 4008: return "Lord Knight"; + case 4009: return "High Priest"; + case 4010: return "High Wizard"; + case 4011: return "Whitesmith"; + case 4012: return "Sniper"; + case 4013: return "Assassin Cross"; + case 4014: return "Peko Knight"; + case 4015: return "Paladin"; + case 4016: return "Champion"; + case 4017: return "Professor"; + case 4018: return "Stalker"; + case 4019: return "Creator"; + case 4020: return "Clown"; + case 4021: return "Gypsy"; + case 4022: return "Peko Paladin"; + case 4023: return "Baby Novice"; + case 4024: return "Baby Swordsman"; + case 4025: return "Baby Mage"; + case 4026: return "Baby Archer"; + case 4027: return "Baby Acolyte"; + case 4028: return "Baby Merchant"; + case 4029: return "Baby Thief"; + case 4030: return "Baby Knight"; + case 4031: return "Baby Priest"; + case 4032: return "Baby Wizard"; + case 4033: return "Baby Blacksmith"; + case 4034: return "Baby Hunter"; + case 4035: return "Baby Assassin"; + case 4036: return "Baby Peco Knight"; + case 4037: return "Baby Crusader"; + case 4038: return "Baby Monk"; + case 4039: return "Baby Sage"; + case 4040: return "Baby Rogue"; + case 4041: return "Baby Alchemist"; + case 4042: return "Baby Bard"; + case 4043: return "Baby Dancer"; + case 4044: return "Baby Peco Crusader"; + case 4045: return "Super Baby"; + } + return "Unknown Job"; +} + +//------------------------------------------------------------- +// Function to create the online files (txt and html). by [Yor] +//------------------------------------------------------------- +void create_online_files(void) { + int i, j, k, l; // for loops + int players; // count the number of players + FILE *fp; // for the txt file + FILE *fp2; // for the html file + char temp[256]; // to prepare what we must display + time_t time_server; // for number of seconds + struct tm *datetime; // variable for time in structure ->tm_mday, ->tm_sec, ... + int id[char_num]; + + if (online_display_option == 0) // we display nothing, so return + return; + + //char_log("Creation of online players files." RETCODE); + + // Get number of online players, id of each online players + players = 0; + // sort online characters. + for(i = 0; i < char_num; i++) { + if (online_chars[i] != -1) { + id[players] = i; + // use sorting option + switch (online_sorting_option) { + case 1: // by name (without case sensitive) + { + char *p_name = char_dat[i].name; //speed up sorting when there are a lot of players. But very rarely players have same name. + for(j = 0; j < players; j++) + if (stricmp(p_name, char_dat[id[j]].name) < 0 || + // if same name, we sort with case sensitive. + (stricmp(p_name, char_dat[id[j]].name) == 0 && + strcmp(p_name, char_dat[id[j]].name) < 0)) { + for(k = players; k > j; k--) + id[k] = id[k-1]; + id[j] = i; // id[players] + break; + } + } + break; + case 2: // by zeny + for(j = 0; j < players; j++) + if (char_dat[i].zeny < char_dat[id[j]].zeny || + // if same number of zenys, we sort by name. + (char_dat[i].zeny == char_dat[id[j]].zeny && + stricmp(char_dat[i].name, char_dat[id[j]].name) < 0)) { + for(k = players; k > j; k--) + id[k] = id[k-1]; + id[j] = i; // id[players] + break; + } + break; + case 3: // by base level + for(j = 0; j < players; j++) + if (char_dat[i].base_level < char_dat[id[j]].base_level || + // if same base level, we sort by base exp. + (char_dat[i].base_level == char_dat[id[j]].base_level && + char_dat[i].base_exp < char_dat[id[j]].base_exp)) { + for(k = players; k > j; k--) + id[k] = id[k-1]; + id[j] = i; // id[players] + break; + } + break; + case 4: // by job (and job level) + for(j = 0; j < players; j++) + if (char_dat[i].class < char_dat[id[j]].class || + // if same job, we sort by job level. + (char_dat[i].class == char_dat[id[j]].class && + char_dat[i].job_level < char_dat[id[j]].job_level) || + // if same job and job level, we sort by job exp. + (char_dat[i].class == char_dat[id[j]].class && + char_dat[i].job_level == char_dat[id[j]].job_level && + char_dat[i].job_exp < char_dat[id[j]].job_exp)) { + for(k = players; k > j; k--) + id[k] = id[k-1]; + id[j] = i; // id[players] + break; + } + break; + case 5: // by location map name + { + int cpm_result; // A lot of player maps are identical. So, test if done often twice. + for(j = 0; j < players; j++) + if ((cpm_result = strcmp(char_dat[i].last_point.map, char_dat[id[j]].last_point.map)) < 0 || // no map are identical and with upper cases (not use stricmp) + // if same map name, we sort by name. + (cpm_result == 0 && + stricmp(char_dat[i].name, char_dat[id[j]].name) < 0)) { + for(k = players; k > j; k--) + id[k] = id[k-1]; + id[j] = i; // id[players] + break; + } + } + break; + default: // 0 or invalid value: no sorting + break; + } + players++; + } + } + + // write files + fp = fopen(online_txt_filename, "w"); + if (fp != NULL) { + fp2 = fopen(online_html_filename, "w"); + if (fp2 != NULL) { + // get time + time(&time_server); // get time in seconds since 1/1/1970 + datetime = localtime(&time_server); // convert seconds in structure + strftime(temp, sizeof(temp), "%d %b %Y %X", datetime); // like sprintf, but only for date/time (05 dec 2003 15:12:52) + // write heading + fprintf(fp2, "\n"); + fprintf(fp2, " \n", online_refresh_html); // update on client explorer every x seconds + fprintf(fp2, " \n"); + fprintf(fp2, " Online Players on %s\n", server_name); + fprintf(fp2, " \n"); + fprintf(fp2, " \n"); + fprintf(fp2, "

Online Players on %s (%s):

\n", server_name, temp); + fprintf(fp, "Online Players on %s (%s):\n", server_name, temp); + fprintf(fp, "\n"); + + // If we display at least 1 player + if (players > 0) { + j = 0; // count the number of characters for the txt version and to set the separate line + fprintf(fp2, " \n"); + fprintf(fp2, " \n"); + if ((online_display_option & 1) || (online_display_option & 64)) { + fprintf(fp2, " \n"); + if (online_display_option & 64) { + fprintf(fp, "Name "); // 30 + j += 30; + } else { + fprintf(fp, "Name "); // 25 + j += 25; + } + } + if ((online_display_option & 6) == 6) { + fprintf(fp2, " \n"); + fprintf(fp, "Job Levels "); // 27 + j += 27; + } else if (online_display_option & 2) { + fprintf(fp2, " \n"); + fprintf(fp, "Job "); // 19 + j += 19; + } else if (online_display_option & 4) { + fprintf(fp2, " \n"); + fprintf(fp, " Levels "); // 8 + j += 8; + } + if (online_display_option & 24) { // 8 or 16 + fprintf(fp2, " \n"); + if (online_display_option & 16) { + fprintf(fp, "Location ( x , y ) "); // 23 + j += 23; + } else { + fprintf(fp, "Location "); // 13 + j += 13; + } + } + if (online_display_option & 32) { + fprintf(fp2, " \n"); + fprintf(fp, " Zenys "); // 16 + j += 16; + } + fprintf(fp2, " \n"); + fprintf(fp, "\n"); + for (k = 0; k < j; k++) + fprintf(fp, "-"); + fprintf(fp, "\n"); + + // display each player. + for (i = 0; i < players; i++) { + // get id of the character (more speed) + j = id[i]; + fprintf(fp2, " \n"); + // displaying the character name + if ((online_display_option & 1) || (online_display_option & 64)) { // without/with 'GM' display + strcpy(temp, char_dat[j].name); + l = isGM(char_dat[j].account_id); + if (online_display_option & 64) { + if (l >= online_gm_display_min_level) + fprintf(fp, "%-24s (GM) ", temp); + else + fprintf(fp, "%-24s ", temp); + } else + fprintf(fp, "%-24s ", temp); + // name of the character in the html (no < >, because that create problem in html code) + fprintf(fp2, " \n"); + } + // displaying of the job + if (online_display_option & 6) { + char * jobname = job_name(char_dat[j].class); + if ((online_display_option & 6) == 6) { + fprintf(fp2, " \n", jobname, char_dat[j].base_level, char_dat[j].job_level); + fprintf(fp, "%-18s %3d/%3d ", jobname, char_dat[j].base_level, char_dat[j].job_level); + } else if (online_display_option & 2) { + fprintf(fp2, " \n", jobname); + fprintf(fp, "%-18s ", jobname); + } else if (online_display_option & 4) { + fprintf(fp2, " \n", char_dat[j].base_level, char_dat[j].job_level); + fprintf(fp, "%3d/%3d ", char_dat[j].base_level, char_dat[j].job_level); + } + } + // displaying of the map + if (online_display_option & 24) { // 8 or 16 + // prepare map name + memset(temp, 0, sizeof(temp)); + strncpy(temp, char_dat[j].last_point.map, 16); + if (strchr(temp, '.') != NULL) + temp[strchr(temp, '.') - temp] = '\0'; // suppress the '.gat' + // write map name + if (online_display_option & 16) { // map-name AND coordonates + fprintf(fp2, " \n", temp, char_dat[j].last_point.x, char_dat[j].last_point.y); + fprintf(fp, "%-12s (%3d,%3d) ", temp, char_dat[j].last_point.x, char_dat[j].last_point.y); + } else { + fprintf(fp2, " \n", temp); + fprintf(fp, "%-12s ", temp); + } + } + // displaying number of zenys + if (online_display_option & 32) { + // write number of zenys + if (char_dat[j].zeny == 0) { // if no zeny + fprintf(fp2, " \n"); + fprintf(fp, " no zeny "); + } else { + fprintf(fp2, " \n", char_dat[j].zeny); + fprintf(fp, "%13d z ", char_dat[j].zeny); + } + } + fprintf(fp, "\n"); + fprintf(fp2, " \n"); + } + fprintf(fp2, "
NameJob (levels)JobLevelsLocationzenys
"); + if ((online_display_option & 64) && l >= online_gm_display_min_level) + fprintf(fp2, ""); + for (k = 0; temp[k]; k++) { + switch(temp[k]) { + case '<': // < + fprintf(fp2, "<"); + break; + case '>': // > + fprintf(fp2, ">"); + break; + default: + fprintf(fp2, "%c", temp[k]); + break; + }; + } + if ((online_display_option & 64) && l >= online_gm_display_min_level) + fprintf(fp2, " (GM)"); + fprintf(fp2, "%s %d/%d%s%d/%d%s (%d, %d)%sno zeny%d z
\n"); + fprintf(fp, "\n"); + } + + // Displaying number of online players + if (players == 0) { + fprintf(fp2, "

No user is online.

\n"); + fprintf(fp, "No user is online.\n"); + // no display if only 1 player + } else if (players == 1) { + } else { + fprintf(fp2, "

%d users are online.

\n", players); + fprintf(fp, "%d users are online.\n", players); + } + fprintf(fp2, " \n"); + fprintf(fp2, "\n"); + fclose(fp2); + } + fclose(fp); + } + + return; +} + +//--------------------------------------------------------------------- +// This function return the number of online players in all map-servers +//--------------------------------------------------------------------- +int count_users(void) { + int i, users; + + users = 0; + for(i = 0; i < MAX_MAP_SERVERS; i++) + if (server_fd[i] >= 0) + users += server[i].users; + + return users; +} + +//---------------------------------------- +// Function to send characters to a player +//---------------------------------------- +int mmo_char_send006b(int fd, struct char_session_data *sd) { + int i, j, found_num; + struct mmo_charstatus *p; +#ifdef NEW_006b + const int offset = 24; +#else + const int offset = 4; +#endif + + found_num = 0; + for(i = 0; i < char_num; i++) { + if (char_dat[i].account_id == sd->account_id) { + sd->found_char[found_num] = i; + found_num++; + if (found_num == 9) + break; + } + } + for(i = found_num; i < 9; i++) + sd->found_char[i] = -1; + + memset(WFIFOP(fd,0), 0, offset + found_num * 106); + WFIFOW(fd,0) = 0x6b; + WFIFOW(fd,2) = offset + found_num * 106; + + for(i = 0; i < found_num; i++) { + p = &char_dat[sd->found_char[i]]; + j = offset + (i * 106); // increase speed of code + + WFIFOL(fd,j) = p->char_id; + WFIFOL(fd,j+4) = p->base_exp; + WFIFOL(fd,j+8) = p->zeny; + WFIFOL(fd,j+12) = p->job_exp; + WFIFOL(fd,j+16) = p->job_level; + + WFIFOL(fd,j+20) = 0; + WFIFOL(fd,j+24) = 0; + WFIFOL(fd,j+28) = p->option; + + WFIFOL(fd,j+32) = p->karma; + WFIFOL(fd,j+36) = p->manner; + + WFIFOW(fd,j+40) = p->status_point; + WFIFOW(fd,j+42) = (p->hp > 0x7fff) ? 0x7fff : p->hp; + WFIFOW(fd,j+44) = (p->max_hp > 0x7fff) ? 0x7fff : p->max_hp; + WFIFOW(fd,j+46) = (p->sp > 0x7fff) ? 0x7fff : p->sp; + WFIFOW(fd,j+48) = (p->max_sp > 0x7fff) ? 0x7fff : p->max_sp; + WFIFOW(fd,j+50) = DEFAULT_WALK_SPEED; // p->speed; + WFIFOW(fd,j+52) = p->class; + WFIFOW(fd,j+54) = p->hair; + WFIFOW(fd,j+56) = p->weapon; + WFIFOW(fd,j+58) = p->base_level; + WFIFOW(fd,j+60) = p->skill_point; + WFIFOW(fd,j+62) = p->head_bottom; + WFIFOW(fd,j+64) = p->shield; + WFIFOW(fd,j+66) = p->head_top; + WFIFOW(fd,j+68) = p->head_mid; + WFIFOW(fd,j+70) = p->hair_color; + WFIFOW(fd,j+72) = p->clothes_color; + + memcpy(WFIFOP(fd,j+74), p->name, 24); + + WFIFOB(fd,j+98) = (p->str > 255) ? 255 : p->str; + WFIFOB(fd,j+99) = (p->agi > 255) ? 255 : p->agi; + WFIFOB(fd,j+100) = (p->vit > 255) ? 255 : p->vit; + WFIFOB(fd,j+101) = (p->int_ > 255) ? 255 : p->int_; + WFIFOB(fd,j+102) = (p->dex > 255) ? 255 : p->dex; + WFIFOB(fd,j+103) = (p->luk > 255) ? 255 : p->luk; + WFIFOB(fd,j+104) = p->char_num; + } + + WFIFOSET(fd,WFIFOW(fd,2)); + + return 0; +} + +int set_account_reg2(int acc, int num, struct global_reg *reg) { + int i, c; + + c = 0; + for(i = 0; i < char_num; i++) { + if (char_dat[i].account_id == acc) { + memcpy(char_dat[i].account_reg2, reg, sizeof(char_dat[i].account_reg2)); + char_dat[i].account_reg2_num = num; + c++; + } + } + return c; +} + +// 離婚(char削除時に使用) +int char_divorce(struct mmo_charstatus *cs) { + if (cs == NULL) + return 0; + + if (cs->partner_id > 0){ + int i, j; + for(i = 0; i < char_num; i++) { + if (char_dat[i].char_id == cs->partner_id && char_dat[i].partner_id == cs->char_id) { + cs->partner_id = 0; + char_dat[i].partner_id = 0; + for(j = 0; j < MAX_INVENTORY; j++) + if (char_dat[i].inventory[j].nameid == WEDDING_RING_M || char_dat[i].inventory[j].nameid == WEDDING_RING_F) + memset(&char_dat[i].inventory[j], 0, sizeof(char_dat[i].inventory[0])); + if (cs->inventory[j].nameid == WEDDING_RING_M || cs->inventory[j].nameid == WEDDING_RING_F) + memset(&cs->inventory[j], 0, sizeof(cs->inventory[0])); + return 0; + } + } + } + return 0; +} + +//------------------------------------------------------------ +// E-mail check: return 0 (not correct) or 1 (valid). by [Yor] +//------------------------------------------------------------ +int e_mail_check(unsigned char *email) { + char ch; + unsigned char* last_arobas; + + // athena limits + if (strlen(email) < 3 || strlen(email) > 39) + return 0; + + // part of RFC limits (official reference of e-mail description) + if (strchr(email, '@') == NULL || email[strlen(email)-1] == '@') + return 0; + + if (email[strlen(email)-1] == '.') + return 0; + + last_arobas = strrchr(email, '@'); + + if (strstr(last_arobas, "@.") != NULL || + strstr(last_arobas, "..") != NULL) + return 0; + + for(ch = 1; ch < 32; ch++) { + if (strchr(last_arobas, ch) != NULL) { + return 0; + break; + } + } + + if (strchr(last_arobas, ' ') != NULL || + strchr(last_arobas, ';') != NULL) + return 0; + + // all correct + return 1; +} + +//---------------------------------------------------------------------- +// Force disconnection of an online player (with account value) by [Yor] +//---------------------------------------------------------------------- +int disconnect_player(int accound_id) { + int i; + struct char_session_data *sd; + + // disconnect player if online on char-server + for(i = 0; i < fd_max; i++) { + if (session[i] && (sd = session[i]->session_data)) { + if (sd->account_id == accound_id) { + session[i]->eof = 1; + return 1; + } + } + } + + return 0; +} + +// キャラ削除に伴うデータ削除 +static int char_delete(struct mmo_charstatus *cs) { + int j; + + // ペット削除 + if (cs->pet_id) + inter_pet_delete(cs->pet_id); + for (j = 0; j < MAX_INVENTORY; j++) + if (cs->inventory[j].card[0] == (short)0xff00) + inter_pet_delete(*((long *)(&cs->inventory[j].card[2]))); + for (j = 0; j < MAX_CART; j++) + if (cs->cart[j].card[0] == (short)0xff00) + inter_pet_delete(*((long *)(&cs->cart[j].card[2]))); + // ギルド脱退 + if (cs->guild_id) + inter_guild_leave(cs->guild_id, cs->account_id, cs->char_id); + // パーティー脱退 + if (cs->party_id) + inter_party_leave(cs->party_id, cs->account_id); + // 離婚 + if (cs->partner_id){ + // 離婚情報をmapに通知 + char buf[10]; + WBUFW(buf,0) = 0x2b12; + WBUFL(buf,2) = cs->char_id; + WBUFL(buf,6) = cs->partner_id; + mapif_sendall(buf,10); + // 離婚 + char_divorce(cs); + } + return 0; +} + +int parse_tologin(int fd) { + int i; + struct char_session_data *sd; + + // only login-server can have an access to here. + // so, if it isn't the login-server, we disconnect the session (fd != login_fd). + if (fd != login_fd || session[fd]->eof) { + if (fd == login_fd) { + printf("Char-server can't connect to login-server (connection #%d).\n", fd); + login_fd = -1; + } + close(fd); + delete_session(fd); + return 0; + } + + sd = session[fd]->session_data; + + while(RFIFOREST(fd) >= 2) { +// printf("parse_tologin: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd)); + + switch(RFIFOW(fd,0)) { + case 0x2711: + if (RFIFOREST(fd) < 3) + return 0; + if (RFIFOB(fd,2)) { +// printf("connect login server error : %d\n", RFIFOB(fd,2)); + printf("Can not connect to login-server.\n"); + printf("The server communication passwords (default s1/p1) is probably invalid.\n"); + printf("Also, please make sure your accounts file (default: accounts.txt) has those values present.\n"); + printf("If you changed the communication passwords, change them back at map_athena.conf and char_athena.conf\n"); + exit(1); + } else { + printf("Connected to login-server (connection #%d).\n", fd); + // if no map-server already connected, display a message... + for(i = 0; i < MAX_MAP_SERVERS; i++) + if (server_fd[i] >= 0 && server[i].map[0][0]) // if map-server online and at least 1 map + break; + if (i == MAX_MAP_SERVERS) + printf("Awaiting maps from map-server.\n"); + } + RFIFOSKIP(fd,3); + break; + + case 0x2713: + if (RFIFOREST(fd) < 51) + return 0; +// printf("parse_tologin 2713 : %d\n", RFIFOB(fd,6)); + for(i = 0; i < fd_max; i++) { + if (session[i] && (sd = session[i]->session_data) && sd->account_id == RFIFOL(fd,2)) { + if (RFIFOB(fd,6) != 0) { + WFIFOW(i,0) = 0x6c; + WFIFOB(i,2) = 0x42; + WFIFOSET(i,3); + } else if (max_connect_user == 0 || count_users() < max_connect_user) { +// if (max_connect_user == 0) +// printf("max_connect_user (unlimited) -> accepted.\n"); +// else +// printf("count_users(): %d < max_connect_user (%d) -> accepted.\n", count_users(), max_connect_user); + memcpy(sd->email, RFIFOP(fd, 7), 40); + if (e_mail_check(sd->email) == 0) + strncpy(sd->email, "a@a.com", 40); // default e-mail + sd->connect_until_time = (time_t)RFIFOL(fd,47); + // send characters to player + mmo_char_send006b(i, sd); + } else { + // refuse connection: too much online players +// printf("count_users(): %d < max_connect_use (%d) -> fail...\n", count_users(), max_connect_user); + WFIFOW(i,0) = 0x6c; + WFIFOW(i,2) = 0; + WFIFOSET(i,3); + } + break; + } + } + RFIFOSKIP(fd,51); + break; + + // Receiving of an e-mail/time limit from the login-server (answer of a request because a player comes back from map-server to char-server) by [Yor] + case 0x2717: + if (RFIFOREST(fd) < 50) + return 0; + for(i = 0; i < fd_max; i++) { + if (session[i] && (sd = session[i]->session_data)) { + if (sd->account_id == RFIFOL(fd,2)) { + memcpy(sd->email, RFIFOP(fd,6), 40); + if (e_mail_check(sd->email) == 0) + strncpy(sd->email, "a@a.com", 40); // default e-mail + sd->connect_until_time = (time_t)RFIFOL(fd,46); + break; + } + } + } + RFIFOSKIP(fd,50); + break; + + case 0x2721: // gm reply + if (RFIFOREST(fd) < 10) + return 0; + { + unsigned char buf[10]; + WBUFW(buf,0) = 0x2b0b; + WBUFL(buf,2) = RFIFOL(fd,2); // account + WBUFL(buf,6) = RFIFOL(fd,6); // GM level + mapif_sendall(buf,10); +// printf("parse_tologin: To become GM answer: char -> map.\n"); + } + RFIFOSKIP(fd,10); + break; + + case 0x2723: // changesex reply (modified by [Yor]) + if (RFIFOREST(fd) < 7) + return 0; + { + int acc, sex, i, j; + unsigned char buf[7]; + acc = RFIFOL(fd,2); + sex = RFIFOB(fd,6); + RFIFOSKIP(fd, 7); + if (acc > 0) { + for (i = 0; i < char_num; i++) { + if (char_dat[i].account_id == acc) { + int jobclass = char_dat[i].class; + char_dat[i].sex = sex; + auth_fifo[i].sex = sex; + if (jobclass == 19 || jobclass == 20 || + jobclass == 4020 || jobclass == 4021 || + jobclass == 4042 || jobclass == 4043) { + // job modification + if (jobclass == 19 || jobclass == 20) { + char_dat[i].class = (sex) ? 19 : 20; + } else if (jobclass == 4020 || jobclass == 4021) { + char_dat[i].class = (sex) ? 4020 : 4021; + } else if (jobclass == 4042 || jobclass == 4043) { + char_dat[i].class = (sex) ? 4042 : 4043; + } + // remove specifical skills of classes 19, 4020 and 4042 + for(j = 315; j <= 322; j++) { + if (char_dat[i].skill[j].id > 0 && !char_dat[i].skill[j].flag) { + char_dat[i].skill_point += char_dat[i].skill[j].lv; + char_dat[i].skill[j].id = 0; + char_dat[i].skill[j].lv = 0; + } + } + // remove specifical skills of classes 20, 4021 and 4043 + for(j = 323; j <= 330; j++) { + if (char_dat[i].skill[j].id > 0 && !char_dat[i].skill[j].flag) { + char_dat[i].skill_point += char_dat[i].skill[j].lv; + char_dat[i].skill[j].id = 0; + char_dat[i].skill[j].lv = 0; + } + } + } + // to avoid any problem with equipment and invalid sex, equipment is unequiped. + for (j = 0; j < MAX_INVENTORY; j++) { + if (char_dat[i].inventory[j].nameid && char_dat[i].inventory[j].equip) + char_dat[i].inventory[j].equip = 0; + } + char_dat[i].weapon = 0; + char_dat[i].shield = 0; + char_dat[i].head_top = 0; + char_dat[i].head_mid = 0; + char_dat[i].head_bottom = 0; + } + } + // disconnect player if online on char-server + disconnect_player(acc); + } + WBUFW(buf,0) = 0x2b0d; + WBUFL(buf,2) = acc; + WBUFB(buf,6) = sex; + mapif_sendall(buf, 7); + } + break; + + case 0x2726: // Request to send a broadcast message (no answer) + if (RFIFOREST(fd) < 8 || RFIFOREST(fd) < (8 + RFIFOL(fd,4))) + return 0; + if (RFIFOL(fd,4) < 1) + char_log("Receiving a message for broadcast, but message is void." RETCODE); + else { + // at least 1 map-server + for(i = 0; i < MAX_MAP_SERVERS; i++) + if (server_fd[i] >= 0) + break; + if (i == MAX_MAP_SERVERS) + char_log("'ladmin': Receiving a message for broadcast, but no map-server is online." RETCODE); + else { + char buf[128]; + char message[RFIFOL(fd,4) + 1]; // +1 to add a null terminated if not exist in the packet + int lp; + char *p; + memset(message, '\0', sizeof(message)); + memcpy(message, RFIFOP(fd,8), RFIFOL(fd,4)); + message[sizeof(message)-1] = '\0'; + remove_control_chars(message); + // remove all first spaces + p = message; + while(p[0] == ' ') + p++; + // if message is only composed of spaces + if (p[0] == '\0') + char_log("Receiving a message for broadcast, but message is only a lot of spaces." RETCODE); + // else send message to all map-servers + else { + if (RFIFOW(fd,2) == 0) { + char_log("'ladmin': Receiving a message for broadcast (message (in yellow): %s)" RETCODE, + message); + lp = 4; + } else { + char_log("'ladmin': Receiving a message for broadcast (message (in blue): %s)" RETCODE, + message); + lp = 8; + } + // split message to max 80 char + while(p[0] != '\0') { // if not finish + if (p[0] == ' ') // jump if first char is a space + p++; + else { + char split[80]; + char* last_space; + sscanf(p, "%79[^\t]", split); // max 79 char, any char (\t is control char and control char was removed before) + split[sizeof(split)-1] = '\0'; // last char always \0 + if ((last_space = strrchr(split, ' ')) != NULL) { // searching space from end of the string + last_space[0] = '\0'; // replace it by NULL to have correct length of split + p++; // to jump the new NULL + } + p += strlen(split); + // send broadcast to all map-servers + WBUFW(buf,0) = 0x3800; + WBUFW(buf,2) = lp + strlen(split) + 1; + WBUFL(buf,4) = 0x65756c62; // only write if in blue (lp = 8) + memcpy(WBUFP(buf,lp), split, strlen(split) + 1); + mapif_sendall(buf, WBUFW(buf,2)); + } + } + } + } + } + RFIFOSKIP(fd,8 + RFIFOL(fd,4)); + break; + + // account_reg2変更通知 + case 0x2729: + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; + { + struct global_reg reg[ACCOUNT_REG2_NUM]; + unsigned char buf[4096]; + int j, p, acc; + acc = RFIFOL(fd,4); + for (p = 8, j = 0; p < RFIFOW(fd,2) && j < ACCOUNT_REG2_NUM; p += 36, j++) { + memcpy(reg[j].str, RFIFOP(fd,p), 32); + reg[j].value = RFIFOL(fd,p+32); + } + set_account_reg2(acc, j, reg); + // 同垢ログインを禁止していれば送る必要は無い + memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2)); + WBUFW(buf,0) = 0x2b11; + mapif_sendall(buf, WBUFW(buf,2)); + RFIFOSKIP(fd,RFIFOW(fd,2)); +// printf("char: save_account_reg_reply\n"); + } + break; + + // Account deletion notification (from login-server) + case 0x2730: + if (RFIFOREST(fd) < 6) + return 0; + // Deletion of all characters of the account + for(i = 0; i < char_num; i++) { + if (char_dat[i].account_id == RFIFOL(fd,2)) { + char_delete(&char_dat[i]); + if (i < char_num - 1) { + memcpy(&char_dat[i], &char_dat[char_num-1], sizeof(struct mmo_charstatus)); + // if moved character owns to deleted account, check again it's character + if (char_dat[i].account_id == RFIFOL(fd,2)) { + i--; + // Correct moved character reference in the character's owner by [Yor] + } else { + int j, k; + struct char_session_data *sd2; + for (j = 0; j < fd_max; j++) { + if (session[j] && (sd2 = session[j]->session_data) && + sd2->account_id == char_dat[char_num-1].account_id) { + for (k = 0; k < 9; k++) { + if (sd2->found_char[k] == char_num-1) { + sd2->found_char[k] = i; + break; + } + } + break; + } + } + } + } + char_num--; + } + } + // Deletion of the storage + inter_storage_delete(RFIFOL(fd,2)); + // send to all map-servers to disconnect the player + { + unsigned char buf[6]; + WBUFW(buf,0) = 0x2b13; + WBUFL(buf,2) = RFIFOL(fd,2); + mapif_sendall(buf, 6); + } + // disconnect player if online on char-server + disconnect_player(RFIFOL(fd,2)); + RFIFOSKIP(fd,6); + break; + + // State change of account/ban notification (from login-server) by [Yor] + 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; + + // Receiving GM acounts info from login-server (by [Yor]) + case 0x2732: + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; + { + char buf[32000]; + if (gm_account != NULL) + free(gm_account); + gm_account = calloc(sizeof(struct gm_account) * ((RFIFOW(fd,2) - 4) / 5), 1); + GM_num = 0; + for (i = 4; i < RFIFOW(fd,2); i = i + 5) { + gm_account[GM_num].account_id = RFIFOL(fd,i); + gm_account[GM_num].level = (int)RFIFOB(fd,i+4); + //printf("GM account: %d -> level %d\n", gm_account[GM_num].account_id, gm_account[GM_num].level); + GM_num++; + } + printf("From login-server: receiving of %d GM accounts information.\n", GM_num); + char_log("From login-server: receiving of %d GM accounts information." RETCODE, GM_num); + create_online_files(); // update online players files (perhaps some online players change of GM level) + // send new gm acccounts level to map-servers + memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2)); + WBUFW(buf,0) = 0x2b15; + mapif_sendall(buf, RFIFOW(fd,2)); + } + RFIFOSKIP(fd,RFIFOW(fd,2)); + break; + + default: + session[fd]->eof = 1; + return 0; + } + } + RFIFOFLUSH(fd); + + return 0; +} + +//-------------------------------- +// Map-server anti-freeze system +//-------------------------------- +int map_anti_freeze_system(int tid, unsigned int tick, int id, int data) { + int i; + + //printf("Entering in map_anti_freeze_system function to check freeze of servers.\n"); + for(i = 0; i < MAX_MAP_SERVERS; i++) { + if (server_fd[i] >= 0) {// if map-server is online + //printf("map_anti_freeze_system: server #%d, flag: %d.\n", i, server_freezeflag[i]); + if (server_freezeflag[i]-- < 1) { // Map-server anti-freeze system. Counter. 5 ok, 4...0 freezed + printf("Map-server anti-freeze system: char-server #%d is freezed -> disconnection.\n", i); + char_log("Map-server anti-freeze system: char-server #%d is freezed -> disconnection." RETCODE, + i); + session[server_fd[i]]->eof = 1; + } + } + } + + return 0; +} + +int parse_frommap(int fd) { + int i, j; + int id; + + for(id = 0; id < MAX_MAP_SERVERS; id++) + if (server_fd[id] == fd) + break; + if (id == MAX_MAP_SERVERS || session[fd]->eof) { + if (id < MAX_MAP_SERVERS) { + printf("Map-server %d (session #%d) has disconnected.\n", id, fd); + memset(&server[id], 0, sizeof(struct mmo_map_server)); + server_fd[id] = -1; + for(j = 0; j < char_num; j++) + if (online_chars[j] == fd) + online_chars[j] = -1; + create_online_files(); // update online players files (to remove all online players of this server) + } + close(fd); + delete_session(fd); + return 0; + } + + while(RFIFOREST(fd) >= 2) { +// printf("parse_frommap: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd)); + + switch(RFIFOW(fd,0)) { + // request from map-server to reload GM accounts. Transmission to login-server (by Yor) + case 0x2af7: + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd,0) = 0x2709; + WFIFOSET(login_fd, 2); +// printf("char : request from map-server to reload GM accounts -> login-server.\n"); + } + RFIFOSKIP(fd,2); + break; + + // Receiving map names list from the map-server + case 0x2afa: + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; + memset(server[id].map, 0, sizeof(server[id].map)); + j = 0; + for(i = 4; i < RFIFOW(fd,2); i += 16) { + memcpy(server[id].map[j], RFIFOP(fd,i), 16); +// printf("set map %d.%d : %s\n", id, j, server[id].map[j]); + j++; + } + { + unsigned char *p = (unsigned char *)&server[id].ip; + printf("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n", + id, j, p[0], p[1], p[2], p[3], server[id].port); + printf("Map-server %d loading complete.\n", id); + char_log("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d. Map-server %d loading complete." RETCODE, + id, j, p[0], p[1], p[2], p[3], server[id].port, id); + } + WFIFOW(fd,0) = 0x2afb; + WFIFOB(fd,2) = 0; + memcpy(WFIFOP(fd,3), wisp_server_name, 24); // name for wisp to player + WFIFOSET(fd,27); + { + unsigned char buf[16384]; + int x; + if (j == 0) { + printf("WARNING: Map-Server %d have NO map.\n", id); + char_log("WARNING: Map-Server %d have NO map." RETCODE, id); + // Transmitting maps information to the other map-servers + } else { + WBUFW(buf,0) = 0x2b04; + WBUFW(buf,2) = j * 16 + 10; + WBUFL(buf,4) = server[id].ip; + WBUFW(buf,8) = server[id].port; + memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 16); + mapif_sendallwos(fd, buf, WBUFW(buf,2)); + } + // Transmitting the maps of the other map-servers to the new map-server + for(x = 0; x < MAX_MAP_SERVERS; x++) { + if (server_fd[x] >= 0 && x != id) { + WFIFOW(fd,0) = 0x2b04; + WFIFOL(fd,4) = server[x].ip; + WFIFOW(fd,8) = server[x].port; + j = 0; + for(i = 0; i < MAX_MAP_PER_SERVER; i++) + if (server[x].map[i][0]) + memcpy(WFIFOP(fd,10+(j++)*16), server[x].map[i], 16); + if (j > 0) { + WFIFOW(fd,2) = j * 16 + 10; + WFIFOSET(fd,WFIFOW(fd,2)); + } + } + } + } + RFIFOSKIP(fd,RFIFOW(fd,2)); + break; + + // 認証要求 + case 0x2afc: + if (RFIFOREST(fd) < 22) + return 0; + //printf("auth_fifo search: account: %d, char: %d, secure: %08x-%08x\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14)); + for(i = 0; i < AUTH_FIFO_SIZE; i++) { + if (auth_fifo[i].account_id == RFIFOL(fd,2) && + auth_fifo[i].char_id == RFIFOL(fd,6) && + auth_fifo[i].login_id1 == RFIFOL(fd,10) && +#if CMP_AUTHFIFO_LOGIN2 != 0 + // here, it's the only area where it's possible that we doesn't know login_id2 (map-server asks just after 0x72 packet, that doesn't given the value) + (auth_fifo[i].login_id2 == RFIFOL(fd,14) || RFIFOL(fd,14) == 0) && // relate to the versions higher than 18 +#endif + (!check_ip_flag || auth_fifo[i].ip == RFIFOL(fd,18)) && + !auth_fifo[i].delflag) { + auth_fifo[i].delflag = 1; + WFIFOW(fd,0) = 0x2afd; + WFIFOW(fd,2) = 16 + sizeof(struct mmo_charstatus); + WFIFOL(fd,4) = RFIFOL(fd,2); + WFIFOL(fd,8) = auth_fifo[i].login_id2; + WFIFOL(fd,12) = (unsigned long)auth_fifo[i].connect_until_time; + char_dat[auth_fifo[i].char_pos].sex = auth_fifo[i].sex; + memcpy(WFIFOP(fd,16), &char_dat[auth_fifo[i].char_pos], sizeof(struct mmo_charstatus)); + WFIFOSET(fd, WFIFOW(fd,2)); + //printf("auth_fifo search success (auth #%d, account %d, character: %d).\n", i, RFIFOL(fd,2), RFIFOL(fd,6)); + break; + } + } + if (i == AUTH_FIFO_SIZE) { + WFIFOW(fd,0) = 0x2afe; + WFIFOL(fd,2) = RFIFOL(fd,2); + WFIFOSET(fd,6); + printf("auth_fifo search error! account %d not authentified.\n", RFIFOL(fd,2)); + } + RFIFOSKIP(fd,22); + break; + + // MAPサーバー上のユーザー数受信 + case 0x2aff: + if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; + server[id].users = RFIFOW(fd,4); + if(anti_freeze_enable) + server_freezeflag[id] = 5; // Map anti-freeze system. Counter. 5 ok, 4...0 freezed + // remove all previously online players of the server + for(i = 0; i < char_num; i++) + if (online_chars[i] == id) + online_chars[i] = -1; + // add online players in the list by [Yor] + for(i = 0; i < server[id].users; i++) { + int char_id = RFIFOL(fd,6+i*4); + for(j = 0; j < char_num; j++) + if (char_dat[j].char_id == char_id) { + online_chars[j] = id; + //printf("%d\n", char_id); + break; + } + } + if (update_online < time(NULL)) { // Time is done + update_online = time(NULL) + 8; + create_online_files(); // only every 8 sec. (normally, 1 server send users every 5 sec.) Don't update every time, because that takes time, but only every 2 connection. + // it set to 8 sec because is more than 5 (sec) and if we have more than 1 map-server, informations can be received in shifted. + } + RFIFOSKIP(fd,6+i*4); + break; + + // キャラデータ保存 + case 0x2b01: + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; + for(i = 0; i < char_num; i++) { + if (char_dat[i].account_id == RFIFOL(fd,4) && + char_dat[i].char_id == RFIFOL(fd,8)) + break; + } + if (i != char_num) + memcpy(&char_dat[i], RFIFOP(fd,12), sizeof(struct mmo_charstatus)); + RFIFOSKIP(fd,RFIFOW(fd,2)); + break; + + // キャラセレ要求 + case 0x2b02: + if (RFIFOREST(fd) < 18) + return 0; + if (auth_fifo_pos >= AUTH_FIFO_SIZE) + auth_fifo_pos = 0; + //printf("auth_fifo set (auth #%d) - account: %d, secure: %08x-%08x\n", auth_fifo_pos, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); + auth_fifo[auth_fifo_pos].account_id = RFIFOL(fd,2); + auth_fifo[auth_fifo_pos].char_id = 0; + auth_fifo[auth_fifo_pos].login_id1 = RFIFOL(fd,6); + auth_fifo[auth_fifo_pos].login_id2 = RFIFOL(fd,10); + auth_fifo[auth_fifo_pos].delflag = 2; + auth_fifo[auth_fifo_pos].char_pos = 0; + auth_fifo[auth_fifo_pos].connect_until_time = 0; // unlimited/unknown time by default (not display in map-server) + auth_fifo[auth_fifo_pos].ip = RFIFOL(fd,14); + auth_fifo_pos++; + WFIFOW(fd,0) = 0x2b03; + WFIFOL(fd,2) = RFIFOL(fd,2); + WFIFOB(fd,6) = 0; + WFIFOSET(fd,7); + RFIFOSKIP(fd,18); + break; + + // マップサーバー間移動要求 + case 0x2b05: + if (RFIFOREST(fd) < 49) + return 0; + if (auth_fifo_pos >= AUTH_FIFO_SIZE) + auth_fifo_pos = 0; + WFIFOW(fd,0) = 0x2b06; + memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 42); + //printf("auth_fifo set (auth#%d) - account: %d, secure: 0x%08x-0x%08x\n", auth_fifo_pos, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); + auth_fifo[auth_fifo_pos].account_id = RFIFOL(fd,2); + auth_fifo[auth_fifo_pos].char_id = RFIFOL(fd,14); + auth_fifo[auth_fifo_pos].login_id1 = RFIFOL(fd,6); + auth_fifo[auth_fifo_pos].login_id2 = RFIFOL(fd,10); + auth_fifo[auth_fifo_pos].delflag = 0; + auth_fifo[auth_fifo_pos].sex = RFIFOB(fd,44); + auth_fifo[auth_fifo_pos].connect_until_time = 0; // unlimited/unknown time by default (not display in map-server) + auth_fifo[auth_fifo_pos].ip = RFIFOL(fd,45); + for(i = 0; i < char_num; i++) + if (char_dat[i].account_id == RFIFOL(fd,2) && + char_dat[i].char_id == RFIFOL(fd,14)) { + auth_fifo[auth_fifo_pos].char_pos = i; + auth_fifo_pos++; + WFIFOL(fd,6) = 0; + break; + } + if (i == char_num) + WFIFOW(fd,6) = 1; + WFIFOSET(fd,44); + RFIFOSKIP(fd,49); + break; + + // キャラ名検索 + case 0x2b08: + if (RFIFOREST(fd) < 6) + return 0; + for(i = 0; i < char_num; i++) { + if (char_dat[i].char_id == RFIFOL(fd,2)) + break; + } + WFIFOW(fd,0) = 0x2b09; + WFIFOL(fd,2) = RFIFOL(fd,2); + if (i != char_num) + memcpy(WFIFOP(fd,6), char_dat[i].name, 24); + else + memcpy(WFIFOP(fd,6), unknown_char_name, 24); + WFIFOSET(fd,30); + RFIFOSKIP(fd,6); + break; + + // it is a request to become GM + case 0x2b0a: + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; +// printf("parse_frommap: change gm -> login, account: %d, pass: '%s'.\n", RFIFOL(fd,4), RFIFOP(fd,8)); + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd,0) = 0x2720; + memcpy(WFIFOP(login_fd,2), RFIFOP(fd,2), RFIFOW(fd,2)-2); + WFIFOSET(login_fd, RFIFOW(fd,2)); + } else { + WFIFOW(fd,0) = 0x2b0b; + WFIFOL(fd,2) = RFIFOL(fd,4); + WFIFOL(fd,6) = 0; + WFIFOSET(fd, 10); + } + RFIFOSKIP(fd, RFIFOW(fd,2)); + break; + + // Map server send information to change an email of an account -> login-server + case 0x2b0c: + if (RFIFOREST(fd) < 86) + return 0; + if (login_fd > 0) { // don't send request if no login-server + memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0), 86); // 0x2722 .L .40B .40B + WFIFOW(login_fd,0) = 0x2722; + WFIFOSET(login_fd, 86); + } + RFIFOSKIP(fd, 86); + break; + + // Map server ask char-server about a character name to do some operations (all operations are transmitted to login-server) + case 0x2b0e: + if (RFIFOREST(fd) < 44) + return 0; + { + char character_name[24]; + int acc = RFIFOL(fd,2); // account_id of who ask (-1 if nobody) + memcpy(character_name, RFIFOP(fd,6), 24); + character_name[sizeof(character_name) -1] = '\0'; + // prepare answer + WFIFOW(fd,0) = 0x2b0f; // answer + WFIFOL(fd,2) = acc; // who want do operation + WFIFOW(fd,30) = RFIFOW(fd, 30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban, 5-changesex + // search character + i = search_character_index(character_name); + if (i >= 0) { + memcpy(WFIFOP(fd,6), search_character_name(i), 24); // put correct name if found + WFIFOW(fd,32) = 0; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + switch(RFIFOW(fd, 30)) { + case 1: // block + if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd,0) = 0x2724; + WFIFOL(login_fd,2) = char_dat[i].account_id; // account value + WFIFOL(login_fd,6) = 5; // status of the account + WFIFOSET(login_fd, 10); +// printf("char : status -> login: account %d, status: %d \n", char_dat[i].account_id, 5); + } else + WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + } else + WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + break; + case 2: // ban + if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd, 0) = 0x2725; + WFIFOL(login_fd, 2) = char_dat[i].account_id; // account value + WFIFOW(login_fd, 6) = RFIFOW(fd,32); // year + WFIFOW(login_fd, 8) = RFIFOW(fd,34); // month + WFIFOW(login_fd,10) = RFIFOW(fd,36); // day + WFIFOW(login_fd,12) = RFIFOW(fd,38); // hour + WFIFOW(login_fd,14) = RFIFOW(fd,40); // minute + WFIFOW(login_fd,16) = RFIFOW(fd,42); // second + WFIFOSET(login_fd,18); +// printf("char : status -> login: account %d, ban: %dy %dm %dd %dh %dmn %ds\n", +// char_dat[i].account_id, (short)RFIFOW(fd,32), (short)RFIFOW(fd,34), (short)RFIFOW(fd,36), (short)RFIFOW(fd,38), (short)RFIFOW(fd,40), (short)RFIFOW(fd,42)); + } else + WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + } else + WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + break; + case 3: // unblock + if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd,0) = 0x2724; + WFIFOL(login_fd,2) = char_dat[i].account_id; // account value + WFIFOL(login_fd,6) = 0; // status of the account + WFIFOSET(login_fd, 10); +// printf("char : status -> login: account %d, status: %d \n", char_dat[i].account_id, 0); + } else + WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + } else + WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + break; + case 4: // unban + if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd, 0) = 0x272a; + WFIFOL(login_fd, 2) = char_dat[i].account_id; // account value + WFIFOSET(login_fd, 6); +// printf("char : status -> login: account %d, unban request\n", char_dat[i].account_id); + } else + WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + } else + WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + break; + case 5: // changesex + if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd, 0) = 0x2727; + WFIFOL(login_fd, 2) = char_dat[i].account_id; // account value + WFIFOSET(login_fd, 6); +// printf("char : status -> login: account %d, change sex request\n", char_dat[i].account_id); + } else + WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + } else + WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + break; + } + } else { + // character name not found + memcpy(WFIFOP(fd,6), character_name, 24); + WFIFOW(fd,32) = 1; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + } + // send answer if a player ask, not if the server ask + if (acc != -1) { + WFIFOSET(fd, 34); + } + RFIFOSKIP(fd, 44); + break; + } + +// case 0x2b0f: not more used (available for futur usage) + + // account_reg保存要求 + case 0x2b10: + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; + { + struct global_reg reg[ACCOUNT_REG2_NUM]; + int p, acc; + acc = RFIFOL(fd,4); + for(p = 8, j = 0; p < RFIFOW(fd,2) && j < ACCOUNT_REG2_NUM; p += 36, j++) { + memcpy(reg[j].str, RFIFOP(fd,p), 32); + reg[j].value = RFIFOL(fd, p+32); + } + set_account_reg2(acc, j, reg); + // loginサーバーへ送る + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd, 0) = 0x2728; + memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0), RFIFOW(fd,2)); + WFIFOSET(login_fd, WFIFOW(login_fd,2)); + } + // ワールドへの同垢ログインがなければmapサーバーに送る必要はない + //memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2)); + //WBUFW(buf,0) = 0x2b11; + //mapif_sendall(buf, WBUFW(buf,2)); + RFIFOSKIP(fd, RFIFOW(fd,2)); +// printf("char: save_account_reg (from map)\n"); + break; + } + + default: + // inter server処理に渡す + { + int r = inter_parse_frommap(fd); + if (r == 1) // 処理できた + break; + if (r == 2) // パケット長が足りない + return 0; + } + // inter server処理でもない場合は切断 + printf("char: unknown packet 0x%04x (%d bytes to read in buffer)! (from map).\n", RFIFOW(fd,0), RFIFOREST(fd)); + session[fd]->eof = 1; + return 0; + } + } + return 0; +} + +int search_mapserver(char *map) { + int i, j; + char temp_map[16]; + int temp_map_len; + +// printf("Searching the map-server for map '%s'... ", map); + strncpy(temp_map, map, sizeof(temp_map)); + temp_map[sizeof(temp_map)-1] = '\0'; + if (strchr(temp_map, '.') != NULL) + temp_map[strchr(temp_map, '.') - temp_map + 1] = '\0'; // suppress the '.gat', but conserve the '.' to be sure of the name of the map + + temp_map_len = strlen(temp_map); + for(i = 0; i < MAX_MAP_SERVERS; i++) + if (server_fd[i] >= 0) + for (j = 0; server[i].map[j][0]; j++) + //printf("%s : %s = %d\n", server[i].map[j], map, strncmp(server[i].map[j], temp_map, temp_map_len)); + if (strncmp(server[i].map[j], temp_map, temp_map_len) == 0) { +// printf("found -> server #%d.\n", i); + return i; + } + +// printf("not found.\n"); + return -1; +} + +// char_mapifの初期化処理(現在は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. by [Yor] +//----------------------------------------------------- +int lan_ip_check(unsigned char *p){ + int i; + int lancheck = 1; + +// printf("lan_ip_check: to compare: %d.%d.%d.%d, network: %d.%d.%d.%d/%d.%d.%d.%d\n", +// p[0], p[1], p[2], p[3], +// subneti[0], subneti[1], subneti[2], subneti[3], +// subnetmaski[0], subnetmaski[1], subnetmaski[2], subnetmaski[3]); + for(i = 0; i < 4; i++) { + if ((subneti[i] & subnetmaski[i]) != (p[i] & subnetmaski[i])) { + lancheck = 0; + break; + } + } + printf("LAN test (result): %s source\033[0m.\n", (lancheck) ? "\033[1;36mLAN" : "\033[1;32mWAN"); + return lancheck; +} + +int parse_char(int fd) { + int i, ch; + char email[40]; + struct char_session_data *sd; + unsigned char *p = (unsigned char *) &session[fd]->client_addr.sin_addr; + + if (login_fd < 0 || session[fd]->eof) { // disconnect any player (already connected to char-server or coming back from map-server) if login-server is diconnected. + if (fd == login_fd) + login_fd = -1; + close(fd); + delete_session(fd); + return 0; + } + + sd = session[fd]->session_data; + + while (RFIFOREST(fd) >= 2) { +// if (RFIFOW(fd,0) < 30000) +// printf("parse_char: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd)); + + switch(RFIFOW(fd,0)) { + case 0x20b: //20040622暗号化ragexe対応 + if (RFIFOREST(fd) < 19) + return 0; + RFIFOSKIP(fd,19); + break; + + case 0x65: // 接続要求 + if (RFIFOREST(fd) < 17) + return 0; + { + int GM_value; + if ((GM_value = isGM(RFIFOL(fd,2)))) + printf("Account Logged On; Account ID: %d (GM level %d).\n", RFIFOL(fd,2), GM_value); + else + printf("Account Logged On; Account ID: %d.\n", RFIFOL(fd,2)); + if (sd == NULL) { + sd = session[fd]->session_data = calloc(sizeof(struct char_session_data), 1); + memset(sd, 0, sizeof(struct char_session_data)); + memcpy(sd->email, "no mail", 40); // put here a mail without '@' to refuse deletion if we don't receive the e-mail + sd->connect_until_time = 0; // unknow or illimited (not displaying on map-server) + } + sd->account_id = RFIFOL(fd,2); + sd->login_id1 = RFIFOL(fd,6); + sd->login_id2 = RFIFOL(fd,10); + sd->sex = RFIFOB(fd,16); + // send back account_id + WFIFOL(fd,0) = RFIFOL(fd,2); + WFIFOSET(fd,4); + // search authentification + for(i = 0; i < AUTH_FIFO_SIZE; i++) { + if (auth_fifo[i].account_id == sd->account_id && + auth_fifo[i].login_id1 == sd->login_id1 && +#if CMP_AUTHFIFO_LOGIN2 != 0 + auth_fifo[i].login_id2 == sd->login_id2 && // relate to the versions higher than 18 +#endif + (!check_ip_flag || auth_fifo[i].ip == session[fd]->client_addr.sin_addr.s_addr) && + auth_fifo[i].delflag == 2) { + auth_fifo[i].delflag = 1; + if (max_connect_user == 0 || count_users() < max_connect_user) { + if (login_fd > 0) { // don't send request if no login-server + // request to login-server to obtain e-mail/time limit + WFIFOW(login_fd,0) = 0x2716; + WFIFOL(login_fd,2) = sd->account_id; + WFIFOSET(login_fd,6); + } + // send characters to player + mmo_char_send006b(fd, sd); + } else { + // refuse connection (over populated) + WFIFOW(fd,0) = 0x6c; + WFIFOW(fd,2) = 0; + WFIFOSET(fd,3); + } + break; + } + } + // authentification not found + if (i == AUTH_FIFO_SIZE) { + if (login_fd > 0) { // don't send request if no login-server + 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; // relate to the versions higher than 18 + WFIFOB(login_fd,14) = sd->sex; + WFIFOL(login_fd,15) = session[fd]->client_addr.sin_addr.s_addr; + WFIFOSET(login_fd,19); + } else { // if no login-server, we must refuse connection + WFIFOW(fd,0) = 0x6c; + WFIFOW(fd,2) = 0; + WFIFOSET(fd,3); + } + } + } + RFIFOSKIP(fd,17); + break; + + case 0x66: // キャラ選択 + if (RFIFOREST(fd) < 3) + return 0; + + // if we activated email creation and email is default email + if (email_creation != 0 && strcmp(sd->email, "a@a.com") == 0 && login_fd > 0) { // to modify an e-mail, login-server must be online + WFIFOW(fd, 0) = 0x70; + WFIFOB(fd, 2) = 0; // 00 = Incorrect Email address + WFIFOSET(fd, 3); + + // otherwise, load the character + } else { + for (ch = 0; ch < 9; ch++) + if (sd->found_char[ch] >= 0 && char_dat[sd->found_char[ch]].char_num == RFIFOB(fd,2)) + break; + if (ch != 9) { + char_log("Character Selected, Account ID: %d, Character Slot: %d, Character Name: %s." RETCODE, + sd->account_id, RFIFOB(fd,2), char_dat[sd->found_char[ch]].name); + // searching map server + i = search_mapserver(char_dat[sd->found_char[ch]].last_point.map); + // if map is not found, we check major cities + if (i < 0) { + if ((i = search_mapserver("prontera.gat")) >= 0) { // check is done without 'gat'. + memcpy(char_dat[sd->found_char[ch]].last_point.map, "prontera.gat", 16); + char_dat[sd->found_char[ch]].last_point.x = 273; // savepoint coordonates + char_dat[sd->found_char[ch]].last_point.y = 354; + } else if ((i = search_mapserver("geffen.gat")) >= 0) { // check is done without 'gat'. + memcpy(char_dat[sd->found_char[ch]].last_point.map, "geffen.gat", 16); + char_dat[sd->found_char[ch]].last_point.x = 120; // savepoint coordonates + char_dat[sd->found_char[ch]].last_point.y = 100; + } else if ((i = search_mapserver("morocc.gat")) >= 0) { // check is done without 'gat'. + memcpy(char_dat[sd->found_char[ch]].last_point.map, "morocc.gat", 16); + char_dat[sd->found_char[ch]].last_point.x = 160; // savepoint coordonates + char_dat[sd->found_char[ch]].last_point.y = 94; + } else if ((i = search_mapserver("alberta.gat")) >= 0) { // check is done without 'gat'. + memcpy(char_dat[sd->found_char[ch]].last_point.map, "alberta.gat", 16); + char_dat[sd->found_char[ch]].last_point.x = 116; // savepoint coordonates + char_dat[sd->found_char[ch]].last_point.y = 57; + } else if ((i = search_mapserver("payon.gat")) >= 0) { // check is done without 'gat'. + memcpy(char_dat[sd->found_char[ch]].last_point.map, "payon.gat", 16); + char_dat[sd->found_char[ch]].last_point.x = 87; // savepoint coordonates + char_dat[sd->found_char[ch]].last_point.y = 117; + } else if ((i = search_mapserver("izlude.gat")) >= 0) { // check is done without 'gat'. + memcpy(char_dat[sd->found_char[ch]].last_point.map, "izlude.gat", 16); + char_dat[sd->found_char[ch]].last_point.x = 94; // savepoint coordonates + char_dat[sd->found_char[ch]].last_point.y = 103; + } else { + int j; + // get first online server (with a map) + i = 0; + for(j = 0; j < MAX_MAP_SERVERS; j++) + if (server_fd[j] >= 0 && server[j].map[0][0]) { // change save point to one of map found on the server (the first) + i = j; + memcpy(char_dat[sd->found_char[ch]].last_point.map, server[j].map[0], 16); + printf("Map-server #%d found with a map: '%s'.\n", j, server[j].map[0]); + // coordonates are unknown + break; + } + // if no map-server is connected, we send: server closed + if (j == MAX_MAP_SERVERS) { + WFIFOW(fd,0) = 0x81; + WFIFOL(fd,2) = 1; // 01 = Server closed + WFIFOSET(fd,3); + RFIFOSKIP(fd,3); + break; + } + } + } + WFIFOW(fd,0) = 0x71; + WFIFOL(fd,2) = char_dat[sd->found_char[ch]].char_id; + memcpy(WFIFOP(fd,6), char_dat[sd->found_char[ch]].last_point.map, 16); + printf("Character selection '%s' (account: %d, slot: %d).\n", char_dat[sd->found_char[ch]].name, sd->account_id, ch); + printf("--Send IP of map-server. "); + if (lan_ip_check(p)) + WFIFOL(fd, 22) = inet_addr(lan_map_ip); + else + WFIFOL(fd, 22) = server[i].ip; + WFIFOW(fd,26) = server[i].port; + WFIFOSET(fd,28); + if (auth_fifo_pos >= AUTH_FIFO_SIZE) + auth_fifo_pos = 0; + //printf("auth_fifo set #%d - account %d, char: %d, secure: %08x-%08x\n", auth_fifo_pos, sd->account_id, char_dat[sd->found_char[ch]].char_id, sd->login_id1, sd->login_id2); + auth_fifo[auth_fifo_pos].account_id = sd->account_id; + auth_fifo[auth_fifo_pos].char_id = char_dat[sd->found_char[ch]].char_id; + auth_fifo[auth_fifo_pos].login_id1 = sd->login_id1; + auth_fifo[auth_fifo_pos].login_id2 = sd->login_id2; + auth_fifo[auth_fifo_pos].delflag = 0; + auth_fifo[auth_fifo_pos].char_pos = sd->found_char[ch]; + auth_fifo[auth_fifo_pos].sex = sd->sex; + auth_fifo[auth_fifo_pos].connect_until_time = sd->connect_until_time; + auth_fifo[auth_fifo_pos].ip = session[fd]->client_addr.sin_addr.s_addr; + auth_fifo_pos++; + } + } + RFIFOSKIP(fd,3); + break; + + case 0x67: // 作成 + if (RFIFOREST(fd) < 37) + return 0; + i = make_new_char(fd, RFIFOP(fd,2)); + if (i < 0) { + WFIFOW(fd,0) = 0x6e; + WFIFOB(fd,2) = 0x00; + WFIFOSET(fd,3); + RFIFOSKIP(fd,37); + break; + } + + WFIFOW(fd,0) = 0x6d; + memset(WFIFOP(fd,2), 0, 106); + + WFIFOL(fd,2) = char_dat[i].char_id; + WFIFOL(fd,2+4) = char_dat[i].base_exp; + WFIFOL(fd,2+8) = char_dat[i].zeny; + WFIFOL(fd,2+12) = char_dat[i].job_exp; + WFIFOL(fd,2+16) = char_dat[i].job_level; + + WFIFOL(fd,2+28) = char_dat[i].karma; + WFIFOL(fd,2+32) = char_dat[i].manner; + + WFIFOW(fd,2+40) = 0x30; + WFIFOW(fd,2+42) = (char_dat[i].hp > 0x7fff) ? 0x7fff : char_dat[i].hp; + WFIFOW(fd,2+44) = (char_dat[i].max_hp > 0x7fff) ? 0x7fff : char_dat[i].max_hp; + WFIFOW(fd,2+46) = (char_dat[i].sp > 0x7fff) ? 0x7fff : char_dat[i].sp; + WFIFOW(fd,2+48) = (char_dat[i].max_sp > 0x7fff) ? 0x7fff : char_dat[i].max_sp; + WFIFOW(fd,2+50) = DEFAULT_WALK_SPEED; // char_dat[i].speed; + WFIFOW(fd,2+52) = char_dat[i].class; + WFIFOW(fd,2+54) = char_dat[i].hair; + + WFIFOW(fd,2+58) = char_dat[i].base_level; + WFIFOW(fd,2+60) = char_dat[i].skill_point; + + WFIFOW(fd,2+64) = char_dat[i].shield; + WFIFOW(fd,2+66) = char_dat[i].head_top; + WFIFOW(fd,2+68) = char_dat[i].head_mid; + WFIFOW(fd,2+70) = char_dat[i].hair_color; + + memcpy(WFIFOP(fd,2+74), char_dat[i].name, 24); + + WFIFOB(fd,2+98) = (char_dat[i].str > 255) ? 255 : char_dat[i].str; + WFIFOB(fd,2+99) = (char_dat[i].agi > 255) ? 255 : char_dat[i].agi; + WFIFOB(fd,2+100) = (char_dat[i].vit > 255) ? 255 : char_dat[i].vit; + WFIFOB(fd,2+101) = (char_dat[i].int_ > 255) ? 255 : char_dat[i].int_; + WFIFOB(fd,2+102) = (char_dat[i].dex > 255) ? 255 : char_dat[i].dex; + WFIFOB(fd,2+103) = (char_dat[i].luk > 255) ? 255 : char_dat[i].luk; + WFIFOB(fd,2+104) = char_dat[i].char_num; + + WFIFOSET(fd,108); + RFIFOSKIP(fd,37); + for(ch = 0; ch < 9; ch++) { + if (sd->found_char[ch] == -1) { + sd->found_char[ch] = i; + break; + } + } + + case 0x68: // delete char //Yor's Fix + if (RFIFOREST(fd) < 46) + return 0; + memcpy(email, RFIFOP(fd,6), 40); + if (e_mail_check(email) == 0) + strncpy(email, "a@a.com", 40); // default e-mail + + // if we activated email creation and email is default email + if (email_creation != 0 && strcmp(sd->email, "a@a.com") == 0 && login_fd > 0) { // to modify an e-mail, login-server must be online + // if sended email is incorrect e-mail + if (strcmp(email, "a@a.com") == 0) { + WFIFOW(fd, 0) = 0x70; + WFIFOB(fd, 2) = 0; // 00 = Incorrect Email address + WFIFOSET(fd, 3); + RFIFOSKIP(fd,46); + // we act like we have selected a character + } else { + // we change the packet to set it like selection. + for (i = 0; i < 9; i++) + if (char_dat[sd->found_char[i]].char_id == RFIFOL(fd,2)) { + // we save new e-mail + memcpy(sd->email, email, 40); + // we send new e-mail to login-server ('online' login-server is checked before) + WFIFOW(login_fd,0) = 0x2715; + WFIFOL(login_fd,2) = sd->account_id; + memcpy(WFIFOP(login_fd, 6), email, 40); + WFIFOSET(login_fd,46); + // skip part of the packet! (46, but leave the size of select packet: 3) + RFIFOSKIP(fd,43); + // change value to put new packet (char selection) + RFIFOW(fd, 0) = 0x66; + RFIFOB(fd, 2) = char_dat[sd->found_char[i]].char_num; + // not send packet, it's modify of actual packet + break; + } + if (i == 9) { + WFIFOW(fd, 0) = 0x70; + WFIFOB(fd, 2) = 0; // 00 = Incorrect Email address + WFIFOSET(fd, 3); + RFIFOSKIP(fd,46); + } + } + + // otherwise, we delete the character + } else { + if (strcmpi(email, sd->email) != 0) { // if it's an invalid email + WFIFOW(fd, 0) = 0x70; + WFIFOB(fd, 2) = 0; // 00 = Incorrect Email address + WFIFOSET(fd, 3); + // if mail is correct + } else { + for (i = 0; i < 9; i++) { + struct mmo_charstatus *cs = NULL; + if ((cs = &char_dat[sd->found_char[i]])->char_id == RFIFOL(fd,2)) { + char_delete(cs); // deletion process + + if (sd->found_char[i] != char_num - 1) { + memcpy(&char_dat[sd->found_char[i]], &char_dat[char_num-1], sizeof(struct mmo_charstatus)); + // Correct moved character reference in the character's owner + { + int j, k; + struct char_session_data *sd2; + for (j = 0; j < fd_max; j++) { + if (session[j] && (sd2 = session[j]->session_data) && + sd2->account_id == char_dat[char_num-1].account_id) { + for (k = 0; k < 9; k++) { + if (sd2->found_char[k] == char_num-1) { + sd2->found_char[k] = sd->found_char[i]; + break; + } + } + break; + } + } + } + } + + char_num--; + for(ch = i; ch < 9-1; ch++) + sd->found_char[ch] = sd->found_char[ch+1]; + sd->found_char[8] = -1; + WFIFOW(fd,0) = 0x6f; + WFIFOSET(fd,2); + break; + } + } + + if (i == 9) { + WFIFOW(fd,0) = 0x70; + WFIFOB(fd,2) = 0; + WFIFOSET(fd,3); + } + } + RFIFOSKIP(fd,46); + } + break; + + case 0x2af8: // マップサーバーログイン + if (RFIFOREST(fd) < 60) + return 0; + WFIFOW(fd,0) = 0x2af9; + for(i = 0; i < MAX_MAP_SERVERS; i++) { + if (server_fd[i] < 0) + break; + } + if (i == MAX_MAP_SERVERS || strcmp(RFIFOP(fd,2), userid) || strcmp(RFIFOP(fd,26), passwd)){ + WFIFOB(fd,2) = 3; + WFIFOSET(fd,3); + RFIFOSKIP(fd,60); + } else { + int len; + WFIFOB(fd,2) = 0; + session[fd]->func_parse = parse_frommap; + server_fd[i] = fd; + if(anti_freeze_enable) + server_freezeflag[i] = 5; // Map anti-freeze system. Counter. 5 ok, 4...0 freezed + server[i].ip = RFIFOL(fd,54); + server[i].port = RFIFOW(fd,58); + server[i].users = 0; + memset(server[i].map, 0, sizeof(server[i].map)); + WFIFOSET(fd,3); + RFIFOSKIP(fd,60); + realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK); + char_mapif_init(fd); + // send gm acccounts level to map-servers + len = 4; + WFIFOW(fd,0) = 0x2b15; + for(i = 0; i < GM_num; i++) { + WFIFOL(fd,len) = gm_account[i].account_id; + WFIFOB(fd,len+4) = (unsigned char)gm_account[i].level; + len += 5; + } + WFIFOW(fd,2) = len; + WFIFOSET(fd,len); + return 0; + } + break; + + case 0x187: // Alive信号? + if (RFIFOREST(fd) < 6) + return 0; + RFIFOSKIP(fd, 6); + break; + + case 0x7530: // Athena情報所得 + WFIFOW(fd,0) = 0x7531; + WFIFOB(fd,2) = ATHENA_MAJOR_VERSION; + WFIFOB(fd,3) = ATHENA_MINOR_VERSION; + WFIFOB(fd,4) = ATHENA_REVISION; + WFIFOB(fd,5) = ATHENA_RELEASE_FLAG; + WFIFOB(fd,6) = ATHENA_OFFICIAL_FLAG; + WFIFOB(fd,7) = ATHENA_SERVER_INTER | ATHENA_SERVER_CHAR; + WFIFOW(fd,8) = ATHENA_MOD_VERSION; + WFIFOSET(fd,10); + RFIFOSKIP(fd,2); + return 0; + + case 0x7532: // 接続の切断(defaultと処理は一緒だが明示的にするため) + session[fd]->eof = 1; + return 0; + + default: + session[fd]->eof = 1; + return 0; + } + } + RFIFOFLUSH(fd); + return 0; +} + +// 全てのMAPサーバーにデータ送信(送信したmap鯖の数を返す) +int mapif_sendall(unsigned char *buf, unsigned int len) { + int i, c; + + c = 0; + for(i = 0; i < MAX_MAP_SERVERS; i++) { + int fd; + if ((fd = server_fd[i]) >= 0) { + memcpy(WFIFOP(fd,0), buf, len); + WFIFOSET(fd,len); + c++; + } + } + return c; +} + +// 自分以外の全てのMAPサーバーにデータ送信(送信したmap鯖の数を返す) +int mapif_sendallwos(int sfd, unsigned char *buf, unsigned int len) { + int i, c; + + c = 0; + for(i = 0; i < MAX_MAP_SERVERS; i++) { + int fd; + if ((fd = server_fd[i]) >= 0 && fd != sfd) { + memcpy(WFIFOP(fd,0), buf, len); + WFIFOSET(fd, len); + c++; + } + } + return c; +} +// MAPサーバーにデータ送信(map鯖生存確認有り) +int mapif_send(int fd, unsigned char *buf, unsigned int len) { + int i; + + if (fd >= 0) { + for(i = 0; i < MAX_MAP_SERVERS; i++) { + if (fd == server_fd[i]) { + memcpy(WFIFOP(fd,0), buf, len); + WFIFOSET(fd,len); + return 1; + } + } + } + return 0; +} + +int send_users_tologin(int tid, unsigned int tick, int id, int data) { + int users = count_users(); + char buf[16]; + + if (login_fd > 0 && session[login_fd]) { + // send number of user to login server + WFIFOW(login_fd,0) = 0x2714; + WFIFOL(login_fd,2) = users; + WFIFOSET(login_fd,6); + } + // send number of players to all map-servers + WBUFW(buf,0) = 0x2b00; + WBUFL(buf,2) = users; + mapif_sendall(buf, 6); + + return 0; +} + +int check_connect_login_server(int tid, unsigned int tick, int id, int data) { + if (login_fd <= 0 || session[login_fd] == NULL) { + printf("Attempt to connect to login-server...\n"); + login_fd = make_connection(login_ip, login_port); + session[login_fd]->func_parse = parse_tologin; + realloc_fifo(login_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK); + WFIFOW(login_fd,0) = 0x2710; + memset(WFIFOP(login_fd,2), 0, 24); + memcpy(WFIFOP(login_fd,2), userid, strlen(userid) < 24 ? strlen(userid) : 24); + memset(WFIFOP(login_fd,26), 0, 24); + memcpy(WFIFOP(login_fd,26), passwd, strlen(passwd) < 24 ? strlen(passwd) : 24); + WFIFOL(login_fd,50) = 0; + WFIFOL(login_fd,54) = char_ip; + WFIFOL(login_fd,58) = char_port; + memset(WFIFOP(login_fd,60), 0, 20); + memcpy(WFIFOP(login_fd,60), server_name, strlen(server_name) < 20 ? strlen(server_name) : 20); + WFIFOW(login_fd,80) = 0; + WFIFOW(login_fd,82) = char_maintenance; + WFIFOW(login_fd,84) = char_new; + WFIFOSET(login_fd,86); + } + return 0; +} + +//---------------------------------------------------------- +// Return numerical value of a switch configuration by [Yor] +// on/off, english, fran軋is, deutsch, espaol +//---------------------------------------------------------- +int config_switch(const char *str) { + if (strcmpi(str, "on") == 0 || strcmpi(str, "yes") == 0 || strcmpi(str, "oui") == 0 || strcmpi(str, "ja") == 0 || strcmpi(str, "si") == 0) + return 1; + if (strcmpi(str, "off") == 0 || strcmpi(str, "no") == 0 || strcmpi(str, "non") == 0 || strcmpi(str, "nein") == 0) + return 0; + + return atoi(str); +} + +//------------------------------------------- +// Reading Lan Support configuration by [Yor] +//------------------------------------------- +int lan_config_read(const char *lancfgName) { + int j; + struct hostent * h = NULL; + char line[1024], w1[1024], w2[1024]; + FILE *fp; + + // set default configuration + strncpy(lan_map_ip, "127.0.0.1", sizeof(lan_map_ip)); + subneti[0] = 127; + subneti[1] = 0; + subneti[2] = 0; + subneti[3] = 1; + for(j = 0; j < 4; j++) + subnetmaski[j] = 255; + + fp = fopen(lancfgName, "r"); + + if (fp == NULL) { + printf("LAN support configuration file not found: %s\n", lancfgName); + return 1; + } + + printf ("---start reading of Lan Support configuration...\n"); + + while(fgets(line, sizeof(line)-1, fp)) { + if (line[0] == '/' && line[1] == '/') + continue; + + line[sizeof(line)-1] = '\0'; + if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2) + continue; + + remove_control_chars(w1); + remove_control_chars(w2); + if (strcmpi(w1, "lan_map_ip") == 0) { // Read map-server Lan IP Address + h = gethostbyname(w2); + if (h != NULL) { + sprintf(lan_map_ip, "%d.%d.%d.%d", (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); + } else { + strncpy(lan_map_ip, w2, sizeof(lan_map_ip)); + lan_map_ip[sizeof(lan_map_ip)-1] = 0; + } + printf("LAN IP of map-server: %s.\n", lan_map_ip); + } else if (strcmpi(w1, "subnet") == 0) { // Read Subnetwork + for(j = 0; j < 4; j++) + subneti[j] = 0; + h = gethostbyname(w2); + if (h != NULL) { + for(j = 0; j < 4; j++) + subneti[j] = (unsigned char)h->h_addr[j]; + } else { + sscanf(w2, "%d.%d.%d.%d", &subneti[0], &subneti[1], &subneti[2], &subneti[3]); + } + printf("Sub-network of the map-server: %d.%d.%d.%d.\n", subneti[0], subneti[1], subneti[2], subneti[3]); + } else if (strcmpi(w1, "subnetmask") == 0){ // Read Subnetwork Mask + for(j = 0; j < 4; j++) + subnetmaski[j] = 255; + h = gethostbyname(w2); + if (h != NULL) { + for(j = 0; j < 4; j++) + subnetmaski[j] = (unsigned char)h->h_addr[j]; + } else { + sscanf(w2, "%d.%d.%d.%d", &subnetmaski[0], &subnetmaski[1], &subnetmaski[2], &subnetmaski[3]); + } + printf("Sub-network mask of the map-server: %d.%d.%d.%d.\n", subnetmaski[0], subnetmaski[1], subnetmaski[2], subnetmaski[3]); + } + } + fclose(fp); + + // sub-network check of the map-server + { + unsigned int a0, a1, a2, a3; + unsigned char p[4]; + sscanf(lan_map_ip, "%d.%d.%d.%d", &a0, &a1, &a2, &a3); + p[0] = a0; p[1] = a1; p[2] = a2; p[3] = a3; + printf("LAN test of LAN IP of the map-server: "); + if (lan_ip_check(p) == 0) { + printf("\033[1;31m***ERROR: LAN IP of the map-server doesn't belong to the specified Sub-network.\033[0m\n"); + } + } + + printf("---End reading of Lan Support configuration...\n"); + + return 0; +} + +int char_config_read(const char *cfgName) { + struct hostent *h = NULL; + char line[1024], w1[1024], w2[1024]; + FILE *fp = fopen(cfgName, "r"); + + if (fp == NULL) { + printf("Configuration file not found: %s.\n", cfgName); + exit(1); + } + + while(fgets(line, sizeof(line)-1, fp)) { + if (line[0] == '/' && line[1] == '/') + continue; + + line[sizeof(line)-1] = '\0'; + if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2) + continue; + + remove_control_chars(w1); + remove_control_chars(w2); + if (strcmpi(w1, "userid") == 0) { + memcpy(userid, w2, 24); + } else if (strcmpi(w1, "passwd") == 0) { + memcpy(passwd, w2, 24); + } else if (strcmpi(w1, "server_name") == 0) { + memcpy(server_name, w2, sizeof(server_name)); + server_name[sizeof(server_name) - 1] = '\0'; + printf("%s server has been intialized\n", w2); + } else if (strcmpi(w1, "wisp_server_name") == 0) { + if (strlen(w2) >= 4) { + memcpy(wisp_server_name, w2, sizeof(wisp_server_name)); + wisp_server_name[sizeof(wisp_server_name) - 1] = '\0'; + } + } else if (strcmpi(w1, "login_ip") == 0) { + h = gethostbyname(w2); + if (h != NULL) { + printf("Login server IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); + sprintf(login_ip_str, "%d.%d.%d.%d", (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); + } else + memcpy(login_ip_str, w2, 16); + } else if (strcmpi(w1, "login_port") == 0) { + login_port = atoi(w2); + } else if (strcmpi(w1, "char_ip") == 0) { + h = gethostbyname(w2); + if (h != NULL) { + printf("Character server IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); + sprintf(char_ip_str, "%d.%d.%d.%d", (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); + } else + memcpy(char_ip_str, w2, 16); + } else if (strcmpi(w1, "char_port") == 0) { + char_port = atoi(w2); + } else if (strcmpi(w1, "char_maintenance") == 0) { + char_maintenance = atoi(w2); + } else if (strcmpi(w1, "char_new") == 0) { + char_new = atoi(w2); + } else if (strcmpi(w1, "email_creation") == 0) { + email_creation = config_switch(w2); + } else if (strcmpi(w1, "char_txt") == 0) { + strcpy(char_txt, w2); + } else if (strcmpi(w1, "backup_txt") == 0) { //By zanetheinsane + strcpy(backup_txt, w2); + } else if (strcmpi(w1, "backup_txt_flag") == 0) { // The backup_txt file was created because char deletion bug existed. Now it's finish and that take a lot of time to create a second file when there are a lot of characters. By [Yor] + backup_txt_flag = config_switch(w2); + } else if (strcmpi(w1, "max_connect_user") == 0) { + max_connect_user = atoi(w2); + if (max_connect_user < 0) + max_connect_user = 0; // unlimited online players + } else if (strcmpi(w1, "check_ip_flag") == 0) { + check_ip_flag = config_switch(w2); + } else if (strcmpi(w1, "autosave_time") == 0) { + autosave_interval = atoi(w2)*1000; + if (autosave_interval <= 0) + autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; + } else if (strcmpi(w1, "start_point") == 0) { + char map[32]; + int x, y; + if (sscanf(w2, "%[^,],%d,%d", map, &x, &y) < 3) + continue; + if (strstr(map, ".gat") != NULL) { // Verify at least if '.gat' is in the map name + memcpy(start_point.map, map, 16); + start_point.x = x; + start_point.y = y; + } + } else if (strcmpi(w1, "start_zeny") == 0) { + start_zeny = atoi(w2); + if (start_zeny < 0) + start_zeny = 0; + } else if (strcmpi(w1, "start_weapon") == 0) { + start_zeny = atoi(w2); + if (start_weapon < 0) + start_weapon = 0; + } else if (strcmpi(w1, "start_armor") == 0) { + start_zeny = atoi(w2); + if (start_armor < 0) + start_armor = 0; + } else if (strcmpi(w1, "unknown_char_name") == 0) { + strcpy(unknown_char_name, w2); + unknown_char_name[24] = 0; + } else if (strcmpi(w1, "char_log_filename") == 0) { + strcpy(char_log_filename, w2); + } else if (strcmpi(w1, "name_ignoring_case") == 0) { + name_ignoring_case = config_switch(w2); + } else if (strcmpi(w1, "char_name_option") == 0) { + char_name_option = atoi(w2); + } else if (strcmpi(w1, "char_name_letters") == 0) { + strcpy(char_name_letters, w2); +// online files options + } else if (strcmpi(w1, "online_txt_filename") == 0) { + strcpy(online_txt_filename, w2); + } else if (strcmpi(w1, "online_html_filename") == 0) { + strcpy(online_html_filename, w2); + } else if (strcmpi(w1, "online_sorting_option") == 0) { + online_sorting_option = atoi(w2); + } else if (strcmpi(w1, "online_display_option") == 0) { + online_display_option = atoi(w2); + } else if (strcmpi(w1, "online_gm_display_min_level") == 0) { // minimum GM level to display 'GM' when we want to display it + online_gm_display_min_level = atoi(w2); + if (online_gm_display_min_level < 5) // send online file every 5 seconds to player is enough + online_gm_display_min_level = 5; + } else if (strcmpi(w1, "online_refresh_html") == 0) { + online_refresh_html = atoi(w2); + if (online_refresh_html < 1) + online_refresh_html = 1; + } else if(strcmpi(w1,"anti_freeze_enable")==0){ + anti_freeze_enable = config_switch(w2); + } else if (strcmpi(w1, "anti_freeze_interval") == 0) { + ANTI_FREEZE_INTERVAL = atoi(w2); + if (ANTI_FREEZE_INTERVAL < 5) + ANTI_FREEZE_INTERVAL = 5; // minimum 5 seconds + } else if (strcmpi(w1, "import") == 0) { + char_config_read(w2); + } + } + fclose(fp); + + return 0; +} + +void do_final(void) { + int i; + + // write online players files with no player + for(i = 0; i < char_num; i++) + online_chars[i] = -1; + create_online_files(); + free(online_chars); + + mmo_char_sync(); + inter_save(); + + if (gm_account != NULL) + free(gm_account); + + free(char_dat); + delete_session(login_fd); + delete_session(char_fd); + + char_log("----End of char-server (normal end with closing of all files)." RETCODE); +} + +int do_init(int argc, char **argv) { + int i; + + // a newline in the log... + char_log(""); + char_log("The char-server starting..." RETCODE); + + char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]); + lan_config_read((argc > 1) ? argv[1] : LOGIN_LAN_CONF_NAME); + + login_ip = inet_addr(login_ip_str); + char_ip = inet_addr(char_ip_str); + + for(i = 0; i < MAX_MAP_SERVERS; i++) { + memset(&server[i], 0, sizeof(struct mmo_map_server)); + server_fd[i] = -1; + } + + mmo_char_init(); + + update_online = time(NULL); + create_online_files(); // update online players files at start of the server + + inter_init((argc > 2) ? argv[2] : inter_cfgName); // inter server 初期化 + + set_termfunc(do_final); + set_defaultparse(parse_char); + + char_fd = make_listen_port(char_port); + + add_timer_func_list(check_connect_login_server, "check_connect_login_server"); + add_timer_func_list(send_users_tologin, "send_users_tologin"); + add_timer_func_list(mmo_char_sync_timer, "mmo_char_sync_timer"); + + i = add_timer_interval(gettick() + 1000, check_connect_login_server, 0, 0, 10 * 1000); + i = add_timer_interval(gettick() + 1000, send_users_tologin, 0, 0, 5 * 1000); + i = add_timer_interval(gettick() + autosave_interval, mmo_char_sync_timer, 0, 0, autosave_interval); + + if(anti_freeze_enable > 0) { + add_timer_func_list(map_anti_freeze_system, "map_anti_freeze_system"); + i = add_timer_interval(gettick() + 1000, map_anti_freeze_system, 0, 0, ANTI_FREEZE_INTERVAL * 1000); // checks every X seconds user specifies + } + + char_log("The char-server is ready (Server is listening on the port %d)." RETCODE, char_port); + + printf("The char-server is \033[1;32mready\033[0m (Server is listening on the port %d).\n\n", char_port); + + return 0; +} diff --git a/misc/src/char/char.h b/misc/src/char/char.h new file mode 100644 index 0000000..989ca2f --- /dev/null +++ b/misc/src/char/char.h @@ -0,0 +1,31 @@ +// $Id: char.h,v 1.1.1.1 2004/09/10 17:26:50 MagicalTux Exp $ +#ifndef _CHAR_H_ +#define _CHAR_H_ + +#define MAX_MAP_SERVERS 30 + +#define CHAR_CONF_NAME "conf/char_athena.conf" + +#define LOGIN_LAN_CONF_NAME "conf/lan_support.conf" + +#define DEFAULT_AUTOSAVE_INTERVAL 300*1000 + +struct mmo_map_server{ + long ip; + short port; + int users; + char map[MAX_MAP_PER_SERVER][16]; +}; + +int search_character_index(char* character_name); +char * search_character_name(int index); + +int mapif_sendall(unsigned char *buf, unsigned int len); +int mapif_sendallwos(int fd,unsigned char *buf, unsigned int len); +int mapif_send(int fd,unsigned char *buf, unsigned int len); + +int char_log(char *fmt, ...); + +extern int autosave_interval; + +#endif diff --git a/misc/src/char/diff.diff b/misc/src/char/diff.diff new file mode 100644 index 0000000..61e91c7 --- /dev/null +++ b/misc/src/char/diff.diff @@ -0,0 +1,4242 @@ +--- char.c 2006-02-17 04:15:48.000000000 +0100 ++++ newchar/char.c 2006-03-15 19:55:35.000000000 +0100 +@@ -1,73 +1,100 @@ +-// $Id: char.c,v 1.3 2004/09/13 16:52:16 Yor Exp $ +-// original : char2.c 2003/03/14 11:58:35 Rev.1.5 ++// Copyright (c) Athena Dev Teams - Licensed under GNU GPL ++// For more information, see LICENCE in the main folder + + #include +-#include + #include + #include ++ ++#ifdef _WIN32 ++#include ++typedef long in_addr_t; ++#else ++#include + #include +-#include +-#include ++#include ++#include + #include ++#include + #include ++#endif ++ ++#include + #include + #include + #include +-#include +-#include + #include ++#include + +-#include "core.h" +-#include "socket.h" +-#include "timer.h" +-#include "mmo.h" +-#include "version.h" +-#include "lock.h" +-#include "char.h" ++#include "../common/strlib.h" ++#include "../common/core.h" ++#include "../common/socket.h" ++#include "../common/timer.h" ++#include "../common/mmo.h" ++#include "../common/db.h" ++#include "../common/version.h" ++#include "../common/lock.h" ++#include "../common/showmsg.h" ++#include "../common/malloc.h" + ++#include "char.h" + #include "inter.h" + #include "int_pet.h" + #include "int_guild.h" + #include "int_party.h" + #include "int_storage.h" +- +-#ifdef MEMWATCH +-#include "memwatch.h" ++#ifdef ENABLE_SC_SAVING ++#include "int_status.h" + #endif + + struct mmo_map_server server[MAX_MAP_SERVERS]; + int server_fd[MAX_MAP_SERVERS]; +-int server_freezeflag[MAX_MAP_SERVERS]; // Map-server anti-freeze system. Counter. 5 ok, 4...0 freezed +-int anti_freeze_enable = 0; +-int ANTI_FREEZE_INTERVAL = 6; + + int login_fd, char_fd; + char userid[24]; + char passwd[24]; + char server_name[20]; +-char wisp_server_name[24] = "Server"; ++char wisp_server_name[NAME_LENGTH] = "Server"; ++int login_ip_set_ = 0; + char login_ip_str[16]; +-int login_ip; ++in_addr_t login_ip; + int login_port = 6900; ++int char_ip_set_ = 0; + char char_ip_str[16]; +-int char_ip; ++int bind_ip_set_ = 0; ++char bind_ip_str[16]; ++in_addr_t char_ip; + int char_port = 6121; + int char_maintenance; + int char_new; ++int char_new_display; + int email_creation = 0; // disabled by default +-char char_txt[1024]; +-char backup_txt[1024]; //By zanetheinsane ++char char_txt[1024]="save/athena.txt"; ++char backup_txt[1024]="save/backup.txt"; //By zanetheinsane ++char friends_txt[1024]="save/friends.txt"; // davidsiaw + char backup_txt_flag = 0; // The backup_txt file was created because char deletion bug existed. Now it's finish and that take a lot of time to create a second file when there are a lot of characters. => option By [Yor] + char unknown_char_name[1024] = "Unknown"; + char char_log_filename[1024] = "log/char.log"; +-//Added for lan support +-char lan_map_ip[128]; +-int subneti[4]; +-int subnetmaski[4]; ++char db_path[1024]="db"; ++ ++// Advanced subnet check [LuzZza] ++struct _subnet { ++ long subnet; ++ long mask; ++ long char_ip; ++ long map_ip; ++} subnet[16]; ++ ++int subnet_count = 0; ++ + int name_ignoring_case = 0; // Allow or not identical name for characters but with a different case by [Yor] + int char_name_option = 0; // Option to know which letters/symbols are authorised in the name of a character (0: all, 1: only those in char_name_letters, 2: all EXCEPT those in char_name_letters) by [Yor] ++//The following are characters that are trimmed regardless because they cause confusion and problems on the servers. [Skotlex] ++#define TRIM_CHARS "\032\t\n " + char char_name_letters[1024] = ""; // list of letters/symbols authorised (or not) in a character name. by [Yor] + ++int log_char = 1; // loggin char or not [devil] ++int log_inter = 1; // loggin inter or not [devil] ++ + struct char_session_data{ + int account_id, login_id1, login_id2, sex; + int found_char[9]; +@@ -83,18 +110,31 @@ + int auth_fifo_pos = 0; + + int check_ip_flag = 1; // It's to check IP of a player between char-server and other servers (part of anti-hacking system) ++static int online_check = 1; //If one, it won't let players connect when their account is already registered online and will send the relevant map server a kick user request. [Skotlex] ++ ++int char_id_count = START_CHAR_NUM; ++struct character_data { ++ struct mmo_charstatus status; ++ int global_num; ++ struct global_reg global[GLOBAL_REG_NUM]; ++} *char_dat; + +-int char_id_count = 150000; +-struct mmo_charstatus *char_dat; + int char_num, char_max; + int max_connect_user = 0; ++int gm_allow_level = 99; + int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; ++int save_log = 1; + int start_zeny = 500; + int start_weapon = 1201; +-int start_armor = 1202; ++int start_armor = 2301; ++ ++//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; + + // Initial position (it's possible to set it in conf file) +-struct point start_point = {"new_1-1.gat", 53, 111}; ++struct point start_point = { 0, 53, 111}; + + struct gm_account *gm_account = NULL; + int GM_num = 0; +@@ -107,16 +147,31 @@ + int online_refresh_html = 20; // refresh time (in sec) of the html file in the explorer + int online_gm_display_min_level = 20; // minimum GM level to display 'GM' when we want to display it + +-int *online_chars; // same size of char_dat, and id value of current server (or -1) ++//These are used to aid the map server in identifying valid clients. [Skotlex] ++static int max_account_id = DEFAULT_MAX_ACCOUNT_ID, max_char_id = DEFAULT_MAX_CHAR_ID; ++ ++struct online_char_data { ++ int account_id; ++ int char_id; ++ short server; ++ unsigned waiting_disconnect :1; ++}; ++ ++struct dbt *online_char_db; //Holds all online characters. ++ + time_t update_online; // to update online files when we receiving information from a server (not less than 8 seconds) + ++int console = 0; ++ + //------------------------------ + // Writing function of logs file + //------------------------------ + int char_log(char *fmt, ...) { ++ if(log_char) ++ { + FILE *logfp; + va_list ap; +- struct timeval tv; ++ time_t raw_time; + char tmpstr[2048]; + + va_start(ap, fmt); +@@ -126,33 +181,16 @@ + if (fmt[0] == '\0') // jump a line if no message + fprintf(logfp, RETCODE); + else { +- gettimeofday(&tv, NULL); +- strftime(tmpstr, 24, "%d-%m-%Y %H:%M:%S", localtime(&(tv.tv_sec))); +- sprintf(tmpstr + 19, ".%03d: %s", (int)tv.tv_usec / 1000, fmt); ++ time(&raw_time); ++ strftime(tmpstr, 24, "%d-%m-%Y %H:%M:%S", localtime(&raw_time)); ++ sprintf(tmpstr + 19, ": %s", fmt); + vfprintf(logfp, tmpstr, ap); + } + fclose(logfp); + } +- + va_end(ap); +- return 0; +-} +- +-//----------------------------------------------------- +-// Function to suppress control characters in a string. +-//----------------------------------------------------- +-int remove_control_chars(unsigned char *str) { +- int i; +- int change = 0; +- +- for(i = 0; str[i]; i++) { +- if (str[i] < 32) { +- str[i] = '_'; +- change = 1; +- } + } +- +- return change; ++ return 0; + } + + //---------------------------------------------------------------------- +@@ -183,9 +221,9 @@ + index = -1; + for(i = 0; i < char_num; i++) { + // Without case sensitive check (increase the number of similar character names found) +- if (stricmp(char_dat[i].name, character_name) == 0) { ++ if (stricmp(char_dat[i].status.name, character_name) == 0) { + // Strict comparison (if found, we finish the function immediatly with correct value) +- if (strcmp(char_dat[i].name, character_name) == 0) ++ if (strcmp(char_dat[i].status.name, character_name) == 0) + return i; + quantity++; + index = i; +@@ -206,30 +244,140 @@ + char * search_character_name(int index) { + + if (index >= 0 && index < char_num) +- return char_dat[index].name; ++ return char_dat[index].status.name; + + return unknown_char_name; + } + ++static void * create_online_char_data(DBKey key, va_list args) { ++ struct online_char_data* character; ++ character = aCalloc(1, sizeof(struct online_char_data)); ++ character->account_id = key.i; ++ character->char_id = -1; ++ character->server = -1; ++ return character; ++} ++ ++static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, int data); ++ + //------------------------------------------------- +-// Function to create the character line (for save) ++// Set Character online/offline [Wizputer] + //------------------------------------------------- +-int mmo_char_tostr(char *str, struct mmo_charstatus *p) { ++ ++void set_char_online(int map_id, int char_id, int account_id) { ++ struct online_char_data* character; ++ ++ if ( char_id != 99 && (max_account_id < account_id || max_char_id < char_id)) ++ { //Notify map-server of the new max IDs [Skotlex] ++ if (account_id > max_account_id) ++ max_account_id = account_id; ++ if (char_id > max_char_id) ++ max_char_id = char_id; ++ mapif_send_maxid(max_account_id, max_char_id); ++ } ++ character = idb_ensure(online_char_db, account_id, create_online_char_data); ++ if (online_check && character->char_id != -1 && character->server > -1 && character->server != map_id) ++ { ++ ShowNotice("set_char_online: Character %d:%d marked in map server %d, but map server %d claims to have (%d:%d) online!\n", ++ character->account_id, character->char_id, character->server, map_id, account_id, char_id); ++ mapif_disconnectplayer(server_fd[character->server], character->account_id, character->char_id, 2); ++ } ++ character->waiting_disconnect = 0; ++ character->char_id = (char_id==99)?-1:char_id; ++ character->server = (char_id==99)?-1:map_id; ++ ++ if (login_fd <= 0 || session[login_fd]->eof) ++ return; ++ WFIFOHEAD(login_fd, 6); ++ WFIFOW(login_fd,0) = 0x272b; ++ WFIFOL(login_fd,2) = account_id; ++ WFIFOSET(login_fd,6); ++ ++ //printf ("set online\n"); ++} ++void set_char_offline(int char_id, int account_id) { ++ struct online_char_data* character; ++ ++ if ((character = idb_get(online_char_db, account_id)) != NULL) ++ { //We don't free yet to avoid aCalloc/aFree spamming during char change. [Skotlex] ++ character->char_id = -1; ++ character->server = -1; ++ character->waiting_disconnect = 0; ++ } ++ if (login_fd <= 0 || session[login_fd]->eof) ++ return; ++ WFIFOHEAD(login_fd, 6); ++ WFIFOW(login_fd,0) = 0x272c; ++ WFIFOL(login_fd,2) = account_id; ++ WFIFOSET(login_fd,6); ++ ++} ++ ++static int char_db_setoffline(DBKey key, void* data, va_list ap) { ++ struct online_char_data* character = (struct online_char_data*)data; ++ int server = va_arg(ap, int); ++ if (server == -1) { ++ character->char_id = -1; ++ character->server = -1; ++ character->waiting_disconnect = 0; ++ } else if (character->server == server) ++ character->server = -2; //In some map server that we aren't connected to. ++ return 0; ++} ++ ++void set_all_offline(void) { ++ online_char_db->foreach(online_char_db,char_db_setoffline,-1); ++ if (login_fd <= 0 || session[login_fd]->eof) ++ return; ++ WFIFOHEAD(login_fd, 6); ++ WFIFOW(login_fd,0) = 0x272c; ++ WFIFOL(login_fd,2) = 99; ++ WFIFOSET(login_fd,6); ++ ++ //printf ("set all offline\n"); ++} ++ ++/*--------------------------------------------------- ++ Make a data line for friends list ++ --------------------------------------------------*/ ++ ++int mmo_friends_list_data_str(char *str, struct mmo_charstatus *p) { + int i; + char *str_p = str; ++ str_p += sprintf(str_p, "%d", p->char_id); ++ ++ for (i=0;ifriends[i].account_id > 0 && p->friends[i].char_id > 0 && p->friends[i].name[0]) ++ str_p += sprintf(str_p, ",%d,%d,%s", p->friends[i].account_id, p->friends[i].char_id, p->friends[i].name); ++ else ++ str_p += sprintf(str_p,",,,"); ++ } ++ ++ str_p += '\0'; ++ ++ return 0; ++} ++ ++//------------------------------------------------- ++// Function to create the character line (for save) ++//------------------------------------------------- ++int mmo_char_tostr(char *str, struct mmo_charstatus *p, struct global_reg *reg, int reg_num) { ++ int i,j; ++ char *str_p = str; + ++ /* We shouldn't need this anymore... [Skotlex] + // on multi-map server, sometimes it's posssible that last_point become void. (reason???) We check that to not lost character at restart. +- if (p->last_point.map[0] == '\0') { +- memcpy(p->last_point.map, "prontera.gat", 16); ++ if (!p->last_point.map) { ++ p->last_point.map = mapindex_name2id(MAP_PRONTERA); + p->last_point.x = 273; + p->last_point.y = 354; + } +- +- str_p += sprintf(str_p, "%d\t%d,%d\t%s\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" ++ */ ++ str_p += sprintf(str_p, "%d\t%d,%d\t%s\t%d,%d,%d\t%u,%u,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" + "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" +- "\t%s,%d,%d\t%s,%d,%d,%d\t", ++ "\t%s,%d,%d\t%s,%d,%d,%d,%d,%d,%d,%d\t", + p->char_id, p->account_id, p->char_num, p->name, // +- p->class, p->base_level, p->job_level, ++ p->class_, p->base_level, p->job_level, + p->base_exp, p->job_exp, p->zeny, + p->hp, p->max_hp, p->sp, p->max_sp, + p->str, p->agi, p->vit, p->int_, p->dex, p->luk, +@@ -238,32 +386,34 @@ + p->party_id, p->guild_id, p->pet_id, + p->hair, p->hair_color, p->clothes_color, + p->weapon, p->shield, p->head_top, p->head_mid, p->head_bottom, +- p->last_point.map, p->last_point.x, p->last_point.y, // +- p->save_point.map, p->save_point.x, p->save_point.y, +- p->partner_id); ++ mapindex_id2name(p->last_point.map), p->last_point.x, p->last_point.y, // ++ mapindex_id2name(p->save_point.map), p->save_point.x, p->save_point.y, ++ p->partner_id,p->father,p->mother,p->child,p->fame); + for(i = 0; i < 10; i++) +- if (p->memo_point[i].map[0]) { +- str_p += sprintf(str_p, "%s,%d,%d", p->memo_point[i].map, p->memo_point[i].x, p->memo_point[i].y); ++ if (p->memo_point[i].map) { ++ str_p += sprintf(str_p, "%s,%d,%d", mapindex_id2name(p->memo_point[i].map), p->memo_point[i].x, p->memo_point[i].y); + } + *(str_p++) = '\t'; + + for(i = 0; i < MAX_INVENTORY; i++) + if (p->inventory[i].nameid) { +- str_p += sprintf(str_p, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ", ++ str_p += sprintf(str_p,"%d,%d,%d,%d,%d,%d,%d", + p->inventory[i].id, p->inventory[i].nameid, p->inventory[i].amount, p->inventory[i].equip, +- p->inventory[i].identify, p->inventory[i].refine, p->inventory[i].attribute, +- p->inventory[i].card[0], p->inventory[i].card[1], p->inventory[i].card[2], p->inventory[i].card[3], +- p->inventory[i].broken); ++ p->inventory[i].identify,p->inventory[i].refine,p->inventory[i].attribute); ++ for(j=0; jinventory[i].card[j]); ++ str_p += sprintf(str_p," "); + } + *(str_p++) = '\t'; + + for(i = 0; i < MAX_CART; i++) + if (p->cart[i].nameid) { +- str_p += sprintf(str_p, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ", ++ str_p += sprintf(str_p,"%d,%d,%d,%d,%d,%d,%d", + p->cart[i].id, p->cart[i].nameid, p->cart[i].amount, p->cart[i].equip, +- p->cart[i].identify, p->cart[i].refine, p->cart[i].attribute, +- p->cart[i].card[0], p->cart[i].card[1], p->cart[i].card[2], p->cart[i].card[3], +- p->cart[i].broken); ++ p->cart[i].identify,p->cart[i].refine,p->cart[i].attribute); ++ for(j=0; jcart[i].card[j]); ++ str_p += sprintf(str_p," "); + } + *(str_p++) = '\t'; + +@@ -273,9 +423,9 @@ + } + *(str_p++) = '\t'; + +- for(i = 0; i < p->global_reg_num; i++) +- if (p->global_reg[i].str[0]) +- str_p += sprintf(str_p, "%s,%d ", p->global_reg[i].str, p->global_reg[i].value); ++ for(i = 0; i < reg_num; i++) ++ if (reg[i].str[0]) ++ str_p += sprintf(str_p, "%s,%s ", reg[i].str, reg[i].value); + *(str_p++) = '\t'; + + *str_p = '\0'; +@@ -285,20 +435,62 @@ + //------------------------------------------------------------------------- + // Function to set the character from the line (at read of characters file) + //------------------------------------------------------------------------- +-int mmo_char_fromstr(char *str, struct mmo_charstatus *p) { ++int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct global_reg *reg, int *reg_num) { ++ char tmp_str[3][128]; //To avoid deleting chars with too long names. + int tmp_int[256]; +- int set, next, len, i; ++ unsigned int tmp_uint[2]; //To read exp.... ++ int set, next, len, i, j; + + // initilialise character + memset(p, '\0', sizeof(struct mmo_charstatus)); + +- // If it's not char structure of version 1008 and after +- if ((set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" ++ // If it's not char structure of version 1488 and after ++ if ((set = sscanf(str, "%d\t%d,%d\t%127[^\t]\t%d,%d,%d\t%u,%u,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" ++ "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" ++ "\t%127[^,],%d,%d\t%127[^,],%d,%d,%d,%d,%d,%d,%d%n", ++ &tmp_int[0], &tmp_int[1], &tmp_int[2], tmp_str[0], ++ &tmp_int[3], &tmp_int[4], &tmp_int[5], ++ &tmp_uint[0], &tmp_uint[1], &tmp_int[8], ++ &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], ++ &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], ++ &tmp_int[19], &tmp_int[20], ++ &tmp_int[21], &tmp_int[22], &tmp_int[23], // ++ &tmp_int[24], &tmp_int[25], &tmp_int[26], ++ &tmp_int[27], &tmp_int[28], &tmp_int[29], ++ &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34], ++ tmp_str[1], &tmp_int[35], &tmp_int[36], ++ tmp_str[2], &tmp_int[37], &tmp_int[38], &tmp_int[39], ++ &tmp_int[40], &tmp_int[41], &tmp_int[42], &tmp_int[43], &next)) != 47) ++ { ++ tmp_int[43] = 0; ++ // If it's not char structure of version 1363 and after ++ if ((set = sscanf(str, "%d\t%d,%d\t%127[^\t]\t%d,%d,%d\t%u,%u,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" ++ "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" ++ "\t%127[^,],%d,%d\t%127[^,],%d,%d,%d,%d,%d,%d%n", ++ &tmp_int[0], &tmp_int[1], &tmp_int[2], tmp_str[0], // ++ &tmp_int[3], &tmp_int[4], &tmp_int[5], ++ &tmp_uint[0], &tmp_uint[1], &tmp_int[8], ++ &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], ++ &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], ++ &tmp_int[19], &tmp_int[20], ++ &tmp_int[21], &tmp_int[22], &tmp_int[23], // ++ &tmp_int[24], &tmp_int[25], &tmp_int[26], ++ &tmp_int[27], &tmp_int[28], &tmp_int[29], ++ &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34], ++ tmp_str[1], &tmp_int[35], &tmp_int[36], // ++ tmp_str[2], &tmp_int[37], &tmp_int[38], &tmp_int[39], ++ &tmp_int[40], &tmp_int[41], &tmp_int[42], &next)) != 46) ++ { ++ tmp_int[40] = 0; // father ++ tmp_int[41] = 0; // mother ++ tmp_int[42] = 0; // child ++ // If it's not char structure of version 1008 and before 1363 ++ if ((set = sscanf(str, "%d\t%d,%d\t%127[^\t]\t%d,%d,%d\t%u,%u,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" + "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" +- "\t%[^,],%d,%d\t%[^,],%d,%d,%d%n", +- &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, // ++ "\t%127[^,],%d,%d\t%127[^,],%d,%d,%d%n", ++ &tmp_int[0], &tmp_int[1], &tmp_int[2], tmp_str[0], // + &tmp_int[3], &tmp_int[4], &tmp_int[5], +- &tmp_int[6], &tmp_int[7], &tmp_int[8], ++ &tmp_uint[0], &tmp_uint[1], &tmp_int[8], + &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], + &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], + &tmp_int[19], &tmp_int[20], +@@ -306,16 +498,17 @@ + &tmp_int[24], &tmp_int[25], &tmp_int[26], + &tmp_int[27], &tmp_int[28], &tmp_int[29], + &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34], +- p->last_point.map, &tmp_int[35], &tmp_int[36], // +- p->save_point.map, &tmp_int[37], &tmp_int[38], &tmp_int[39], &next)) != 43) { ++ tmp_str[1], &tmp_int[35], &tmp_int[36], // ++ tmp_str[2], &tmp_int[37], &tmp_int[38], &tmp_int[39], &next)) != 43) ++ { + tmp_int[39] = 0; // partner id + // If not char structure from version 384 to 1007 +- if ((set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" ++ if ((set = sscanf(str, "%d\t%d,%d\t%127[^\t]\t%d,%d,%d\t%u,%u,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" + "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" +- "\t%[^,],%d,%d\t%[^,],%d,%d%n", +- &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, // ++ "\t%127[^,],%d,%d\t%127[^,],%d,%d%n", ++ &tmp_int[0], &tmp_int[1], &tmp_int[2], tmp_str[0], // + &tmp_int[3], &tmp_int[4], &tmp_int[5], +- &tmp_int[6], &tmp_int[7], &tmp_int[8], ++ &tmp_uint[0], &tmp_uint[1], &tmp_int[8], + &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], + &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], + &tmp_int[19], &tmp_int[20], +@@ -323,16 +516,17 @@ + &tmp_int[24], &tmp_int[25], &tmp_int[26], + &tmp_int[27], &tmp_int[28], &tmp_int[29], + &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34], +- p->last_point.map, &tmp_int[35], &tmp_int[36], // +- p->save_point.map, &tmp_int[37], &tmp_int[38], &next)) != 42) { ++ tmp_str[1], &tmp_int[35], &tmp_int[36], // ++ tmp_str[2], &tmp_int[37], &tmp_int[38], &next)) != 42) ++ { + // It's char structure of a version before 384 + tmp_int[26] = 0; // pet id +- set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" ++ set = sscanf(str, "%d\t%d,%d\t%127[^\t]\t%d,%d,%d\t%u,%u,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d" + "\t%d,%d,%d\t%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d" +- "\t%[^,],%d,%d\t%[^,],%d,%d%n", +- &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, // ++ "\t%127[^,],%d,%d\t%127[^,],%d,%d%n", ++ &tmp_int[0], &tmp_int[1], &tmp_int[2], tmp_str[0], // + &tmp_int[3], &tmp_int[4], &tmp_int[5], +- &tmp_int[6], &tmp_int[7], &tmp_int[8], ++ &tmp_uint[0], &tmp_uint[1], &tmp_int[8], + &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], + &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], + &tmp_int[19], &tmp_int[20], +@@ -340,8 +534,8 @@ + &tmp_int[24], &tmp_int[25], // + &tmp_int[27], &tmp_int[28], &tmp_int[29], + &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34], +- p->last_point.map, &tmp_int[35], &tmp_int[36], // +- p->save_point.map, &tmp_int[37], &tmp_int[38], &next); ++ tmp_str[1], &tmp_int[35], &tmp_int[36], // ++ tmp_str[2], &tmp_int[37], &tmp_int[38], &next); + set += 2; + //printf("char: old char data ver.1\n"); + // Char structure of version 1007 or older +@@ -351,19 +545,30 @@ + } + // Char structure of version 1008+ + } else { ++ set += 3; + //printf("char: new char data ver.3\n"); + } +- if (set != 43) ++ // Char structture of version 1363+ ++ } else { ++ set++; ++ //printf("char: new char data ver.4\n"); ++ } ++ // Char structure of version 1488+ ++ } else { ++ //printf("char: new char data ver.5\n"); ++ } ++ if (set != 47) + return 0; + ++ memcpy(p->name, tmp_str[0], NAME_LENGTH-1); //Overflow protection [Skotlex] + p->char_id = tmp_int[0]; + p->account_id = tmp_int[1]; + p->char_num = tmp_int[2]; +- p->class = tmp_int[3]; ++ p->class_ = tmp_int[3]; + p->base_level = tmp_int[4]; + p->job_level = tmp_int[5]; +- p->base_exp = tmp_int[6]; +- p->job_exp = tmp_int[7]; ++ p->base_exp = tmp_uint[0]; ++ p->job_exp = tmp_uint[1]; + p->zeny = tmp_int[8]; + p->hp = tmp_int[9]; + p->max_hp = tmp_int[10]; +@@ -391,31 +596,37 @@ + p->head_top = tmp_int[32]; + p->head_mid = tmp_int[33]; + p->head_bottom = tmp_int[34]; ++ p->last_point.map = mapindex_name2id(tmp_str[1]); + p->last_point.x = tmp_int[35]; + p->last_point.y = tmp_int[36]; ++ p->save_point.map = mapindex_name2id(tmp_str[2]); + p->save_point.x = tmp_int[37]; + p->save_point.y = tmp_int[38]; + p->partner_id = tmp_int[39]; ++ p->father = tmp_int[40]; ++ p->mother = tmp_int[41]; ++ p->child = tmp_int[42]; ++ p->fame = tmp_int[43]; + + // Some checks + for(i = 0; i < char_num; i++) { +- if (char_dat[i].char_id == p->char_id) { +- printf("\033[1;31mmmo_auth_init: ******Error: a character has an identical id to another.\n"); +- printf(" character id #%d -> new character not readed.\n", p->char_id); +- printf(" Character saved in log file.\033[0m\n"); ++ if (char_dat[i].status.char_id == p->char_id) { ++ ShowError(CL_RED"mmmo_auth_init: a character has an identical id to another.\n"); ++ ShowError(" character id #%d -> new character not readed.\n", p->char_id); ++ ShowError(" Character saved in log file."CL_RESET"\n"); + return -1; +- } else if (strcmp(char_dat[i].name, p->name) == 0) { +- printf("\033[1;31mmmo_auth_init: ******Error: character name already exists.\n"); +- printf(" character name '%s' -> new character not readed.\n", p->name); +- printf(" Character saved in log file.\033[0m\n"); ++ } else if (strcmp(char_dat[i].status.name, p->name) == 0) { ++ ShowError(CL_RED"mmmo_auth_init: a character name already exists.\n"); ++ ShowError(" character name '%s' -> new character not read.\n", p->name); ++ ShowError(" Character saved in log file."CL_RESET"\n"); + return -2; + } + } + + if (strcmpi(wisp_server_name, p->name) == 0) { +- printf("mmo_auth_init: ******WARNING: character name has wisp server name.\n"); +- printf(" Character name '%s' = wisp server name '%s'.\n", p->name, wisp_server_name); +- printf(" Character readed. Suggestion: change the wisp server name.\n"); ++ ShowWarning("mmo_auth_init: ******WARNING: character name has wisp server name.\n"); ++ ShowWarning(" Character name '%s' = wisp server name '%s'.\n", p->name, wisp_server_name); ++ ShowWarning(" Character readed. Suggestion: change the wisp server name.\n"); + char_log("mmo_auth_init: ******WARNING: character name has wisp server name: Character name '%s' = wisp server name '%s'." RETCODE, + p->name, wisp_server_name); + } +@@ -426,8 +637,9 @@ + next++; + + for(i = 0; str[next] && str[next] != '\t'; i++) { +- if (sscanf(str+next, "%[^,],%d,%d%n", p->memo_point[i].map, &tmp_int[0], &tmp_int[1], &len) != 3) ++ if (sscanf(str+next, "%[^,],%d,%d%n", tmp_str[0], &tmp_int[0], &tmp_int[1], &len) != 3) + return -3; ++ p->memo_point[i].map = mapindex_name2id(tmp_str[0]); + p->memo_point[i].x = tmp_int[0]; + p->memo_point[i].y = tmp_int[1]; + next += len; +@@ -438,18 +650,10 @@ + next++; + + for(i = 0; str[next] && str[next] != '\t'; i++) { +- if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", ++ if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d%[0-9,-]%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], +- &tmp_int[4], &tmp_int[5], &tmp_int[6], +- &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &len) == 12) { +- // do nothing, it's ok +- } else if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", +- &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], +- &tmp_int[4], &tmp_int[5], &tmp_int[6], +- &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) { +- tmp_int[11] = 0; // broken doesn't exist in this version -> 0 +- } else // invalid structure +- return -4; ++ &tmp_int[4], &tmp_int[5], &tmp_int[6], tmp_str[0], &len) == 8) ++ { + p->inventory[i].id = tmp_int[0]; + p->inventory[i].nameid = tmp_int[1]; + p->inventory[i].amount = tmp_int[2]; +@@ -457,31 +661,23 @@ + p->inventory[i].identify = tmp_int[4]; + p->inventory[i].refine = tmp_int[5]; + p->inventory[i].attribute = tmp_int[6]; +- p->inventory[i].card[0] = tmp_int[7]; +- p->inventory[i].card[1] = tmp_int[8]; +- p->inventory[i].card[2] = tmp_int[9]; +- p->inventory[i].card[3] = tmp_int[10]; +- p->inventory[i].broken = tmp_int[11]; ++ ++ for(j = 0; j < MAX_SLOTS && tmp_str[0] && sscanf(tmp_str[0], ",%d%[0-9,-]",&tmp_int[0], tmp_str[0]) > 0; j++) ++ p->inventory[i].card[j] = tmp_int[0]; ++ + next += len; + if (str[next] == ' ') + next++; ++ } else // invalid structure ++ return -4; + } +- + next++; + + for(i = 0; str[next] && str[next] != '\t'; i++) { +- if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", +- &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], +- &tmp_int[4], &tmp_int[5], &tmp_int[6], +- &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &len) == 12) { +- // do nothing, it's ok +- } else if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", ++ if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d%[0-9,-]%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], +- &tmp_int[4], &tmp_int[5], &tmp_int[6], +- &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) { +- tmp_int[11] = 0; // broken doesn't exist in this version -> 0 +- } else // invalid structure +- return -5; ++ &tmp_int[4], &tmp_int[5], &tmp_int[6], tmp_str[0], &len) == 8) ++ { + p->cart[i].id = tmp_int[0]; + p->cart[i].nameid = tmp_int[1]; + p->cart[i].amount = tmp_int[2]; +@@ -489,14 +685,15 @@ + p->cart[i].identify = tmp_int[4]; + p->cart[i].refine = tmp_int[5]; + p->cart[i].attribute = tmp_int[6]; +- p->cart[i].card[0] = tmp_int[7]; +- p->cart[i].card[1] = tmp_int[8]; +- p->cart[i].card[2] = tmp_int[9]; +- p->cart[i].card[3] = tmp_int[10]; +- p->cart[i].broken = tmp_int[11]; ++ ++ for(j = 0; j < MAX_SLOTS && tmp_str && sscanf(tmp_str[0], ",%d%[0-9,-]",&tmp_int[0], tmp_str[0]) > 0; j++) ++ p->cart[i].card[j] = tmp_int[0]; ++ + next += len; + if (str[next] == ' ') + next++; ++ } else // invalid structure ++ return -5; + } + + next++; +@@ -514,11 +711,11 @@ + next++; + + for(i = 0; str[next] && str[next] != '\t' && str[next] != '\n' && str[next] != '\r'; i++) { // global_reg実装以前のathena.txt互換のため一応'\n'チェック +- if (sscanf(str + next, "%[^,],%d%n", p->global_reg[i].str, &p->global_reg[i].value, &len) != 2) { ++ if (sscanf(str + next, "%[^,],%[^ ] %n", reg[i].str, reg[i].value, &len) != 2) { + // because some scripts are not correct, the str can be "". So, we must check that. + // If it's, we must not refuse the character, but just this REG value. + // Character line will have something like: nov_2nd_cos,9 ,9 nov_1_2_cos_c,1 (here, ,9 is not good) +- if (str[next] == ',' && sscanf(str + next, ",%d%n", &p->global_reg[i].value, &len) == 1) ++ if (str[next] == ',' && sscanf(str + next, ",%[^ ] %n", reg[i].value, &len) == 1) + i--; + else + return -7; +@@ -527,39 +724,127 @@ + if (str[next] == ' ') + next++; + } +- p->global_reg_num = i; ++ *reg_num = i; + + return 1; + } ++//--------------------------------- ++// Function to read friend list ++//--------------------------------- ++ ++int parse_friend_txt(struct mmo_charstatus *p) ++{ ++ char line[1024], temp[1024]; ++ int pos = 0, count = 0, next; ++ int i,len; ++ FILE *fp; ++ ++ // Open the file and look for the ID ++ fp = fopen(friends_txt, "r"); ++ ++ if(fp == NULL) ++ return -1; ++ ++ while(fgets(line, sizeof(line)-1, fp)) { ++ ++ if(line[0] == '/' && line[1] == '/') ++ continue; ++ if (sscanf(line, "%d%n",&i, &pos) < 1 || i != p->char_id) ++ continue; //Not this line... ++ //Read friends ++ len = strlen(line); ++ next = pos; ++ for (count = 0; next < len && count < MAX_FRIENDS; count++) ++ { //Read friends. ++ if (sscanf(line+next, ",%d,%d,%23[^,]%n",&p->friends[count].account_id,&p->friends[count].char_id, p->friends[count].name, &pos) < 3) ++ { //Invalid friend? ++ memset(&p->friends[count], 0, sizeof(p->friends[count])); ++ break; ++ } ++ next+=pos; ++ //What IF the name contains a comma? while the next field is not a ++ //number, we assume it belongs to the current name. [Skotlex] ++ //NOTE: Of course, this will fail if someone sets their name to something like ++ //Bob,2005 but... meh, it's the problem of parsing a text file (encasing it in " ++ //won't do as quotes are also valid name chars!) ++ while(next < len && sscanf(line+next, ",%23[^,]%n", temp, &len) > 0) ++ { ++ if (atoi(temp)) ++ { //We read the next friend, just continue. ++ break; ++ } else { //Append the name. ++ next+=len; ++ if (strlen(p->friends[count].name) + strlen(temp) +1 < NAME_LENGTH) ++ { ++ strcat(p->friends[count].name, ","); ++ strcat(p->friends[count].name, temp); ++ } ++ } ++ } //End Guess Block ++ } //Friend's for. ++ break; //Finished reading. ++ } ++ /* ++ //Character names must not exceed the 23+\0 limit. [Skotlex] ++ sscanf(line, "%d,%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23[^,],%d,%23s",&cid, ++ &temp[0],p->friend_name[0], ++ &temp[1],p->friend_name[1], ++ &temp[2],p->friend_name[2], ++ &temp[3],p->friend_name[3], ++ &temp[4],p->friend_name[4], ++ &temp[5],p->friend_name[5], ++ &temp[6],p->friend_name[6], ++ &temp[7],p->friend_name[7], ++ &temp[8],p->friend_name[8], ++ &temp[9],p->friend_name[9], ++ &temp[10],p->friend_name[10], ++ &temp[11],p->friend_name[11], ++ &temp[12],p->friend_name[12], ++ &temp[13],p->friend_name[13], ++ &temp[14],p->friend_name[14], ++ &temp[15],p->friend_name[15], ++ &temp[16],p->friend_name[16], ++ &temp[17],p->friend_name[17], ++ &temp[18],p->friend_name[18], ++ &temp[19],p->friend_name[19]); ++ if (cid == p->char_id) ++ break; ++ } ++ // No register of friends list ++ if (cid == 0) { ++ fclose(fp); ++ return 0; ++ } ++ ++ // Fill in the list ++ ++ for (i=0; ifriend_id[i] = temp[i]; ++*/ ++ fclose(fp); ++ return count; ++} + + //--------------------------------- + // Function to read characters file + //--------------------------------- + int mmo_char_init(void) { + char line[65536]; +- int i; + int ret, line_count; + FILE *fp; + + char_max = 256; +- char_dat = calloc(sizeof(struct mmo_charstatus) * 256, 1); ++ char_dat = (struct character_data*)aCalloc(sizeof(struct character_data) * 256, 1); + if (!char_dat) { +- printf("out of memory: mmo_char_init (calloc of char_dat).\n"); +- exit(1); +- } +- online_chars = calloc(sizeof(int) * 256, 1); +- if (!online_chars) { +- printf("out of memory: mmo_char_init (calloc of online_chars).\n"); ++ ShowFatalError("out of memory: mmo_char_init (calloc of char_dat).\n"); + exit(1); + } +- for(i = 0; i < char_max; i++) +- online_chars[i] = -1; +- + char_num = 0; + + fp = fopen(char_txt, "r"); ++ + if (fp == NULL) { +- printf("Characters file not found: %s.\n", char_txt); ++ ShowError("Characters file not found: %s.\n", char_txt); + char_log("Characters file not found: %s." RETCODE, char_txt); + char_log("Id for the next created character: %d." RETCODE, char_id_count); + return 0; +@@ -583,30 +868,26 @@ + + if (char_num >= char_max) { + char_max += 256; +- char_dat = realloc(char_dat, sizeof(struct mmo_charstatus) * char_max); ++ char_dat = (struct character_data*)aRealloc(char_dat, sizeof(struct character_data) * char_max); + if (!char_dat) { +- printf("Out of memory: mmo_char_init (realloc of char_dat).\n"); ++ ShowFatalError("Out of memory: mmo_char_init (realloc of char_dat).\n"); + char_log("Out of memory: mmo_char_init (realloc of char_dat)." RETCODE); + exit(1); + } +- online_chars = realloc(online_chars, sizeof(int) * char_max); +- if (!online_chars) { +- printf("Out of memory: mmo_char_init (realloc of online_chars).\n"); +- char_log("Out of memory: mmo_char_init (realloc of online_chars)." RETCODE); +- exit(1); +- } +- for(i = char_max - 256; i < char_max; i++) +- online_chars[i] = -1; + } + +- ret = mmo_char_fromstr(line, &char_dat[char_num]); ++ ret = mmo_char_fromstr(line, &char_dat[char_num].status, char_dat[char_num].global, &char_dat[char_num].global_num); ++ ++ // Initialize friends list ++ parse_friend_txt(&char_dat[char_num].status); // Grab friends for the character ++ + if (ret > 0) { // negative value or zero for errors +- if (char_dat[char_num].char_id >= char_id_count) +- char_id_count = char_dat[char_num].char_id + 1; ++ if (char_dat[char_num].status.char_id >= char_id_count) ++ char_id_count = char_dat[char_num].status.char_id + 1; + char_num++; + } else { +- printf("mmo_char_init: in characters file, unable to read the line #%d.\n", line_count); +- printf(" -> Character saved in log file.\n"); ++ ShowError("mmo_char_init: in characters file, unable to read the line #%d.\n", line_count); ++ ShowError(" -> Character saved in log file.\n"); + switch (ret) { + case -1: + char_log("Duplicate character id in the next character line (character not readed):" RETCODE); +@@ -639,13 +920,13 @@ + fclose(fp); + + if (char_num == 0) { +- printf("mmo_char_init: No character found in %s.\n", char_txt); ++ ShowNotice("mmo_char_init: No character found in %s.\n", char_txt); + char_log("mmo_char_init: No character found in %s." RETCODE, char_txt); + } else if (char_num == 1) { +- printf("mmo_char_init: 1 character read in %s.\n", char_txt); ++ ShowStatus("mmo_char_init: 1 character read in %s.\n", char_txt); + char_log("mmo_char_init: 1 character read in %s." RETCODE, char_txt); + } else { +- printf("mmo_char_init: %d characters read in %s.\n", char_num, char_txt); ++ ShowStatus("mmo_char_init: %d characters read in %s.\n", char_num, char_txt); + char_log("mmo_char_init: %d characters read in %s." RETCODE, char_num, char_txt); + } + +@@ -658,20 +939,21 @@ + // Function to save characters in files (speed up by [Yor]) + //--------------------------------------------------------- + void mmo_char_sync(void) { +- char line[65536]; ++ char line[65536],f_line[1024]; + int i, j, k; + int lock; +- FILE *fp; +- int id[char_num]; ++ FILE *fp,*f_fp; ++ //int *id = (int *) aMalloc(sizeof(int) * char_num); ++ CREATE_BUFFER(id, int, char_num); + + // Sorting before save (by [Yor]) + for(i = 0; i < char_num; i++) { + id[i] = i; + for(j = 0; j < i; j++) { +- if ((char_dat[i].account_id < char_dat[id[j]].account_id) || ++ if ((char_dat[i].status.account_id < char_dat[id[j]].status.account_id) || + // if same account id, we sort by slot. +- (char_dat[i].account_id == char_dat[id[j]].account_id && +- char_dat[i].char_num < char_dat[id[j]].char_num)) { ++ (char_dat[i].status.account_id == char_dat[id[j]].status.account_id && ++ char_dat[i].status.char_num < char_dat[id[j]].status.char_num)) { + for(k = i; k > j; k--) + id[k] = id[k-1]; + id[j] = i; // id[i] +@@ -683,12 +965,12 @@ + // Data save + fp = lock_fopen(char_txt, &lock); + if (fp == NULL) { +- printf("WARNING: Server can't not save characters.\n"); ++ ShowWarning("Server can't not save characters.\n"); + char_log("WARNING: Server can't not save characters." RETCODE); + } else { + for(i = 0; i < char_num; i++) { + // create only once the line, and save it in the 2 files (it's speeder than repeat twice the loop and create twice the line) +- mmo_char_tostr(line, &char_dat[id[i]]); // use of sorted index ++ mmo_char_tostr(line, &char_dat[id[i]].status, char_dat[id[i]].global, char_dat[id[i]].global_num); // use of sorted index + fprintf(fp, "%s" RETCODE, line); + } + fprintf(fp, "%d\t%%newid%%" RETCODE, char_id_count); +@@ -699,19 +981,33 @@ + if (backup_txt_flag) { // The backup_txt file was created because char deletion bug existed. Now it's finish and that take a lot of time to create a second file when there are a lot of characters. => option By [Yor] + fp = lock_fopen(backup_txt, &lock); + if (fp == NULL) { +- printf("WARNING: Server can't not create backup of characters file.\n"); ++ ShowWarning("Server can't not create backup of characters file.\n"); + char_log("WARNING: Server can't not create backup of characters file." RETCODE); ++ //aFree(id); // free up the memory before leaving -.- [Ajarn] ++ DELETE_BUFFER(id); + return; + } + for(i = 0; i < char_num; i++) { + // create only once the line, and save it in the 2 files (it's speeder than repeat twice the loop and create twice the line) +- mmo_char_tostr(line, &char_dat[id[i]]); // use of sorted index ++ mmo_char_tostr(line, &char_dat[id[i]].status,char_dat[id[i]].global, char_dat[id[i]].global_num); // use of sorted index + fprintf(fp, "%s" RETCODE, line); + } + fprintf(fp, "%d\t%%newid%%" RETCODE, char_id_count); + lock_fclose(fp, backup_txt, &lock); + } + ++ // Friends List data save (davidsiaw) ++ f_fp = lock_fopen(friends_txt, &lock); ++ for(i = 0; i < char_num; i++) { ++ mmo_friends_list_data_str(f_line, &char_dat[id[i]].status); ++ fprintf(f_fp, "%s" RETCODE, f_line); ++ } ++ ++ lock_fclose(f_fp, friends_txt, &lock); ++ ++ //aFree(id); ++ DELETE_BUFFER(id); ++ + return; + } + +@@ -719,6 +1015,8 @@ + // Function to save (in a periodic way) datas in files + //---------------------------------------------------- + int mmo_char_sync_timer(int tid, unsigned int tick, int id, int data) { ++ if (save_log) ++ ShowInfo("Saving all files...\n"); + mmo_char_sync(); + inter_save(); + return 0; +@@ -728,21 +1026,33 @@ + // Function to create a new character + //----------------------------------- + int make_new_char(int fd, unsigned char *dat) { +- int i, j; ++ int i; + struct char_session_data *sd; ++ char name[NAME_LENGTH]; + +- sd = session[fd]->session_data; ++ sd = (struct char_session_data*)session[fd]->session_data; + + // remove control characters from the name +- dat[23] = '\0'; +- if (remove_control_chars(dat)) { ++ strncpy(name, dat, NAME_LENGTH); ++ name[NAME_LENGTH-1] = '\0'; //Trunc name to max possible value (23) ++ ++ trim(name,TRIM_CHARS); //Trim character name. [Skotlex] ++ ++ //check name != main chat nick [LuzZza] ++ if(strcmpi(name, main_chat_nick) == 0) { ++ char_log("Create char failed (%d): this nick (%s) reserved for mainchat messages." RETCODE, ++ sd->account_id, name); ++ return -1; ++ } ++ ++ if (remove_control_chars((unsigned char *)name)) { + char_log("Make new char error (control char received in the name): (connection #%d, account: %d)." RETCODE, + fd, sd->account_id); + return -1; + } + + // check lenght of character name +- if (strlen(dat) < 4) { ++ if (strlen(name) < 4) { + char_log("Make new char error (character name too small): (connection #%d, account: %d, name: '%s')." RETCODE, + fd, sd->account_id, dat); + return -1; +@@ -750,15 +1060,15 @@ + + // Check Authorised letters/symbols in the name of the character + if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised +- for (i = 0; dat[i]; i++) +- if (strchr(char_name_letters, dat[i]) == NULL) { ++ for (i = 0; i < NAME_LENGTH && name[i]; i++) ++ if (strchr(char_name_letters, name[i]) == NULL) { + char_log("Make new char error (invalid letter in the name): (connection #%d, account: %d), name: %s, invalid letter: %c." RETCODE, +- fd, sd->account_id, dat, dat[i]); ++ fd, sd->account_id, name, name[i]); + return -1; + } + } else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden +- for (i = 0; dat[i]; i++) +- if (strchr(char_name_letters, dat[i]) != NULL) { ++ for (i = 0; i < NAME_LENGTH && name[i]; i++) ++ if (strchr(char_name_letters, name[i]) != NULL) { + char_log("Make new char error (invalid letter in the name): (connection #%d, account: %d), name: %s, invalid letter: %c." RETCODE, + fd, sd->account_id, dat, dat[i]); + return -1; +@@ -767,8 +1077,8 @@ + + if (dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29] != 5*6 || // stats + dat[30] >= 9 || // slots (dat[30] can not be negativ) +- dat[33] <= 0 || dat[33] >= 20 || // hair style +- dat[31] >= 12) { // hair color (dat[31] can not be negativ) ++ dat[33] <= 0 || dat[33] >= 24 || // hair style ++ dat[31] >= 9) { // hair color (dat[31] can not be negativ) + char_log("Make new char error (invalid values): (connection #%d, account: %d) slot %d, name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d" RETCODE, + fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; +@@ -781,98 +1091,96 @@ + fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; + } ++ } // now we know that every stat has proper value but we have to check if str/int agi/luk vit/dex pairs are correct ++ ++ if( ((dat[24]+dat[27]) > 10) || ((dat[25]+dat[29]) > 10) || ((dat[26]+dat[28]) > 10) ) { ++ if (log_char) { ++ char_log("Make new char error (invalid stat value): (connection #%d, account: %d) slot %d, name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d" RETCODE, ++ fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); ++ return -1; + } ++ } // now when we have passed all stat checks + + for(i = 0; i < char_num; i++) { +- if ((name_ignoring_case != 0 && strcmp(char_dat[i].name, dat) == 0) || +- (name_ignoring_case == 0 && strcmpi(char_dat[i].name, dat) == 0)) { ++ if ((name_ignoring_case != 0 && strncmp(char_dat[i].status.name, name, NAME_LENGTH) == 0) || ++ (name_ignoring_case == 0 && strncmpi(char_dat[i].status.name, name, NAME_LENGTH) == 0)) { + char_log("Make new char error (name already exists): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %d), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE, +- fd, sd->account_id, dat[30], dat, char_dat[i].name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); ++ fd, sd->account_id, dat[30], dat, char_dat[i].status.name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; + } +- if (char_dat[i].account_id == sd->account_id && char_dat[i].char_num == dat[30]) { ++ if (char_dat[i].status.account_id == sd->account_id && char_dat[i].status.char_num == dat[30]) { + char_log("Make new char error (slot already used): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %d), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE, +- fd, sd->account_id, dat[30], dat, char_dat[i].name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); ++ fd, sd->account_id, dat[30], dat, char_dat[i].status.name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; + } + } + +- if (strcmp(wisp_server_name, dat) == 0) { ++ if (strcmp(wisp_server_name, name) == 0) { + char_log("Make new char error (name used is wisp name for server): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %d), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE, +- fd, sd->account_id, dat[30], dat, char_dat[i].name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); ++ fd, sd->account_id, dat[30], name, char_dat[i].status.name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + return -1; + } + + if (char_num >= char_max) { + char_max += 256; +- char_dat = realloc(char_dat, sizeof(struct mmo_charstatus) * char_max); ++ char_dat = (struct character_data*)aRealloc(char_dat, sizeof(struct character_data) * char_max); + if (!char_dat) { +- printf("Out of memory: make_new_char (realloc of char_dat).\n"); ++ ShowFatalError("Out of memory: make_new_char (realloc of char_dat).\n"); + char_log("Out of memory: make_new_char (realloc of char_dat)." RETCODE); + exit(1); + } +- online_chars = realloc(online_chars, sizeof(int) * char_max); +- if (!online_chars) { +- printf("Out of memory: make_new_char (realloc of online_chars).\n"); +- char_log("Out of memory: make_new_char (realloc of online_chars)." RETCODE); +- exit(1); +- } +- for(j = char_max - 256; j < char_max; j++) +- online_chars[j] = -1; + } + + char_log("Creation of New Character: (connection #%d, account: %d) slot %d, character Name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE, +- fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); ++ fd, sd->account_id, dat[30], name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]); + +- memset(&char_dat[i], 0, sizeof(struct mmo_charstatus)); ++ memset(&char_dat[i], 0, sizeof(struct character_data)); + +- char_dat[i].char_id = char_id_count++; +- char_dat[i].account_id = sd->account_id; +- char_dat[i].char_num = dat[30]; +- strcpy(char_dat[i].name, dat); +- char_dat[i].class = 0; +- char_dat[i].base_level = 1; +- char_dat[i].job_level = 1; +- char_dat[i].base_exp = 0; +- char_dat[i].job_exp = 0; +- char_dat[i].zeny = start_zeny; +- char_dat[i].str = dat[24]; +- char_dat[i].agi = dat[25]; +- char_dat[i].vit = dat[26]; +- char_dat[i].int_ = dat[27]; +- char_dat[i].dex = dat[28]; +- char_dat[i].luk = dat[29]; +- char_dat[i].max_hp = 40 * (100 + char_dat[i].vit) / 100; +- char_dat[i].max_sp = 11 * (100 + char_dat[i].int_) / 100; +- char_dat[i].hp = char_dat[i].max_hp; +- char_dat[i].sp = char_dat[i].max_sp; +- char_dat[i].status_point = 0; +- char_dat[i].skill_point = 0; +- char_dat[i].option = 0; +- char_dat[i].karma = 0; +- char_dat[i].manner = 0; +- char_dat[i].party_id = 0; +- char_dat[i].guild_id = 0; +- char_dat[i].hair = dat[33]; +- char_dat[i].hair_color = dat[31]; +- char_dat[i].clothes_color = 0; +- char_dat[i].inventory[0].nameid = start_weapon; // Knife +- char_dat[i].inventory[0].amount = 1; +- char_dat[i].inventory[0].equip = 0x02; +- char_dat[i].inventory[0].identify = 1; +- char_dat[i].inventory[0].broken = 0; +- char_dat[i].inventory[1].nameid = start_armor; // Cotton Shirt +- char_dat[i].inventory[1].amount = 1; +- char_dat[i].inventory[1].equip = 0x10; +- char_dat[i].inventory[1].identify = 1; +- char_dat[i].inventory[1].broken = 0; +- char_dat[i].weapon = 1; +- char_dat[i].shield = 0; +- char_dat[i].head_top = 0; +- char_dat[i].head_mid = 0; +- char_dat[i].head_bottom = 0; +- memcpy(&char_dat[i].last_point, &start_point, sizeof(start_point)); +- memcpy(&char_dat[i].save_point, &start_point, sizeof(start_point)); ++ char_dat[i].status.char_id = char_id_count++; ++ char_dat[i].status.account_id = sd->account_id; ++ char_dat[i].status.char_num = dat[30]; ++ strcpy(char_dat[i].status.name,name); ++ char_dat[i].status.class_ = 0; ++ char_dat[i].status.base_level = 1; ++ char_dat[i].status.job_level = 1; ++ char_dat[i].status.base_exp = 0; ++ char_dat[i].status.job_exp = 0; ++ char_dat[i].status.zeny = start_zeny; ++ char_dat[i].status.str = dat[24]; ++ char_dat[i].status.agi = dat[25]; ++ char_dat[i].status.vit = dat[26]; ++ char_dat[i].status.int_ = dat[27]; ++ char_dat[i].status.dex = dat[28]; ++ char_dat[i].status.luk = dat[29]; ++ char_dat[i].status.max_hp = 40 * (100 + char_dat[i].status.vit) / 100; ++ char_dat[i].status.max_sp = 11 * (100 + char_dat[i].status.int_) / 100; ++ char_dat[i].status.hp = char_dat[i].status.max_hp; ++ char_dat[i].status.sp = char_dat[i].status.max_sp; ++ char_dat[i].status.status_point = 0; ++ char_dat[i].status.skill_point = 0; ++ char_dat[i].status.option = 0; ++ char_dat[i].status.karma = 0; ++ char_dat[i].status.manner = 0; ++ char_dat[i].status.party_id = 0; ++ char_dat[i].status.guild_id = 0; ++ char_dat[i].status.hair = dat[33]; ++ char_dat[i].status.hair_color = dat[31]; ++ char_dat[i].status.clothes_color = 0; ++ char_dat[i].status.inventory[0].nameid = start_weapon; // Knife ++ char_dat[i].status.inventory[0].amount = 1; ++ char_dat[i].status.inventory[0].equip = 0x02; ++ char_dat[i].status.inventory[0].identify = 1; ++ char_dat[i].status.inventory[1].nameid = start_armor; // Cotton Shirt ++ char_dat[i].status.inventory[1].amount = 1; ++ char_dat[i].status.inventory[1].equip = 0x10; ++ char_dat[i].status.inventory[1].identify = 1; ++ char_dat[i].status.weapon = 1; ++ char_dat[i].status.shield = 0; ++ char_dat[i].status.head_top = 0; ++ char_dat[i].status.head_mid = 0; ++ char_dat[i].status.head_bottom = 0; ++ memcpy(&char_dat[i].status.last_point, &start_point, sizeof(start_point)); ++ memcpy(&char_dat[i].status.save_point, &start_point, sizeof(start_point)); + char_num++; + + mmo_char_sync(); +@@ -882,8 +1190,8 @@ + //---------------------------------------------------- + // This function return the name of the job (by [Yor]) + //---------------------------------------------------- +-char * job_name(int class) { +- switch (class) { ++char * job_name(int class_) { ++ switch (class_) { + case 0: return "Novice"; + case 1: return "Swordsman"; + case 2: return "Mage"; +@@ -957,108 +1265,138 @@ + return "Unknown Job"; + } + +-//------------------------------------------------------------- +-// Function to create the online files (txt and html). by [Yor] +-//------------------------------------------------------------- +-void create_online_files(void) { +- int i, j, k, l; // for loops +- int players; // count the number of players +- FILE *fp; // for the txt file +- FILE *fp2; // for the html file +- char temp[256]; // to prepare what we must display +- time_t time_server; // for number of seconds +- struct tm *datetime; // variable for time in structure ->tm_mday, ->tm_sec, ... +- int id[char_num]; +- +- if (online_display_option == 0) // we display nothing, so return +- return; ++static int create_online_files_sub(DBKey key, void* data, va_list va) ++{ ++ struct online_char_data *character; ++ int* players; ++ int *id; ++ int j,k,l; ++ character = (struct online_char_data*) data; ++ players = va_arg(va, int*); ++ id = va_arg(va, int*); + +- //char_log("Creation of online players files." RETCODE); ++ // check if map-server is online ++ if (character->server == -1 || character->char_id == -1) { //Character not currently online. ++ return -1; ++ } + +- // Get number of online players, id of each online players +- players = 0; +- // sort online characters. +- for(i = 0; i < char_num; i++) { +- if (online_chars[i] != -1) { +- id[players] = i; ++ j = character->server; ++ if (server_fd[j] < 0) { ++ server[j].users = 0; ++ if (kick_on_disconnect) ++ { ++ character->char_id = -1; ++ character->server = -1; ++ } ++ return -1; ++ } ++ // search position of character in char_dat and sort online characters. ++ for(j = 0; j < char_num; j++) { ++ if (char_dat[j].status.char_id != character->char_id) ++ continue; ++ id[*players] = j; + // use sorting option + switch (online_sorting_option) { + case 1: // by name (without case sensitive) +- { +- char *p_name = char_dat[i].name; //speed up sorting when there are a lot of players. But very rarely players have same name. +- for(j = 0; j < players; j++) +- if (stricmp(p_name, char_dat[id[j]].name) < 0 || ++ for(k = 0; k < *players; k++) ++ if (stricmp(char_dat[j].status.name, char_dat[id[k]].status.name) < 0 || + // if same name, we sort with case sensitive. +- (stricmp(p_name, char_dat[id[j]].name) == 0 && +- strcmp(p_name, char_dat[id[j]].name) < 0)) { +- for(k = players; k > j; k--) +- id[k] = id[k-1]; +- id[j] = i; // id[players] ++ (stricmp(char_dat[j].status.name, char_dat[id[k]].status.name) == 0 && ++ strcmp(char_dat[j].status.name, char_dat[id[k]].status.name) < 0)) { ++ for(l = *players; l > k; l--) ++ id[l] = id[l-1]; ++ id[k] = j; // id[*players] + break; + } +- } + break; + case 2: // by zeny +- for(j = 0; j < players; j++) +- if (char_dat[i].zeny < char_dat[id[j]].zeny || ++ for(k = 0; k < *players; k++) ++ if (char_dat[j].status.zeny < char_dat[id[k]].status.zeny || + // if same number of zenys, we sort by name. +- (char_dat[i].zeny == char_dat[id[j]].zeny && +- stricmp(char_dat[i].name, char_dat[id[j]].name) < 0)) { +- for(k = players; k > j; k--) +- id[k] = id[k-1]; +- id[j] = i; // id[players] ++ (char_dat[j].status.zeny == char_dat[id[k]].status.zeny && ++ stricmp(char_dat[j].status.name, char_dat[id[k]].status.name) < 0)) { ++ for(l = *players; l > k; l--) ++ id[l] = id[l-1]; ++ id[k] = j; // id[*players] + break; + } + break; + case 3: // by base level +- for(j = 0; j < players; j++) +- if (char_dat[i].base_level < char_dat[id[j]].base_level || ++ for(k = 0; k < *players; k++) ++ if (char_dat[j].status.base_level < char_dat[id[k]].status.base_level || + // if same base level, we sort by base exp. +- (char_dat[i].base_level == char_dat[id[j]].base_level && +- char_dat[i].base_exp < char_dat[id[j]].base_exp)) { +- for(k = players; k > j; k--) +- id[k] = id[k-1]; +- id[j] = i; // id[players] ++ (char_dat[j].status.base_level == char_dat[id[k]].status.base_level && ++ char_dat[j].status.base_exp < char_dat[id[k]].status.base_exp)) { ++ for(l = *players; l > k; l--) ++ id[l] = id[l-1]; ++ id[k] = j; // id[*players] + break; + } + break; + case 4: // by job (and job level) +- for(j = 0; j < players; j++) +- if (char_dat[i].class < char_dat[id[j]].class || ++ for(k = 0; k < *players; k++) ++ if (char_dat[j].status.class_ < char_dat[id[k]].status.class_ || + // if same job, we sort by job level. +- (char_dat[i].class == char_dat[id[j]].class && +- char_dat[i].job_level < char_dat[id[j]].job_level) || ++ (char_dat[j].status.class_ == char_dat[id[k]].status.class_ && ++ char_dat[j].status.job_level < char_dat[id[k]].status.job_level) || + // if same job and job level, we sort by job exp. +- (char_dat[i].class == char_dat[id[j]].class && +- char_dat[i].job_level == char_dat[id[j]].job_level && +- char_dat[i].job_exp < char_dat[id[j]].job_exp)) { +- for(k = players; k > j; k--) +- id[k] = id[k-1]; +- id[j] = i; // id[players] ++ (char_dat[j].status.class_ == char_dat[id[k]].status.class_ && ++ char_dat[j].status.job_level == char_dat[id[k]].status.job_level && ++ char_dat[j].status.job_exp < char_dat[id[k]].status.job_exp)) { ++ for(l = *players; l > k; l--) ++ id[l] = id[l-1]; ++ id[k] = j; // id[*players] + break; + } + break; + case 5: // by location map name + { +- int cpm_result; // A lot of player maps are identical. So, test if done often twice. +- for(j = 0; j < players; j++) +- if ((cpm_result = strcmp(char_dat[i].last_point.map, char_dat[id[j]].last_point.map)) < 0 || // no map are identical and with upper cases (not use stricmp) ++ const char *map1, *map2; ++ map1 = mapindex_id2name(char_dat[j].status.last_point.map); ++ ++ for(k = 0; k < *players; k++) { ++ map2 = mapindex_id2name(char_dat[id[k]].status.last_point.map); ++ if (!map1 || !map2 || //Avoid sorting if either one failed to resolve. ++ stricmp(map1, map2) < 0 || + // if same map name, we sort by name. +- (cpm_result == 0 && +- stricmp(char_dat[i].name, char_dat[id[j]].name) < 0)) { +- for(k = players; k > j; k--) +- id[k] = id[k-1]; +- id[j] = i; // id[players] ++ (stricmp(map1, map2) == 0 && ++ stricmp(char_dat[j].status.name, char_dat[id[k]].status.name) < 0)) { ++ for(l = *players; l > k; l--) ++ id[l] = id[l-1]; ++ id[k] = j; // id[*players] + break; + } + } ++ } + break; + default: // 0 or invalid value: no sorting + break; + } +- players++; ++ (*players)++; ++ break; + } ++ return 0; + } ++//------------------------------------------------------------- ++// Function to create the online files (txt and html). by [Yor] ++//------------------------------------------------------------- ++void create_online_files(void) { ++ unsigned int k, j; // for loop with strlen comparing ++ int i, l; // for loops ++ int players; // count the number of players ++ FILE *fp; // for the txt file ++ FILE *fp2; // for the html file ++ char temp[256]; // to prepare what we must display ++ time_t time_server; // for number of seconds ++ struct tm *datetime; // variable for time in structure ->tm_mday, ->tm_sec, ... ++ int id[4096]; ++ ++ if (online_display_option == 0) // we display nothing, so return ++ return; ++ ++ // Get number of online players, id of each online players, and verify if a server is offline ++ players = 0; ++ online_char_db->foreach(online_char_db, create_online_files_sub, &players, &id); + + // write files + fp = fopen(online_txt_filename, "w"); +@@ -1080,8 +1418,9 @@ + fprintf(fp, "Online Players on %s (%s):\n", server_name, temp); + fprintf(fp, "\n"); + +- // If we display at least 1 player +- if (players > 0) { ++ for (i = 0; i < players; i++) { ++ // if it's the first player ++ if (i == 0) { + j = 0; // count the number of characters for the txt version and to set the separate line + fprintf(fp2, " \n"); + fprintf(fp2, " \n"); +@@ -1128,16 +1467,14 @@ + for (k = 0; k < j; k++) + fprintf(fp, "-"); + fprintf(fp, "\n"); +- +- // display each player. +- for (i = 0; i < players; i++) { ++ } ++ fprintf(fp2, " \n"); + // get id of the character (more speed) + j = id[i]; +- fprintf(fp2, " \n"); + // displaying the character name + if ((online_display_option & 1) || (online_display_option & 64)) { // without/with 'GM' display +- strcpy(temp, char_dat[j].name); +- l = isGM(char_dat[j].account_id); ++ strcpy(temp, char_dat[j].status.name); ++ l = isGM(char_dat[j].status.account_id); + if (online_display_option & 64) { + if (l >= online_gm_display_min_level) + fprintf(fp, "%-24s (GM) ", temp); +@@ -1149,7 +1486,7 @@ + fprintf(fp2, " \n", jobname, char_dat[j].base_level, char_dat[j].job_level); +- fprintf(fp, "%-18s %3d/%3d ", jobname, char_dat[j].base_level, char_dat[j].job_level); ++ fprintf(fp2, " \n", jobname, char_dat[j].status.base_level, char_dat[j].status.job_level); ++ fprintf(fp, "%-18s %3d/%3d ", jobname, char_dat[j].status.base_level, char_dat[j].status.job_level); + } else if (online_display_option & 2) { + fprintf(fp2, " \n", jobname); + fprintf(fp, "%-18s ", jobname); + } else if (online_display_option & 4) { +- fprintf(fp2, " \n", char_dat[j].base_level, char_dat[j].job_level); +- fprintf(fp, "%3d/%3d ", char_dat[j].base_level, char_dat[j].job_level); ++ fprintf(fp2, " \n", char_dat[j].status.base_level, char_dat[j].status.job_level); ++ fprintf(fp, "%3d/%3d ", char_dat[j].status.base_level, char_dat[j].status.job_level); + } + } + // displaying of the map + if (online_display_option & 24) { // 8 or 16 + // prepare map name +- memset(temp, 0, sizeof(temp)); +- strncpy(temp, char_dat[j].last_point.map, 16); +- if (strchr(temp, '.') != NULL) +- temp[strchr(temp, '.') - temp] = '\0'; // suppress the '.gat' ++ memcpy(temp, mapindex_id2name(char_dat[j].status.last_point.map), MAP_NAME_LENGTH); ++ temp[MAP_NAME_LENGTH] = '\0'; ++ if (strstr(temp, ".gat") != NULL) { ++ temp[strstr(temp, ".gat") - temp] = 0; // suppress the '.gat' ++ } + // write map name +- if (online_display_option & 16) { // map-name AND coordonates +- fprintf(fp2, " \n", temp, char_dat[j].last_point.x, char_dat[j].last_point.y); +- fprintf(fp, "%-12s (%3d,%3d) ", temp, char_dat[j].last_point.x, char_dat[j].last_point.y); ++ if (online_display_option & 16) { // map-name AND coordinates ++ fprintf(fp2, " \n", temp, char_dat[j].status.last_point.x, char_dat[j].status.last_point.y); ++ fprintf(fp, "%-12s (%3d,%3d) ", temp, char_dat[j].status.last_point.x, char_dat[j].status.last_point.y); + } else { + fprintf(fp2, " \n", temp); + fprintf(fp, "%-12s ", temp); + } + } +- // displaying number of zenys ++ // displaying nimber of zenys + if (online_display_option & 32) { + // write number of zenys +- if (char_dat[j].zeny == 0) { // if no zeny ++ if (char_dat[j].status.zeny == 0) { // if no zeny + fprintf(fp2, " \n"); + fprintf(fp, " no zeny "); + } else { +- fprintf(fp2, " \n", char_dat[j].zeny); +- fprintf(fp, "%13d z ", char_dat[j].zeny); ++ fprintf(fp2, " \n", char_dat[j].status.zeny); ++ fprintf(fp, "%13d z ", char_dat[j].status.zeny); + } + } + fprintf(fp, "\n"); + fprintf(fp2, " \n"); + } ++ // If we display at least 1 player ++ if (players > 0) { + fprintf(fp2, "
"); + if ((online_display_option & 64) && l >= online_gm_display_min_level) + fprintf(fp2, ""); +- for (k = 0; temp[k]; k++) { ++ for (k = 0; k < strlen(temp); k++) { + switch(temp[k]) { + case '<': // < + fprintf(fp2, "<"); +@@ -1168,48 +1505,51 @@ + } + // displaying of the job + if (online_display_option & 6) { +- char * jobname = job_name(char_dat[j].class); ++ char * jobname = job_name(char_dat[j].status.class_); + if ((online_display_option & 6) == 6) { +- fprintf(fp2, " %s %d/%d%s %d/%d%s%d/%d%d/%d%s (%d, %d)%s (%d, %d)%sno zeny%d z%d z
\n"); + fprintf(fp, "\n"); + } +@@ -1218,8 +1558,9 @@ + if (players == 0) { + fprintf(fp2, "

No user is online.

\n"); + fprintf(fp, "No user is online.\n"); +- // no display if only 1 player + } else if (players == 1) { ++ fprintf(fp2, "

%d user is online.

\n", players); ++ fprintf(fp, "%d user is online.\n", players); + } else { + fprintf(fp2, "

%d users are online.

\n", players); + fprintf(fp, "%d users are online.\n", players); +@@ -1254,15 +1595,17 @@ + int mmo_char_send006b(int fd, struct char_session_data *sd) { + int i, j, found_num; + struct mmo_charstatus *p; +-#ifdef NEW_006b ++//#ifdef NEW_006b + const int offset = 24; +-#else +- const int offset = 4; +-#endif ++//#else ++// const int offset = 4; ++//#endif ++ ++ set_char_online(0, 99,sd->account_id); + + found_num = 0; + for(i = 0; i < char_num; i++) { +- if (char_dat[i].account_id == sd->account_id) { ++ if (char_dat[i].status.account_id == sd->account_id) { + sd->found_char[found_num] = i; + found_num++; + if (found_num == 9) +@@ -1272,18 +1615,19 @@ + for(i = found_num; i < 9; i++) + sd->found_char[i] = -1; + ++ WFIFOHEAD(fd, offset + found_num * 106); + memset(WFIFOP(fd,0), 0, offset + found_num * 106); + WFIFOW(fd,0) = 0x6b; + WFIFOW(fd,2) = offset + found_num * 106; + + for(i = 0; i < found_num; i++) { +- p = &char_dat[sd->found_char[i]]; ++ p = &char_dat[sd->found_char[i]].status; + j = offset + (i * 106); // increase speed of code + + WFIFOL(fd,j) = p->char_id; +- WFIFOL(fd,j+4) = p->base_exp; ++ WFIFOL(fd,j+4) = p->base_exp>LONG_MAX?LONG_MAX:p->base_exp; + WFIFOL(fd,j+8) = p->zeny; +- WFIFOL(fd,j+12) = p->job_exp; ++ WFIFOL(fd,j+12) = p->job_exp>LONG_MAX?LONG_MAX:p->job_exp; + WFIFOL(fd,j+16) = p->job_level; + + WFIFOL(fd,j+20) = 0; +@@ -1299,9 +1643,16 @@ + WFIFOW(fd,j+46) = (p->sp > 0x7fff) ? 0x7fff : p->sp; + WFIFOW(fd,j+48) = (p->max_sp > 0x7fff) ? 0x7fff : p->max_sp; + WFIFOW(fd,j+50) = DEFAULT_WALK_SPEED; // p->speed; +- WFIFOW(fd,j+52) = p->class; ++ WFIFOW(fd,j+52) = p->class_; + WFIFOW(fd,j+54) = p->hair; +- WFIFOW(fd,j+56) = p->weapon; ++ ++ // pecopeco knights/crusaders crash fix ++ if (p->class_ == 13 || p->class_ == 21 || ++ p->class_ == 4014 || p->class_ == 4022 || ++ p->class_ == 4036 || p->class_ == 4044) ++ WFIFOW(fd,j+56) = 0; ++ else WFIFOW(fd,j+56) = p->weapon; ++ + WFIFOW(fd,j+58) = p->base_level; + WFIFOW(fd,j+60) = p->skill_point; + WFIFOW(fd,j+62) = p->head_bottom; +@@ -1311,7 +1662,7 @@ + WFIFOW(fd,j+70) = p->hair_color; + WFIFOW(fd,j+72) = p->clothes_color; + +- memcpy(WFIFOP(fd,j+74), p->name, 24); ++ memcpy(WFIFOP(fd,j+74), p->name, NAME_LENGTH); + + WFIFOB(fd,j+98) = (p->str > 255) ? 255 : p->str; + WFIFOB(fd,j+99) = (p->agi > 255) ? 255 : p->agi; +@@ -1327,34 +1678,20 @@ + return 0; + } + +-int set_account_reg2(int acc, int num, struct global_reg *reg) { +- int i, c; ++// 離婚(char削除時に使用) ++int char_divorce(struct mmo_charstatus *cs) { ++ if (cs == NULL) ++ return 0; + +- c = 0; ++ if (cs->partner_id > 0){ ++ int i, j; + for(i = 0; i < char_num; i++) { +- if (char_dat[i].account_id == acc) { +- memcpy(char_dat[i].account_reg2, reg, sizeof(char_dat[i].account_reg2)); +- char_dat[i].account_reg2_num = num; +- c++; +- } +- } +- return c; +-} +- +-// 離婚(char削除時に使用) +-int char_divorce(struct mmo_charstatus *cs) { +- if (cs == NULL) +- return 0; +- +- if (cs->partner_id > 0){ +- int i, j; +- for(i = 0; i < char_num; i++) { +- if (char_dat[i].char_id == cs->partner_id && char_dat[i].partner_id == cs->char_id) { ++ if (char_dat[i].status.char_id == cs->partner_id && char_dat[i].status.partner_id == cs->char_id) { + cs->partner_id = 0; +- char_dat[i].partner_id = 0; ++ char_dat[i].status.partner_id = 0; + for(j = 0; j < MAX_INVENTORY; j++) +- if (char_dat[i].inventory[j].nameid == WEDDING_RING_M || char_dat[i].inventory[j].nameid == WEDDING_RING_F) +- memset(&char_dat[i].inventory[j], 0, sizeof(char_dat[i].inventory[0])); ++ if (char_dat[i].status.inventory[j].nameid == WEDDING_RING_M || char_dat[i].status.inventory[j].nameid == WEDDING_RING_F) ++ memset(&char_dat[i].status.inventory[j], 0, sizeof(char_dat[i].status.inventory[0])); + if (cs->inventory[j].nameid == WEDDING_RING_M || cs->inventory[j].nameid == WEDDING_RING_F) + memset(&cs->inventory[j], 0, sizeof(cs->inventory[0])); + return 0; +@@ -1364,12 +1701,22 @@ + return 0; + } + ++int char_married(int pl1,int pl2) { ++ return (char_dat[pl1].status.char_id == char_dat[pl2].status.partner_id && char_dat[pl2].status.char_id == char_dat[pl1].status.partner_id); ++} ++ ++int char_child(int parent_id, int child_id) { ++ return (char_dat[parent_id].status.child == char_dat[child_id].status.char_id && ++ ((char_dat[parent_id].status.char_id == char_dat[child_id].status.father) || ++ (char_dat[parent_id].status.char_id == char_dat[child_id].status.mother))); ++} ++ + //------------------------------------------------------------ + // E-mail check: return 0 (not correct) or 1 (valid). by [Yor] + //------------------------------------------------------------ +-int e_mail_check(unsigned char *email) { ++int e_mail_check(char *email) { + char ch; +- unsigned char* last_arobas; ++ char* last_arobas; + + // athena limits + if (strlen(email) < 3 || strlen(email) > 39) +@@ -1412,7 +1759,7 @@ + + // disconnect player if online on char-server + for(i = 0; i < fd_max; i++) { +- if (session[i] && (sd = session[i]->session_data)) { ++ if (session[i] && (sd = (struct char_session_data*)session[i]->session_data)) { + if (sd->account_id == accound_id) { + session[i]->eof = 1; + return 1; +@@ -1432,20 +1779,20 @@ + inter_pet_delete(cs->pet_id); + for (j = 0; j < MAX_INVENTORY; j++) + if (cs->inventory[j].card[0] == (short)0xff00) +- inter_pet_delete(*((long *)(&cs->inventory[j].card[2]))); ++ inter_pet_delete(MakeDWord(cs->inventory[j].card[1],cs->inventory[j].card[2])); + for (j = 0; j < MAX_CART; j++) + if (cs->cart[j].card[0] == (short)0xff00) +- inter_pet_delete(*((long *)(&cs->cart[j].card[2]))); ++ inter_pet_delete( MakeDWord(cs->cart[j].card[1],cs->cart[j].card[2]) ); + // ギルド脱退 + if (cs->guild_id) + inter_guild_leave(cs->guild_id, cs->account_id, cs->char_id); + // パーティー脱退 + if (cs->party_id) +- inter_party_leave(cs->party_id, cs->account_id); ++ inter_party_leave(cs->party_id, cs->account_id, cs->char_id); + // 離婚 + if (cs->partner_id){ + // 離婚情報をmapに通知 +- char buf[10]; ++ unsigned char buf[10]; + WBUFW(buf,0) = 0x2b12; + WBUFL(buf,2) = cs->char_id; + WBUFL(buf,6) = cs->partner_id; +@@ -1459,22 +1806,24 @@ + int parse_tologin(int fd) { + int i; + struct char_session_data *sd; ++ RFIFOHEAD(fd); + + // only login-server can have an access to here. + // so, if it isn't the login-server, we disconnect the session (fd != login_fd). +- if (fd != login_fd || session[fd]->eof) { ++ if (fd != login_fd) ++ session[fd]->eof = 1; ++ if(session[fd]->eof) { + if (fd == login_fd) { +- printf("Char-server can't connect to login-server (connection #%d).\n", fd); ++ ShowWarning("Connection to login-server lost (connection #%d).\n", fd); + login_fd = -1; + } +- close(fd); +- delete_session(fd); ++ do_close(fd); + return 0; + } + +- sd = session[fd]->session_data; ++ sd = (struct char_session_data*)session[fd]->session_data; + +- while(RFIFOREST(fd) >= 2) { ++ while(RFIFOREST(fd) >= 2 && !session[fd]->eof) { + // printf("parse_tologin: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd)); + + switch(RFIFOW(fd,0)) { +@@ -1483,19 +1832,21 @@ + return 0; + if (RFIFOB(fd,2)) { + // printf("connect login server error : %d\n", RFIFOB(fd,2)); +- printf("Can not connect to login-server.\n"); +- printf("The server communication passwords (default s1/p1) is probably invalid.\n"); +- printf("Also, please make sure your accounts file (default: accounts.txt) has those values present.\n"); +- printf("If you changed the communication passwords, change them back at map_athena.conf and char_athena.conf\n"); ++ ShowError("Can not connect to the login-server.\n"); ++ ShowError("The server communication passwords (default s1/p1) are probably invalid.\n"); ++ ShowInfo("Also, please make sure your accounts file (default: accounts.txt) has those values present.\n"); ++ ShowInfo("The communication passwords can be changed in map_athena.conf and char_athena.conf\n"); + exit(1); + } else { +- printf("Connected to login-server (connection #%d).\n", fd); ++ ShowStatus("Connected to login-server (connection #%d).\n", fd); ++ if (kick_on_disconnect) ++ set_all_offline(); + // if no map-server already connected, display a message... + for(i = 0; i < MAX_MAP_SERVERS; i++) +- if (server_fd[i] >= 0 && server[i].map[0][0]) // if map-server online and at least 1 map ++ if (server_fd[i] >= 0 && server[i].map[0]) // if map-server online and at least 1 map + break; + if (i == MAX_MAP_SERVERS) +- printf("Awaiting maps from map-server.\n"); ++ ShowStatus("Awaiting maps from map-server.\n"); + } + RFIFOSKIP(fd,3); + break; +@@ -1505,8 +1856,9 @@ + return 0; + // printf("parse_tologin 2713 : %d\n", RFIFOB(fd,6)); + for(i = 0; i < fd_max; i++) { +- if (session[i] && (sd = session[i]->session_data) && sd->account_id == RFIFOL(fd,2)) { ++ if (session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->account_id == RFIFOL(fd,2)) { + if (RFIFOB(fd,6) != 0) { ++ WFIFOHEAD(i, 3); + WFIFOW(i,0) = 0x6c; + WFIFOB(i,2) = 0x42; + WFIFOSET(i,3); +@@ -1521,9 +1873,14 @@ + sd->connect_until_time = (time_t)RFIFOL(fd,47); + // send characters to player + mmo_char_send006b(i, sd); ++ } else if(isGM(sd->account_id) >= gm_allow_level) { ++ sd->connect_until_time = (time_t)RFIFOL(fd,47); ++ // send characters to player ++ mmo_char_send006b(i, sd); + } else { + // refuse connection: too much online players + // printf("count_users(): %d < max_connect_use (%d) -> fail...\n", count_users(), max_connect_user); ++ WFIFOHEAD(fd, 3); + WFIFOW(i,0) = 0x6c; + WFIFOW(i,2) = 0; + WFIFOSET(i,3); +@@ -1539,7 +1896,7 @@ + if (RFIFOREST(fd) < 50) + return 0; + for(i = 0; i < fd_max; i++) { +- if (session[i] && (sd = session[i]->session_data)) { ++ if (session[i] && (sd = (struct char_session_data*)session[i]->session_data)) { + if (sd->account_id == RFIFOL(fd,2)) { + memcpy(sd->email, RFIFOP(fd,6), 40); + if (e_mail_check(sd->email) == 0) +@@ -1552,6 +1909,40 @@ + RFIFOSKIP(fd,50); + break; + ++ // login-server alive packet ++ case 0x2718: ++ if (RFIFOREST(fd) < 2) ++ return 0; ++ RFIFOSKIP(fd,2); ++ break; ++ ++ // Receiving authentification from Freya-type login server (to avoid char->login->char) ++ case 0x2719: ++ if (RFIFOREST(fd) < 18) ++ return 0; ++ // to conserv a maximum of authentification, search if account is already authentified and replace it ++ // that will reduce multiple connection too ++ for(i = 0; i < AUTH_FIFO_SIZE; i++) ++ if (auth_fifo[i].account_id == RFIFOL(fd,2)) ++ break; ++ // if not found, use next value ++ if (i == AUTH_FIFO_SIZE) { ++ if (auth_fifo_pos >= AUTH_FIFO_SIZE) ++ auth_fifo_pos = 0; ++ i = auth_fifo_pos; ++ auth_fifo_pos++; ++ } ++ auth_fifo[i].account_id = RFIFOL(fd,2); ++ auth_fifo[i].char_id = 0; ++ auth_fifo[i].login_id1 = RFIFOL(fd,6); ++ auth_fifo[i].login_id2 = RFIFOL(fd,10); ++ auth_fifo[i].delflag = 2; // 0: auth_fifo canceled/void, 2: auth_fifo received from login/map server in memory, 1: connection authentified ++ auth_fifo[i].char_pos = 0; ++ auth_fifo[i].connect_until_time = 0; // unlimited/unknown time by default (not display in map-server) ++ auth_fifo[i].ip = RFIFOL(fd,14); ++ RFIFOSKIP(fd,18); ++ break; ++ + case 0x2721: // gm reply + if (RFIFOREST(fd) < 10) + return 0; +@@ -1576,49 +1967,55 @@ + sex = RFIFOB(fd,6); + RFIFOSKIP(fd, 7); + if (acc > 0) { +- for (i = 0; i < char_num; i++) { +- if (char_dat[i].account_id == acc) { +- int jobclass = char_dat[i].class; +- char_dat[i].sex = sex; ++ for(i = 0; i < AUTH_FIFO_SIZE; i++) { ++ if (auth_fifo[i].account_id == acc) + auth_fifo[i].sex = sex; ++ } ++ for (i = 0; i < char_num; i++) { ++ if (char_dat[i].status.account_id == acc) { ++ int jobclass = char_dat[i].status.class_; ++ char_dat[i].status.sex = sex; + if (jobclass == 19 || jobclass == 20 || + jobclass == 4020 || jobclass == 4021 || + jobclass == 4042 || jobclass == 4043) { + // job modification + if (jobclass == 19 || jobclass == 20) { +- char_dat[i].class = (sex) ? 19 : 20; ++ char_dat[i].status.class_ = (sex) ? 19 : 20; + } else if (jobclass == 4020 || jobclass == 4021) { +- char_dat[i].class = (sex) ? 4020 : 4021; ++ char_dat[i].status.class_ = (sex) ? 4020 : 4021; + } else if (jobclass == 4042 || jobclass == 4043) { +- char_dat[i].class = (sex) ? 4042 : 4043; ++ char_dat[i].status.class_ = (sex) ? 4042 : 4043; + } + // remove specifical skills of classes 19, 4020 and 4042 + for(j = 315; j <= 322; j++) { +- if (char_dat[i].skill[j].id > 0 && !char_dat[i].skill[j].flag) { +- char_dat[i].skill_point += char_dat[i].skill[j].lv; +- char_dat[i].skill[j].id = 0; +- char_dat[i].skill[j].lv = 0; ++ if (char_dat[i].status.skill[j].id > 0 && !char_dat[i].status.skill[j].flag) { ++ char_dat[i].status.skill_point += char_dat[i].status.skill[j].lv; ++ char_dat[i].status.skill[j].id = 0; ++ char_dat[i].status.skill[j].lv = 0; + } + } + // remove specifical skills of classes 20, 4021 and 4043 + for(j = 323; j <= 330; j++) { +- if (char_dat[i].skill[j].id > 0 && !char_dat[i].skill[j].flag) { +- char_dat[i].skill_point += char_dat[i].skill[j].lv; +- char_dat[i].skill[j].id = 0; +- char_dat[i].skill[j].lv = 0; ++ if (char_dat[i].status.skill[j].id > 0 && !char_dat[i].status.skill[j].flag) { ++ char_dat[i].status.skill_point += char_dat[i].status.skill[j].lv; ++ char_dat[i].status.skill[j].id = 0; ++ char_dat[i].status.skill[j].lv = 0; + } + } + } + // to avoid any problem with equipment and invalid sex, equipment is unequiped. + for (j = 0; j < MAX_INVENTORY; j++) { +- if (char_dat[i].inventory[j].nameid && char_dat[i].inventory[j].equip) +- char_dat[i].inventory[j].equip = 0; ++ if (char_dat[i].status.inventory[j].nameid && char_dat[i].status.inventory[j].equip) ++ char_dat[i].status.inventory[j].equip = 0; + } +- char_dat[i].weapon = 0; +- char_dat[i].shield = 0; +- char_dat[i].head_top = 0; +- char_dat[i].head_mid = 0; +- char_dat[i].head_bottom = 0; ++ char_dat[i].status.weapon = 0; ++ char_dat[i].status.shield = 0; ++ char_dat[i].status.head_top = 0; ++ char_dat[i].status.head_mid = 0; ++ char_dat[i].status.head_bottom = 0; ++ ++ if (char_dat[i].status.guild_id) //If there is a guild, update the guild_member data [Skotlex] ++ inter_guild_sex_changed(char_dat[i].status.guild_id, acc, char_dat[i].status.char_id, sex); + } + } + // disconnect player if online on char-server +@@ -1644,14 +2041,14 @@ + if (i == MAX_MAP_SERVERS) + char_log("'ladmin': Receiving a message for broadcast, but no map-server is online." RETCODE); + else { +- char buf[128]; +- char message[RFIFOL(fd,4) + 1]; // +1 to add a null terminated if not exist in the packet ++ unsigned char buf[128]; ++ char message[4096]; // +1 to add a null terminated if not exist in the packet + int lp; + char *p; + memset(message, '\0', sizeof(message)); + memcpy(message, RFIFOP(fd,8), RFIFOL(fd,4)); + message[sizeof(message)-1] = '\0'; +- remove_control_chars(message); ++ remove_control_chars((unsigned char *)message); + // remove all first spaces + p = message; + while(p[0] == ' ') +@@ -1702,22 +2099,13 @@ + case 0x2729: + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; +- { +- struct global_reg reg[ACCOUNT_REG2_NUM]; +- unsigned char buf[4096]; +- int j, p, acc; +- acc = RFIFOL(fd,4); +- for (p = 8, j = 0; p < RFIFOW(fd,2) && j < ACCOUNT_REG2_NUM; p += 36, j++) { +- memcpy(reg[j].str, RFIFOP(fd,p), 32); +- reg[j].value = RFIFOL(fd,p+32); +- } +- set_account_reg2(acc, j, reg); +- // 同垢ログインを禁止していれば送る必要は無い ++ { //Receive account_reg2 registry, forward to map servers. ++ unsigned char buf[ACCOUNT_REG2_NUM*(256+32+2)+16]; + memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2)); +- WBUFW(buf,0) = 0x2b11; ++// WBUFW(buf,0) = 0x2b11; ++ 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)); +-// printf("char: save_account_reg_reply\n"); + } + break; + +@@ -1727,20 +2115,20 @@ + return 0; + // Deletion of all characters of the account + for(i = 0; i < char_num; i++) { +- if (char_dat[i].account_id == RFIFOL(fd,2)) { +- char_delete(&char_dat[i]); ++ if (char_dat[i].status.account_id == RFIFOL(fd,2)) { ++ char_delete(&char_dat[i].status); + if (i < char_num - 1) { +- memcpy(&char_dat[i], &char_dat[char_num-1], sizeof(struct mmo_charstatus)); ++ memcpy(&char_dat[i], &char_dat[char_num-1], sizeof(struct character_data)); + // if moved character owns to deleted account, check again it's character +- if (char_dat[i].account_id == RFIFOL(fd,2)) { ++ if (char_dat[i].status.account_id == RFIFOL(fd,2)) { + i--; + // Correct moved character reference in the character's owner by [Yor] + } else { + int j, k; + struct char_session_data *sd2; + for (j = 0; j < fd_max; j++) { +- if (session[j] && (sd2 = session[j]->session_data) && +- sd2->account_id == char_dat[char_num-1].account_id) { ++ if (session[j] && (sd2 = (struct char_session_data*)session[j]->session_data) && ++ sd2->account_id == char_dat[char_num-1].status.account_id) { + for (k = 0; k < 9; k++) { + if (sd2->found_char[k] == char_num-1) { + sd2->found_char[k] = i; +@@ -1792,10 +2180,10 @@ + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; + { +- char buf[32000]; ++ unsigned char buf[32000]; + if (gm_account != NULL) +- free(gm_account); +- gm_account = calloc(sizeof(struct gm_account) * ((RFIFOW(fd,2) - 4) / 5), 1); ++ aFree(gm_account); ++ gm_account = (struct gm_account*)aCalloc(sizeof(struct gm_account) * ((RFIFOW(fd,2) - 4) / 5), 1); + GM_num = 0; + for (i = 4; i < RFIFOW(fd,2); i = i + 5) { + gm_account[GM_num].account_id = RFIFOL(fd,i); +@@ -1803,8 +2191,8 @@ + //printf("GM account: %d -> level %d\n", gm_account[GM_num].account_id, gm_account[GM_num].level); + GM_num++; + } +- printf("From login-server: receiving of %d GM accounts information.\n", GM_num); +- char_log("From login-server: receiving of %d GM accounts information." RETCODE, GM_num); ++ ShowStatus("From login-server: receiving information of %d GM accounts.\n", GM_num); ++ char_log("From login-server: receiving information of %d GM accounts." RETCODE, GM_num); + create_online_files(); // update online players files (perhaps some online players change of GM level) + // send new gm acccounts level to map-servers + memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2)); +@@ -1814,7 +2202,101 @@ + RFIFOSKIP(fd,RFIFOW(fd,2)); + break; + ++ // Receive GM accounts [Freya login server packet by Yor] ++ case 0x2733: ++ // add test here to remember that the login-server is Freya-type ++ // sprintf (login_server_type, "Freya"); ++ if (RFIFOREST(fd) < 7) ++ return 0; ++ { ++ unsigned char buf[32000]; ++ int new_level = 0; ++ for(i = 0; i < GM_num; i++) ++ if (gm_account[i].account_id == RFIFOL(fd,2)) { ++ if (gm_account[i].level != (int)RFIFOB(fd,6)) { ++ gm_account[i].level = (int)RFIFOB(fd,6); ++ new_level = 1; ++ } ++ break; ++ } ++ // if not found, add it ++ if (i == GM_num) { ++ // limited to 4000, because we send information to char-servers (more than 4000 GM accounts???) ++ // int (id) + int (level) = 8 bytes * 4000 = 32k (limit of packets in windows) ++ if (((int)RFIFOB(fd,6)) > 0 && GM_num < 4000) { ++ if (GM_num == 0) { ++ gm_account = (struct gm_account*)aMalloc(sizeof(struct gm_account)); ++ } else { ++ gm_account = (struct gm_account*)aRealloc(gm_account, sizeof(struct gm_account) * (GM_num + 1)); ++ } ++ gm_account[GM_num].account_id = RFIFOL(fd,2); ++ gm_account[GM_num].level = (int)RFIFOB(fd,6); ++ new_level = 1; ++ GM_num++; ++ if (GM_num >= 4000) { ++ ShowWarning("4000 GM accounts found. Next GM accounts are not readed.\n"); ++ char_log("***WARNING: 4000 GM accounts found. Next GM accounts are not readed." RETCODE); ++ } ++ } ++ } ++ if (new_level == 1) { ++ int len; ++ ShowStatus("From login-server: receiving GM account information (%d: level %d).\n", RFIFOL(fd,2), (int)RFIFOB(fd,6)); ++ char_log("From login-server: receiving a GM account information (%d: level %d)." RETCODE, RFIFOL(fd,2), (int)RFIFOB(fd,6)); ++ //create_online_files(); // not change online file for only 1 player (in next timer, that will be done ++ // send gm acccounts level to map-servers ++ len = 4; ++ WBUFW(buf,0) = 0x2b15; ++ ++ for(i = 0; i < GM_num; i++) { ++ WBUFL(buf, len) = gm_account[i].account_id; ++ WBUFB(buf, len+4) = (unsigned char)gm_account[i].level; ++ len += 5; ++ } ++ WBUFW(buf, 2) = len; ++ mapif_sendall(buf, len); ++ } ++ } ++ RFIFOSKIP(fd,7); ++ break; ++ ++ //Login server request to kick a character out. [Skotlex] ++ case 0x2734: ++ if (RFIFOREST(fd) < 6) ++ return 0; ++ { ++ struct online_char_data* character; ++ int aid = RFIFOL(fd,2); ++ if ((character = idb_get(online_char_db, aid)) != NULL) ++ { //Kick out this player. ++ if (character->server > -1) ++ { //Kick it from the map server it is on. ++ mapif_disconnectplayer(server_fd[character->server], character->account_id, character->char_id, 2); ++ if (!character->waiting_disconnect) ++ add_timer(gettick()+15000, chardb_waiting_disconnect, character->account_id, 0); ++ character->waiting_disconnect = 1; ++ } else { //Manual kick from char server. ++ struct char_session_data *tsd; ++ int i; ++ for(i = 0; i < fd_max; i++) { ++ if (session[i] && (tsd = (struct char_session_data*)session[i]->session_data) && tsd->account_id == aid) ++ { ++ WFIFOHEAD(fd, 3); ++ WFIFOW(i,0) = 0x81; ++ WFIFOB(i,2) = 2; ++ WFIFOSET(i,3); ++ break; ++ } ++ } ++ if (i == fd_max) //Shouldn't happen, but just in case. ++ set_char_offline(99, aid); ++ } ++ } ++ RFIFOSKIP(fd,6); ++ } ++ break; + default: ++ ShowWarning("Unknown packet 0x%04x received from login-server, disconnecting.\n", RFIFOW(fd,0)); + session[fd]->eof = 1; + return 0; + } +@@ -1824,57 +2306,130 @@ + return 0; + } + +-//-------------------------------- +-// Map-server anti-freeze system +-//-------------------------------- +-int map_anti_freeze_system(int tid, unsigned int tick, int id, int data) { +- int i; ++int request_accreg2(int account_id, int char_id) { ++ if (login_fd > 0) { ++ WFIFOW(login_fd, 0) = 0x272e; ++ WFIFOL(login_fd, 2) = account_id; ++ WFIFOL(login_fd, 6) = char_id; ++ WFIFOSET(login_fd, 10); ++ return 1; ++ } ++ return 0; ++} + +- //printf("Entering in map_anti_freeze_system function to check freeze of servers.\n"); +- for(i = 0; i < MAX_MAP_SERVERS; i++) { +- if (server_fd[i] >= 0) {// if map-server is online +- //printf("map_anti_freeze_system: server #%d, flag: %d.\n", i, server_freezeflag[i]); +- if (server_freezeflag[i]-- < 1) { // Map-server anti-freeze system. Counter. 5 ok, 4...0 freezed +- printf("Map-server anti-freeze system: char-server #%d is freezed -> disconnection.\n", i); +- char_log("Map-server anti-freeze system: char-server #%d is freezed -> disconnection." RETCODE, +- i); +- session[server_fd[i]]->eof = 1; ++//Send packet forward to login-server for account saving ++int save_accreg2(unsigned char* buf, int len) { ++ if (login_fd > 0) { ++ WFIFOHEAD(login_fd, len+4); ++ memcpy(WFIFOP(login_fd,4), buf, len); ++ WFIFOW(login_fd,0) = 0x2728; ++ WFIFOW(login_fd,2) = len+4; ++ WFIFOSET(login_fd,len+4); ++ return 1; + } ++ return 0; + } ++ ++//Receive Registry information for a character. ++int char_parse_Registry(int account_id, int char_id, unsigned char *buf, int buf_len) { ++ int i,j,p,len; ++ for (i = 0; i < char_num; i++) { ++ if (char_dat[i].status.account_id == account_id && char_dat[i].status.char_id == char_id) ++ break; ++ } ++ if(i >= char_num) //Character not found? ++ return 1; ++ for(j=0,p=0;j= char_num){ //Character not found? Sent empty packet. ++ WFIFOW(fd,2)=13; ++ }else{ ++ for (p=13,j = 0; j < char_dat[i].global_num; j++) { ++ if (char_dat[i].global[j].str[0]) { ++ p+= sprintf(WFIFOP(fd,p), "%s", char_dat[i].global[j].str)+1; //We add 1 to consider the '\0' in place. ++ p+= sprintf(WFIFOP(fd,p), "%s", char_dat[i].global[j].value)+1; ++ } ++ } ++ WFIFOW(fd,2)=p; ++ } ++ WFIFOSET(fd,WFIFOW(fd,2)); + return 0; + } + ++int search_mapserver(unsigned short map, long ip, short port); ++ + int parse_frommap(int fd) { + int i, j; + int id; ++ RFIFOHEAD(fd); + + for(id = 0; id < MAX_MAP_SERVERS; id++) + if (server_fd[id] == fd) + break; +- if (id == MAX_MAP_SERVERS || session[fd]->eof) { ++ if(id==MAX_MAP_SERVERS) ++ session[fd]->eof=1; ++ if(session[fd]->eof){ + if (id < MAX_MAP_SERVERS) { +- printf("Map-server %d (session #%d) has disconnected.\n", id, fd); +- memset(&server[id], 0, sizeof(struct mmo_map_server)); ++ unsigned char buf[16384]; ++ ShowStatus("Map-server %d has disconnected.\n", id); ++ //Notify other map servers that this one is gone. [Skotlex] ++ WBUFW(buf,0) = 0x2b20; ++ WBUFL(buf,4) = server[id].ip; ++ WBUFW(buf,8) = server[id].port; ++ j = 0; ++ for(i = 0; i < MAX_MAP_PER_SERVER; i++) ++ if (server[id].map[i]) ++ WBUFW(buf,10+(j++)*4) = server[id].map[i]; ++ if (j > 0) { ++ WBUFW(buf,2) = j * 4 + 10; ++ mapif_sendallwos(fd, buf, WBUFW(buf,2)); ++ } + server_fd[id] = -1; +- for(j = 0; j < char_num; j++) +- if (online_chars[j] == fd) +- online_chars[j] = -1; +- create_online_files(); // update online players files (to remove all online players of this server) ++ online_char_db->foreach(online_char_db,char_db_setoffline,i); //Tag relevant chars as 'in disconnected' server. + } +- close(fd); +- delete_session(fd); ++ do_close(fd); ++ create_online_files(); + return 0; + } + +- while(RFIFOREST(fd) >= 2) { ++ while(RFIFOREST(fd) >= 2 && !session[fd]->eof) { + // printf("parse_frommap: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd)); + + switch(RFIFOW(fd,0)) { ++ ++ // map-server alive packet ++ case 0x2718: ++ if (RFIFOREST(fd) < 2) ++ return 0; ++ RFIFOSKIP(fd,2); ++ break; ++ + // request from map-server to reload GM accounts. Transmission to login-server (by Yor) + case 0x2af7: + if (login_fd > 0) { // don't send request if no login-server ++ WFIFOHEAD(login_fd, 2); + WFIFOW(login_fd,0) = 0x2709; + WFIFOSET(login_fd, 2); + // printf("char : request from map-server to reload GM accounts -> login-server.\n"); +@@ -1888,36 +2443,41 @@ + return 0; + memset(server[id].map, 0, sizeof(server[id].map)); + j = 0; +- for(i = 4; i < RFIFOW(fd,2); i += 16) { +- memcpy(server[id].map[j], RFIFOP(fd,i), 16); +-// printf("set map %d.%d : %s\n", id, j, server[id].map[j]); ++ for(i = 4; i < RFIFOW(fd,2); i += 4) { ++ server[id].map[j] = RFIFOW(fd,i); + j++; + } + { + unsigned char *p = (unsigned char *)&server[id].ip; +- printf("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n", ++ ShowStatus("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n", + id, j, p[0], p[1], p[2], p[3], server[id].port); +- printf("Map-server %d loading complete.\n", id); ++ ShowStatus("Map-server %d loading complete.\n", id); + char_log("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d. Map-server %d loading complete." RETCODE, + id, j, p[0], p[1], p[2], p[3], server[id].port, id); ++ if (kick_on_disconnect) ++ set_all_offline(); ++ if (max_account_id != DEFAULT_MAX_ACCOUNT_ID || max_char_id != DEFAULT_MAX_CHAR_ID) ++ mapif_send_maxid(max_account_id, max_char_id); //Send the current max ids to the server to keep in sync [Skotlex] + } ++ WFIFOHEAD(fd, 3 + NAME_LENGTH); + WFIFOW(fd,0) = 0x2afb; + WFIFOB(fd,2) = 0; +- memcpy(WFIFOP(fd,3), wisp_server_name, 24); // name for wisp to player +- WFIFOSET(fd,27); ++ memcpy(WFIFOP(fd,3), wisp_server_name, NAME_LENGTH); // name for wisp to player ++ WFIFOSET(fd,3+NAME_LENGTH); ++ //WFIFOSET(fd,27); + { + unsigned char buf[16384]; + int x; + if (j == 0) { +- printf("WARNING: Map-Server %d have NO map.\n", id); ++ ShowWarning("Map-Server %d have NO map.\n", id); + char_log("WARNING: Map-Server %d have NO map." RETCODE, id); + // Transmitting maps information to the other map-servers + } else { + WBUFW(buf,0) = 0x2b04; +- WBUFW(buf,2) = j * 16 + 10; ++ WBUFW(buf,2) = j * 4 + 10; + WBUFL(buf,4) = server[id].ip; + WBUFW(buf,8) = server[id].port; +- memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 16); ++ 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 +@@ -1928,10 +2488,10 @@ + WFIFOW(fd,8) = server[x].port; + j = 0; + for(i = 0; i < MAX_MAP_PER_SERVER; i++) +- if (server[x].map[i][0]) +- memcpy(WFIFOP(fd,10+(j++)*16), server[x].map[i], 16); ++ if (server[x].map[i]) ++ WFIFOW(fd,10+(j++)*4) = server[x].map[i]; + if (j > 0) { +- WFIFOW(fd,2) = j * 16 + 10; ++ WFIFOW(fd,2) = j * 4 + 10; + WFIFOSET(fd,WFIFOW(fd,2)); + } + } +@@ -1940,83 +2500,95 @@ + RFIFOSKIP(fd,RFIFOW(fd,2)); + break; + +- // 認証要求 ++ //Packet command is now used for sc_data request. [Skotlex] + case 0x2afc: +- if (RFIFOREST(fd) < 22) ++ if (RFIFOREST(fd) < 10) + return 0; +- //printf("auth_fifo search: account: %d, char: %d, secure: %08x-%08x\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14)); +- for(i = 0; i < AUTH_FIFO_SIZE; i++) { +- if (auth_fifo[i].account_id == RFIFOL(fd,2) && +- auth_fifo[i].char_id == RFIFOL(fd,6) && +- auth_fifo[i].login_id1 == RFIFOL(fd,10) && +-#if CMP_AUTHFIFO_LOGIN2 != 0 +- // here, it's the only area where it's possible that we doesn't know login_id2 (map-server asks just after 0x72 packet, that doesn't given the value) +- (auth_fifo[i].login_id2 == RFIFOL(fd,14) || RFIFOL(fd,14) == 0) && // relate to the versions higher than 18 ++ { ++#ifdef ENABLE_SC_SAVING ++ int aid, cid; ++ struct scdata *data; ++ aid = RFIFOL(fd,2); ++ cid = RFIFOL(fd,6); + #endif +- (!check_ip_flag || auth_fifo[i].ip == RFIFOL(fd,18)) && +- !auth_fifo[i].delflag) { +- auth_fifo[i].delflag = 1; +- WFIFOW(fd,0) = 0x2afd; +- WFIFOW(fd,2) = 16 + sizeof(struct mmo_charstatus); +- WFIFOL(fd,4) = RFIFOL(fd,2); +- WFIFOL(fd,8) = auth_fifo[i].login_id2; +- WFIFOL(fd,12) = (unsigned long)auth_fifo[i].connect_until_time; +- char_dat[auth_fifo[i].char_pos].sex = auth_fifo[i].sex; +- memcpy(WFIFOP(fd,16), &char_dat[auth_fifo[i].char_pos], sizeof(struct mmo_charstatus)); ++ RFIFOSKIP(fd, 10); ++#ifdef ENABLE_SC_SAVING ++ data = status_search_scdata(aid, cid); ++ if (data->count > 0) ++ { //Deliver status change data. ++ int i; ++ ++ WFIFOW(fd,0) = 0x2b1d; ++ WFIFOW(fd,2) = 14 + data->count*sizeof(struct status_change_data); ++ WFIFOL(fd,4) = aid; ++ WFIFOL(fd,8) = cid; ++ WFIFOW(fd,12) = data->count; ++ for (i = 0; i < data->count; i++) ++ memcpy(WFIFOP(fd,14+i*sizeof(struct status_change_data)), &data->data[i], sizeof(struct status_change_data)); + WFIFOSET(fd, WFIFOW(fd,2)); +- //printf("auth_fifo search success (auth #%d, account %d, character: %d).\n", i, RFIFOL(fd,2), RFIFOL(fd,6)); +- break; ++ status_delete_scdata(aid, cid); //Data sent, so it needs be discarded now. + } ++#endif ++ break; + } +- if (i == AUTH_FIFO_SIZE) { +- WFIFOW(fd,0) = 0x2afe; +- WFIFOL(fd,2) = RFIFOL(fd,2); +- WFIFOSET(fd,6); +- printf("auth_fifo search error! account %d not authentified.\n", RFIFOL(fd,2)); ++ ++ //set MAP user count ++ case 0x2afe: ++ 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,22); ++ RFIFOSKIP(fd, 4); + break; +- +- // MAPサーバー上のユーザー数受信 ++ //set MAP users + case 0x2aff: + if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; + server[id].users = RFIFOW(fd,4); +- if(anti_freeze_enable) +- server_freezeflag[id] = 5; // Map anti-freeze system. Counter. 5 ok, 4...0 freezed +- // remove all previously online players of the server +- for(i = 0; i < char_num; i++) +- if (online_chars[i] == id) +- online_chars[i] = -1; +- // add online players in the list by [Yor] ++ // add online players in the list by [Yor], adapted to use dbs by [Skotlex] ++ j = 0; ++ 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++) { +- int char_id = RFIFOL(fd,6+i*4); +- for(j = 0; j < char_num; j++) +- if (char_dat[j].char_id == char_id) { +- online_chars[j] = id; +- //printf("%d\n", char_id); +- break; ++ int aid, cid; ++ struct online_char_data* character; ++ 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 (online_check && 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_fd[character->server], character->account_id, character->char_id, 2); + } ++ character->char_id = cid; ++ character->server = id; + } + if (update_online < time(NULL)) { // Time is done + update_online = time(NULL) + 8; + create_online_files(); // only every 8 sec. (normally, 1 server send users every 5 sec.) Don't update every time, because that takes time, but only every 2 connection. + // it set to 8 sec because is more than 5 (sec) and if we have more than 1 map-server, informations can be received in shifted. + } +- RFIFOSKIP(fd,6+i*4); ++ //If any chars remain in -2, they will be cleaned in the cleanup timer. ++ RFIFOSKIP(fd,6+i*8); + break; + + // キャラデータ保存 ++ // Recieve character data from map-server + case 0x2b01: + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) + return 0; + for(i = 0; i < char_num; i++) { +- if (char_dat[i].account_id == RFIFOL(fd,4) && +- char_dat[i].char_id == RFIFOL(fd,8)) ++ if (char_dat[i].status.account_id == RFIFOL(fd,4) && ++ char_dat[i].status.char_id == RFIFOL(fd,8)) + break; + } + if (i != char_num) +- memcpy(&char_dat[i], RFIFOP(fd,12), sizeof(struct mmo_charstatus)); ++ memcpy(&char_dat[i].status, RFIFOP(fd,13), sizeof(struct mmo_charstatus)); ++ if (RFIFOB(fd,12)) { //Flag, set character offline. [Skotlex] ++ set_char_offline(RFIFOL(fd,8),RFIFOL(fd,4)); ++ } + RFIFOSKIP(fd,RFIFOW(fd,2)); + break; + +@@ -2026,7 +2598,6 @@ + return 0; + if (auth_fifo_pos >= AUTH_FIFO_SIZE) + auth_fifo_pos = 0; +- //printf("auth_fifo set (auth #%d) - account: %d, secure: %08x-%08x\n", auth_fifo_pos, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); + auth_fifo[auth_fifo_pos].account_id = RFIFOL(fd,2); + auth_fifo[auth_fifo_pos].char_id = 0; + auth_fifo[auth_fifo_pos].login_id1 = RFIFOL(fd,6); +@@ -2043,35 +2614,58 @@ + RFIFOSKIP(fd,18); + break; + +- // マップサーバー間移動要求 ++ // request "change map server" + case 0x2b05: +- if (RFIFOREST(fd) < 49) ++ if (RFIFOREST(fd) < 35) + return 0; +- if (auth_fifo_pos >= AUTH_FIFO_SIZE) +- auth_fifo_pos = 0; +- WFIFOW(fd,0) = 0x2b06; +- memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 42); +- //printf("auth_fifo set (auth#%d) - account: %d, secure: 0x%08x-0x%08x\n", auth_fifo_pos, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); +- auth_fifo[auth_fifo_pos].account_id = RFIFOL(fd,2); +- auth_fifo[auth_fifo_pos].char_id = RFIFOL(fd,14); +- auth_fifo[auth_fifo_pos].login_id1 = RFIFOL(fd,6); +- auth_fifo[auth_fifo_pos].login_id2 = RFIFOL(fd,10); +- auth_fifo[auth_fifo_pos].delflag = 0; +- auth_fifo[auth_fifo_pos].sex = RFIFOB(fd,44); +- auth_fifo[auth_fifo_pos].connect_until_time = 0; // unlimited/unknown time by default (not display in map-server) +- auth_fifo[auth_fifo_pos].ip = RFIFOL(fd,45); +- for(i = 0; i < char_num; i++) +- if (char_dat[i].account_id == RFIFOL(fd,2) && +- char_dat[i].char_id == RFIFOL(fd,14)) { +- auth_fifo[auth_fifo_pos].char_pos = i; +- auth_fifo_pos++; +- WFIFOL(fd,6) = 0; ++ { ++ unsigned short name; ++ int map_id, map_fd = -1, i; ++ struct online_char_data* data; ++ struct mmo_charstatus* char_data; ++ ++ name = RFIFOW(fd,18); ++ map_id = search_mapserver(name, RFIFOL(fd,24), RFIFOW(fd,28)); //Locate mapserver by ip and port. ++ if (map_id >= 0) ++ map_fd = server_fd[map_id]; ++ for(i = 0; i < char_num; i++) { ++ if (char_dat[i].status.account_id == RFIFOL(fd,2) && ++ char_dat[i].status.char_id == RFIFOL(fd,14)) + break; + } +- if (i == char_num) +- WFIFOW(fd,6) = 1; +- WFIFOSET(fd,44); +- RFIFOSKIP(fd,49); ++ char_data = i< char_num? &char_dat[i].status:NULL; ++ //Tell the new map server about this player using Kevin's new auth packet. [Skotlex] ++ if (map_fd>=0 && session[map_fd] && char_data) ++ { //Send the map server the auth of this player. ++ //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); ++ ++ WFIFOW(map_fd,0) = 0x2afd; ++ WFIFOW(map_fd,2) = 20 + sizeof(struct mmo_charstatus); ++ WFIFOL(map_fd,4) = RFIFOL(fd, 2); //Account ID ++ WFIFOL(map_fd,8) = RFIFOL(fd, 6); //Login1 ++ WFIFOL(map_fd,16) = RFIFOL(fd,10); //Login2 ++ WFIFOL(map_fd,12) = (unsigned long)0; //TODO: connect_until_time, how do I figure it out right now? ++ memcpy(WFIFOP(map_fd,20), char_data, sizeof(struct mmo_charstatus)); ++ WFIFOSET(map_fd, WFIFOW(map_fd,2)); ++ 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. ++ WFIFOW(fd, 0) = 0x2b06; ++ memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28); ++ WFIFOSET(fd, 30); ++ } else { //Reply with nak ++ 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, 35); ++ } + break; + + // キャラ名検索 +@@ -2079,16 +2673,17 @@ + if (RFIFOREST(fd) < 6) + return 0; + for(i = 0; i < char_num; i++) { +- if (char_dat[i].char_id == RFIFOL(fd,2)) ++ if (char_dat[i].status.char_id == RFIFOL(fd,2)) + break; + } + WFIFOW(fd,0) = 0x2b09; + WFIFOL(fd,2) = RFIFOL(fd,2); + if (i != char_num) +- memcpy(WFIFOP(fd,6), char_dat[i].name, 24); ++ memcpy(WFIFOP(fd,6), char_dat[i].status.name, NAME_LENGTH); + else +- memcpy(WFIFOP(fd,6), unknown_char_name, 24); +- WFIFOSET(fd,30); ++ memcpy(WFIFOP(fd,6), unknown_char_name, NAME_LENGTH); ++ WFIFOSET(fd,6+NAME_LENGTH); ++ //WFIFOSET(fd,30); + RFIFOSKIP(fd,6); + break; + +@@ -2127,10 +2722,10 @@ + if (RFIFOREST(fd) < 44) + return 0; + { +- char character_name[24]; ++ char character_name[NAME_LENGTH]; + int acc = RFIFOL(fd,2); // account_id of who ask (-1 if nobody) +- memcpy(character_name, RFIFOP(fd,6), 24); +- character_name[sizeof(character_name) -1] = '\0'; ++ memcpy(character_name, RFIFOP(fd,6), NAME_LENGTH-1); ++ character_name[NAME_LENGTH -1] = '\0'; + // prepare answer + WFIFOW(fd,0) = 0x2b0f; // answer + WFIFOL(fd,2) = acc; // who want do operation +@@ -2138,14 +2733,15 @@ + // search character + i = search_character_index(character_name); + if (i >= 0) { +- memcpy(WFIFOP(fd,6), search_character_name(i), 24); // put correct name if found +- WFIFOW(fd,32) = 0; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline ++ memcpy(WFIFOP(fd,6), search_character_name(i), NAME_LENGTH); // put correct name if found ++ WFIFOW(fd,6+NAME_LENGTH) = 0; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline ++ //WFIFOW(fd,32) = 0; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + switch(RFIFOW(fd, 30)) { + case 1: // block +- if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { ++ if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd,0) = 0x2724; +- WFIFOL(login_fd,2) = char_dat[i].account_id; // account value ++ WFIFOL(login_fd,2) = char_dat[i].status.account_id; // account value + WFIFOL(login_fd,6) = 5; // status of the account + WFIFOSET(login_fd, 10); + // printf("char : status -> login: account %d, status: %d \n", char_dat[i].account_id, 5); +@@ -2155,10 +2751,10 @@ + WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + break; + case 2: // ban +- if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { ++ if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd, 0) = 0x2725; +- WFIFOL(login_fd, 2) = char_dat[i].account_id; // account value ++ WFIFOL(login_fd, 2) = char_dat[i].status.account_id; // account value + WFIFOW(login_fd, 6) = RFIFOW(fd,32); // year + WFIFOW(login_fd, 8) = RFIFOW(fd,34); // month + WFIFOW(login_fd,10) = RFIFOW(fd,36); // day +@@ -2174,10 +2770,10 @@ + WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + break; + case 3: // unblock +- if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { ++ if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd,0) = 0x2724; +- WFIFOL(login_fd,2) = char_dat[i].account_id; // account value ++ WFIFOL(login_fd,2) = char_dat[i].status.account_id; // account value + WFIFOL(login_fd,6) = 0; // status of the account + WFIFOSET(login_fd, 10); + // printf("char : status -> login: account %d, status: %d \n", char_dat[i].account_id, 0); +@@ -2187,10 +2783,10 @@ + WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + break; + case 4: // unban +- if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { ++ if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd, 0) = 0x272a; +- WFIFOL(login_fd, 2) = char_dat[i].account_id; // account value ++ WFIFOL(login_fd, 2) = char_dat[i].status.account_id; // account value + WFIFOSET(login_fd, 6); + // printf("char : status -> login: account %d, unban request\n", char_dat[i].account_id); + } else +@@ -2199,10 +2795,10 @@ + WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + break; + case 5: // changesex +- if (acc == -1 || isGM(acc) >= isGM(char_dat[i].account_id)) { ++ if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) { + if (login_fd > 0) { // don't send request if no login-server + WFIFOW(login_fd, 0) = 0x2727; +- WFIFOL(login_fd, 2) = char_dat[i].account_id; // account value ++ WFIFOL(login_fd, 2) = char_dat[i].status.account_id; // account value + WFIFOSET(login_fd, 6); + // printf("char : status -> login: account %d, change sex request\n", char_dat[i].account_id); + } else +@@ -2213,12 +2809,14 @@ + } + } else { + // character name not found +- memcpy(WFIFOP(fd,6), character_name, 24); +- WFIFOW(fd,32) = 1; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline ++ memcpy(WFIFOP(fd,6), character_name, NAME_LENGTH); ++ WFIFOW(fd,8+NAME_LENGTH) = 1; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline ++ //WFIFOW(fd,32) = 1; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline + } + // send answer if a player ask, not if the server ask + if (acc != -1) { +- WFIFOSET(fd, 34); ++ //WFIFOSET(fd, 34); ++ WFIFOSET(fd, 10+NAME_LENGTH); + } + RFIFOSKIP(fd, 44); + break; +@@ -2226,34 +2824,157 @@ + + // case 0x2b0f: not more used (available for futur usage) + +- // account_reg保存要求 +- case 0x2b10: +- if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) ++ //Packet 0x2b10 deprecated in favor of packet 0x3004 for registry saving. [Skotlex] ++ //case 0x2b10: ++ ++ // Recieve rates [Wizputer] ++ case 0x2b16: ++ if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,8)) ++ return 0; ++ // Txt doesn't need this packet, so just skip it ++ RFIFOSKIP(fd,RFIFOW(fd,8)); ++ break; ++ ++ // Character disconnected set online 0 [Wizputer] ++ case 0x2b17: ++ if (RFIFOREST(fd) < 6) ++ return 0; ++ //printf("Setting %d char offline\n",RFIFOL(fd,2)); ++ set_char_offline(RFIFOL(fd,2),RFIFOL(fd,6)); ++ RFIFOSKIP(fd,10); ++ break; ++ ++ // Reset all chars to offline [Wizputer] ++ case 0x2b18: ++ ShowNotice("Map server [%d] requested to set all characters offline.\n", id); ++ set_all_offline(); ++ RFIFOSKIP(fd,2); ++ break; ++ ++ // Character set online [Wizputer] ++ case 0x2b19: ++ if (RFIFOREST(fd) < 6) ++ return 0; ++ //printf("Setting %d char online\n",RFIFOL(fd,2)); ++ set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6)); ++ RFIFOSKIP(fd,10); ++ break; ++ ++ // Request sending of fame list ++ case 0x2b1a: ++ if (RFIFOREST(fd) < 2) + return 0; + { +- struct global_reg reg[ACCOUNT_REG2_NUM]; +- int p, acc; +- acc = RFIFOL(fd,4); +- for(p = 8, j = 0; p < RFIFOW(fd,2) && j < ACCOUNT_REG2_NUM; p += 36, j++) { +- memcpy(reg[j].str, RFIFOP(fd,p), 32); +- reg[j].value = RFIFOL(fd, p+32); ++ int i, j, k, len = 8; ++ unsigned char buf[32000]; ++ struct fame_list fame_item; ++ //struct mmo_charstatus *dat; ++ //dat = (struct mmo_charstatus *)aCalloc(char_num, sizeof(struct mmo_charstatus *)); ++ CREATE_BUFFER(id, int, char_num); ++ ++ // copy character list into buffer ++ //for (i = 0; i < char_num; i++) ++ // dat[i] = char_dat[i]; ++ // sort according to fame ++ // qsort(dat, char_num, sizeof(struct mmo_charstatus *), sort_fame); ++ ++ for(i = 0; i < char_num; i++) { ++ id[i] = i; ++ for(j = 0; j < i; j++) { ++ if (char_dat[i].status.fame > char_dat[id[j]].status.fame) { ++ for(k = i; k > j; k--) ++ id[k] = id[k-1]; ++ id[j] = i; // id[i] ++ break; + } +- set_account_reg2(acc, j, reg); +- // loginサーバーへ送る +- if (login_fd > 0) { // don't send request if no login-server +- WFIFOW(login_fd, 0) = 0x2728; +- memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0), RFIFOW(fd,2)); +- WFIFOSET(login_fd, WFIFOW(login_fd,2)); + } +- // ワールドへの同垢ログインがなければmapサーバーに送る必要はない +- //memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2)); +- //WBUFW(buf,0) = 0x2b11; +- //mapif_sendall(buf, WBUFW(buf,2)); ++ } ++ ++ // starting to send to map ++ WBUFW(buf,0) = 0x2b1b; ++ // add list for blacksmiths ++ for (i = 0, j = 0; i < char_num && j < fame_list_size_smith; i++) { ++ if (char_dat[id[i]].status.fame && (char_dat[id[i]].status.class_ == 10 || ++ char_dat[id[i]].status.class_ == 4011 || ++ char_dat[id[i]].status.class_ == 4033)) ++ { ++ fame_item.id = char_dat[id[i]].status.char_id; ++ fame_item.fame = char_dat[id[i]].status.fame; ++ strncpy(fame_item.name, char_dat[id[i]].status.name, NAME_LENGTH); ++ ++ memcpy(WBUFP(buf, len), &fame_item, sizeof(struct fame_list)); ++ len += sizeof(struct fame_list); ++ j++; ++ } ++ } ++ // add blacksmith's block length ++ WBUFW(buf, 6) = len; ++ ++ // add list for alchemists ++ for (i = 0, j = 0; i < char_num && j < fame_list_size_chemist; i++) { ++ if (char_dat[id[i]].status.fame && (char_dat[id[i]].status.class_ == 18 || ++ char_dat[id[i]].status.class_ == 4019 || ++ char_dat[id[i]].status.class_ == 4041)) ++ { ++ fame_item.id = char_dat[id[i]].status.char_id; ++ fame_item.fame = char_dat[id[i]].status.fame; ++ strncpy(fame_item.name, char_dat[id[i]].status.name, NAME_LENGTH); ++ ++ memcpy(WBUFP(buf, len), &fame_item, sizeof(struct fame_list)); ++ len += sizeof(struct fame_list); ++ j++; ++ } ++ } ++ // add alchemist's block length ++ WBUFW(buf, 4) = len; ++ ++ // adding list for taekwons ++ for (i = 0, j = 0; i < char_num && j < fame_list_size_taekwon; i++) { ++ if (char_dat[id[i]].status.fame && char_dat[id[i]].status.class_ == 4046) ++ { ++ fame_item.id = char_dat[id[i]].status.char_id; ++ fame_item.fame = char_dat[id[i]].status.fame; ++ strncpy(fame_item.name, char_dat[id[i]].status.name, NAME_LENGTH); ++ ++ memcpy(WBUFP(buf, len), &fame_item, sizeof(struct fame_list)); ++ len += sizeof(struct fame_list); ++ j++; ++ } ++ } ++ // add total packet length ++ WBUFW(buf, 2) = len; ++ ++ // sending to all maps ++ mapif_sendall(buf, len); ++ // done! ++ //aFree(dat); ++ DELETE_BUFFER(id); ++ RFIFOSKIP(fd,2); ++ break; ++ } ++ //Request to save status change data. [Skotlex] ++ case 0x2b1c: ++ if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2)) ++ return 0; ++ { ++#ifdef ENABLE_SC_SAVING ++ int count, aid, cid, i; ++ struct scdata *data; ++ aid = RFIFOL(fd, 4); ++ cid = RFIFOL(fd, 8); ++ count = RFIFOW(fd, 12); ++ data = status_search_scdata(aid, cid); ++ if (data->count != count) ++ { ++ data->count = count; ++ data->data = aRealloc(data->data, count*sizeof(struct status_change_data)); ++ } ++ for (i = 0; i < count; i++) ++ memcpy (&data->data[i], RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data)); ++#endif + RFIFOSKIP(fd, RFIFOW(fd,2)); +-// printf("char: save_account_reg (from map)\n"); + break; + } +- + default: + // inter server処理に渡す + { +@@ -2264,7 +2985,7 @@ + return 0; + } + // inter server処理でもない場合は切断 +- printf("char: unknown packet 0x%04x (%d bytes to read in buffer)! (from map).\n", RFIFOW(fd,0), RFIFOREST(fd)); ++ ShowError("Unknown packet 0x%04x from map server, disconnecting.\n", RFIFOW(fd,0)); + session[fd]->eof = 1; + return 0; + } +@@ -2272,28 +2993,20 @@ + return 0; + } + +-int search_mapserver(char *map) { ++int search_mapserver(unsigned short map, long ip, short port) { + int i, j; +- char temp_map[16]; +- int temp_map_len; +- +-// printf("Searching the map-server for map '%s'... ", map); +- strncpy(temp_map, map, sizeof(temp_map)); +- temp_map[sizeof(temp_map)-1] = '\0'; +- if (strchr(temp_map, '.') != NULL) +- temp_map[strchr(temp_map, '.') - temp_map + 1] = '\0'; // suppress the '.gat', but conserve the '.' to be sure of the name of the map + +- temp_map_len = strlen(temp_map); + for(i = 0; i < MAX_MAP_SERVERS; i++) + if (server_fd[i] >= 0) +- for (j = 0; server[i].map[j][0]; j++) +- //printf("%s : %s = %d\n", server[i].map[j], map, strncmp(server[i].map[j], temp_map, temp_map_len)); +- if (strncmp(server[i].map[j], temp_map, temp_map_len) == 0) { +-// printf("found -> server #%d.\n", i); ++ for (j = 0; server[i].map[j]; j++) ++ if (server[i].map[j] == map) { ++ if (ip > 0 && server[i].ip != ip) ++ continue; ++ if (port > 0 && server[i].port != port) ++ continue; + return i; + } + +-// printf("not found.\n"); + return -1; + } + +@@ -2302,48 +3015,81 @@ + return inter_mapif_init(fd); + } + +-//----------------------------------------------------- +-// Test to know if an IP come from LAN or WAN. by [Yor] +-//----------------------------------------------------- +-int lan_ip_check(unsigned char *p){ ++//-------------------------------------------- ++// Test to know if an IP come from LAN or WAN. ++// Rewrote: Adnvanced subnet check [LuzZza] ++//-------------------------------------------- ++int lan_subnetcheck(long *p) { ++ + int i; +- int lancheck = 1; ++ unsigned char *sbn, *msk, *src = (unsigned char *)p; + +-// printf("lan_ip_check: to compare: %d.%d.%d.%d, network: %d.%d.%d.%d/%d.%d.%d.%d\n", +-// p[0], p[1], p[2], p[3], +-// subneti[0], subneti[1], subneti[2], subneti[3], +-// subnetmaski[0], subnetmaski[1], subnetmaski[2], subnetmaski[3]); +- for(i = 0; i < 4; i++) { +- if ((subneti[i] & subnetmaski[i]) != (p[i] & subnetmaski[i])) { +- lancheck = 0; +- break; ++ for(i=0; iclient_addr.sin_addr; ++ long subnet_map_ip; ++ ++ RFIFOHEAD(fd); ++ ++ sd = (struct char_session_data*)session[fd]->session_data; + +- if (login_fd < 0 || session[fd]->eof) { // disconnect any player (already connected to char-server or coming back from map-server) if login-server is diconnected. ++ if (login_fd < 0) ++ session[fd]->eof = 1; ++ if(session[fd]->eof) { // disconnect any player (already connected to char-server or coming back from map-server) if login-server is diconnected. + if (fd == login_fd) + login_fd = -1; +- close(fd); +- delete_session(fd); ++ if (sd != NULL) ++ { ++ struct online_char_data* data = idb_get(online_char_db, sd->account_id); ++ if (!data || data->server== -1) //If it is not in any server, send it offline. [Skotlex] ++ set_char_offline(99,sd->account_id); ++ } ++ do_close(fd); + return 0; + } + +- sd = session[fd]->session_data; ++ while(RFIFOREST(fd) >= 2 && !session[fd]->eof) { ++ cmd = RFIFOW(fd,0); ++ // crc32のスキップ用 ++ if( sd==NULL && // 未ログインor管理パケット ++ RFIFOREST(fd)>=4 && // 最低バイト数制限 & 0x7530,0x7532管理パケ除去 ++ RFIFOREST(fd)<=21 && // 最大バイト数制限 & サーバーログイン除去 ++ cmd!=0x20b && // md5通知パケット除去 ++ (RFIFOREST(fd)<6 || RFIFOW(fd,4)==0x65) ){ // 次に何かパケットが来てるなら、接続でないとだめ ++ RFIFOSKIP(fd,4); ++ cmd = RFIFOW(fd,0); ++ ShowDebug("parse_char : %d crc32 skipped\n",fd); ++ if(RFIFOREST(fd)==0) ++ return 0; ++ } + +- while (RFIFOREST(fd) >= 2) { +-// if (RFIFOW(fd,0) < 30000) +-// printf("parse_char: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd)); ++//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) { RFIFOSKIP(fd,rest); return 0; } } + +- switch(RFIFOW(fd,0)) { ++ switch(cmd){ + case 0x20b: //20040622暗号化ragexe対応 + if (RFIFOREST(fd) < 19) + return 0; +@@ -2356,13 +3102,15 @@ + { + int GM_value; + if ((GM_value = isGM(RFIFOL(fd,2)))) +- printf("Account Logged On; Account ID: %d (GM level %d).\n", RFIFOL(fd,2), GM_value); ++ ShowInfo("Account Logged On; Account ID: %d (GM level %d).\n", RFIFOL(fd,2), GM_value); + else +- printf("Account Logged On; Account ID: %d.\n", RFIFOL(fd,2)); ++ ShowInfo("Account Logged On; Account ID: %d.\n", RFIFOL(fd,2)); + if (sd == NULL) { +- sd = session[fd]->session_data = calloc(sizeof(struct char_session_data), 1); +- memset(sd, 0, sizeof(struct char_session_data)); +- memcpy(sd->email, "no mail", 40); // put here a mail without '@' to refuse deletion if we don't receive the e-mail ++ sd = (struct char_session_data*)aCalloc(sizeof(struct char_session_data), 1); ++ session[fd]->session_data = sd; ++ ++// memset(sd, 0, sizeof(struct char_session_data)); aCalloc does this [Skotlex] ++ strncpy(sd->email, "no mail", 40); // put here a mail without '@' to refuse deletion if we don't receive the e-mail + sd->connect_until_time = 0; // unknow or illimited (not displaying on map-server) + } + sd->account_id = RFIFOL(fd,2); +@@ -2370,6 +3118,7 @@ + sd->login_id2 = RFIFOL(fd,10); + sd->sex = RFIFOB(fd,16); + // send back account_id ++ WFIFOHEAD(fd, 4); + WFIFOL(fd,0) = RFIFOL(fd,2); + WFIFOSET(fd,4); + // search authentification +@@ -2382,6 +3131,44 @@ + (!check_ip_flag || auth_fifo[i].ip == session[fd]->client_addr.sin_addr.s_addr) && + auth_fifo[i].delflag == 2) { + auth_fifo[i].delflag = 1; ++ ++ if (online_check) ++ { // check if character is not online already. [Skotlex] ++ struct online_char_data* character; ++ character = idb_get(online_char_db, sd->account_id); ++ ++ if (character) ++ { ++ if(character->server > -1) ++ { //Kick it from the map server it is on. ++ mapif_disconnectplayer(server_fd[character->server], character->account_id, character->char_id, 2); ++ if (!character->waiting_disconnect) ++ add_timer(gettick()+20000, chardb_waiting_disconnect, character->account_id, 0); ++ character->waiting_disconnect = 1; ++ /* Not a good idea because this would trigger when you do a char-change from the map server! [Skotlex] ++ } else { //Manual kick from char server. ++ struct char_session_data *tsd; ++ int i; ++ for(i = 0; i < fd_max; i++) { ++ if (session[i] && i!=fd && (tsd = (struct char_session_data*)session[i]->session_data) && tsd->account_id == sd->account_id) ++ { ++ WFIFOW(i,0) = 0x81; ++ WFIFOB(i,2) = 2; ++ WFIFOSET(i,3); ++ break; ++ } ++ } ++ if (i == fd_max) //Shouldn't happen, but just in case. ++ set_char_offline(99, sd->account_id); ++ */ ++ WFIFOW(fd,0) = 0x81; ++ WFIFOB(fd,2) = 8; ++ WFIFOSET(fd,3); ++ break; ++ } ++ } ++ } ++ + if (max_connect_user == 0 || count_users() < max_connect_user) { + if (login_fd > 0) { // don't send request if no login-server + // request to login-server to obtain e-mail/time limit +@@ -2421,89 +3208,103 @@ + break; + + case 0x66: // キャラ選択 +- if (RFIFOREST(fd) < 3) +- return 0; ++ FIFOSD_CHECK(3); ++ { ++ int char_num = RFIFOB(fd,2); ++ struct mmo_charstatus *cd; ++ RFIFOSKIP(fd,3); + + // if we activated email creation and email is default email + if (email_creation != 0 && strcmp(sd->email, "a@a.com") == 0 && login_fd > 0) { // to modify an e-mail, login-server must be online ++ WFIFOHEAD(fd, 3); + WFIFOW(fd, 0) = 0x70; + WFIFOB(fd, 2) = 0; // 00 = Incorrect Email address + WFIFOSET(fd, 3); +- ++ break; ++ } + // otherwise, load the character +- } else { + for (ch = 0; ch < 9; ch++) +- if (sd->found_char[ch] >= 0 && char_dat[sd->found_char[ch]].char_num == RFIFOB(fd,2)) ++ if (sd->found_char[ch] >= 0 && char_dat[sd->found_char[ch]].status.char_num == char_num) + break; +- if (ch != 9) { ++ if (ch == 9) ++ { //Not found?? May be forged packet. ++ break; ++ } ++ cd = &char_dat[sd->found_char[ch]].status; + char_log("Character Selected, Account ID: %d, Character Slot: %d, Character Name: %s." RETCODE, +- sd->account_id, RFIFOB(fd,2), char_dat[sd->found_char[ch]].name); ++ sd->account_id, char_num, cd->name); ++ ++ cd->sex = sd->sex; ++ + // searching map server +- i = search_mapserver(char_dat[sd->found_char[ch]].last_point.map); ++ i = search_mapserver(cd->last_point.map,-1,-1); + // if map is not found, we check major cities + if (i < 0) { +- if ((i = search_mapserver("prontera.gat")) >= 0) { // check is done without 'gat'. +- memcpy(char_dat[sd->found_char[ch]].last_point.map, "prontera.gat", 16); +- char_dat[sd->found_char[ch]].last_point.x = 273; // savepoint coordonates +- char_dat[sd->found_char[ch]].last_point.y = 354; +- } else if ((i = search_mapserver("geffen.gat")) >= 0) { // check is done without 'gat'. +- memcpy(char_dat[sd->found_char[ch]].last_point.map, "geffen.gat", 16); +- char_dat[sd->found_char[ch]].last_point.x = 120; // savepoint coordonates +- char_dat[sd->found_char[ch]].last_point.y = 100; +- } else if ((i = search_mapserver("morocc.gat")) >= 0) { // check is done without 'gat'. +- memcpy(char_dat[sd->found_char[ch]].last_point.map, "morocc.gat", 16); +- char_dat[sd->found_char[ch]].last_point.x = 160; // savepoint coordonates +- char_dat[sd->found_char[ch]].last_point.y = 94; +- } else if ((i = search_mapserver("alberta.gat")) >= 0) { // check is done without 'gat'. +- memcpy(char_dat[sd->found_char[ch]].last_point.map, "alberta.gat", 16); +- char_dat[sd->found_char[ch]].last_point.x = 116; // savepoint coordonates +- char_dat[sd->found_char[ch]].last_point.y = 57; +- } else if ((i = search_mapserver("payon.gat")) >= 0) { // check is done without 'gat'. +- memcpy(char_dat[sd->found_char[ch]].last_point.map, "payon.gat", 16); +- char_dat[sd->found_char[ch]].last_point.x = 87; // savepoint coordonates +- char_dat[sd->found_char[ch]].last_point.y = 117; +- } else if ((i = search_mapserver("izlude.gat")) >= 0) { // check is done without 'gat'. +- memcpy(char_dat[sd->found_char[ch]].last_point.map, "izlude.gat", 16); +- char_dat[sd->found_char[ch]].last_point.x = 94; // savepoint coordonates +- char_dat[sd->found_char[ch]].last_point.y = 103; ++ unsigned short j; ++ ShowWarning("Unable to find map-server for '%s', resorting to sending to a major city.\n", mapindex_id2name(cd->last_point.map)); ++ if ((i = search_mapserver((j=mapindex_name2id(MAP_PRONTERA)),-1,-1)) >= 0) { ++ cd->last_point.map = j; ++ cd->last_point.x = 273; // savepoint coordinates ++ cd->last_point.y = 354; ++ } else if ((i = search_mapserver((j=mapindex_name2id(MAP_GEFFEN)),-1,-1)) >= 0) { ++ cd->last_point.map = j; ++ cd->last_point.x = 120; // savepoint coordinates ++ cd->last_point.y = 100; ++ } else if ((i = search_mapserver((j=mapindex_name2id(MAP_MORROC)),-1,-1)) >= 0) { ++ cd->last_point.map = j; ++ cd->last_point.x = 160; // savepoint coordinates ++ cd->last_point.y = 94; ++ } else if ((i = search_mapserver((j=mapindex_name2id(MAP_ALBERTA)),-1,-1)) >= 0) { ++ cd->last_point.map = j; ++ cd->last_point.x = 116; // savepoint coordinates ++ cd->last_point.y = 57; ++ } else if ((i = search_mapserver((j=mapindex_name2id(MAP_PAYON)),-1,-1)) >= 0) { ++ cd->last_point.map = j; ++ cd->last_point.x = 87; // savepoint coordinates ++ cd->last_point.y = 117; ++ } else if ((i = search_mapserver((j=mapindex_name2id(MAP_IZLUDE)),-1,-1)) >= 0) { ++ cd->last_point.map = j; ++ cd->last_point.x = 94; // savepoint coordinates ++ cd->last_point.y = 103; + } else { +- int j; + // get first online server (with a map) + i = 0; + for(j = 0; j < MAX_MAP_SERVERS; j++) +- if (server_fd[j] >= 0 && server[j].map[0][0]) { // change save point to one of map found on the server (the first) ++ if (server_fd[j] >= 0 && server[j].map[0]) { // change save point to one of map found on the server (the first) + i = j; +- memcpy(char_dat[sd->found_char[ch]].last_point.map, server[j].map[0], 16); +- printf("Map-server #%d found with a map: '%s'.\n", j, server[j].map[0]); +- // coordonates are unknown ++ cd->last_point.map = server[j].map[0]; ++ ShowInfo("Map-server #%d found with a map: '%s'.\n", j, mapindex_id2name(server[j].map[0])); ++ // coordinates are unknown + break; + } + // if no map-server is connected, we send: server closed + if (j == MAX_MAP_SERVERS) { ++ WFIFOHEAD(fd, 3); + WFIFOW(fd,0) = 0x81; +- WFIFOL(fd,2) = 1; // 01 = Server closed ++ WFIFOB(fd,2) = 1; // 01 = Server closed + WFIFOSET(fd,3); +- RFIFOSKIP(fd,3); + break; + } + } + } ++ WFIFOHEAD(fd, 28); + WFIFOW(fd,0) = 0x71; +- WFIFOL(fd,2) = char_dat[sd->found_char[ch]].char_id; +- memcpy(WFIFOP(fd,6), char_dat[sd->found_char[ch]].last_point.map, 16); +- printf("Character selection '%s' (account: %d, slot: %d).\n", char_dat[sd->found_char[ch]].name, sd->account_id, ch); +- printf("--Send IP of map-server. "); +- if (lan_ip_check(p)) +- WFIFOL(fd, 22) = inet_addr(lan_map_ip); ++ WFIFOL(fd,2) = cd->char_id; ++ memcpy(WFIFOP(fd,6), mapindex_id2name(cd->last_point.map), MAP_NAME_LENGTH); ++ ShowInfo("Character selection '%s' (account: %d, slot: %d).\n", cd->name, sd->account_id, ch); ++ ++ // Andvanced subnet check [LuzZza] ++ if((subnet_map_ip = lan_subnetcheck((long *)p))) ++ WFIFOL(fd,22) = subnet_map_ip; + else + WFIFOL(fd, 22) = server[i].ip; ++ + WFIFOW(fd,26) = server[i].port; + WFIFOSET(fd,28); + if (auth_fifo_pos >= AUTH_FIFO_SIZE) + auth_fifo_pos = 0; +- //printf("auth_fifo set #%d - account %d, char: %d, secure: %08x-%08x\n", auth_fifo_pos, sd->account_id, char_dat[sd->found_char[ch]].char_id, sd->login_id1, sd->login_id2); + auth_fifo[auth_fifo_pos].account_id = sd->account_id; +- auth_fifo[auth_fifo_pos].char_id = char_dat[sd->found_char[ch]].char_id; ++ auth_fifo[auth_fifo_pos].char_id = cd->char_id; + auth_fifo[auth_fifo_pos].login_id1 = sd->login_id1; + auth_fifo[auth_fifo_pos].login_id2 = sd->login_id2; + auth_fifo[auth_fifo_pos].delflag = 0; +@@ -2511,62 +3312,109 @@ + auth_fifo[auth_fifo_pos].sex = sd->sex; + auth_fifo[auth_fifo_pos].connect_until_time = sd->connect_until_time; + auth_fifo[auth_fifo_pos].ip = session[fd]->client_addr.sin_addr.s_addr; +- auth_fifo_pos++; ++ ++ //Send NEW auth packet [Kevin] ++ if ((map_fd = server_fd[i]) < 1 || session[map_fd] == NULL) ++ { //0 Should not be a valid server_fd [Skotlex] ++ ShowError("parse_char: Attempting to write to invalid session %d! Map Server #%d disconnected.\n", map_fd, i); ++ server_fd[i] = -1; ++ memset(&server[i], 0, sizeof(struct mmo_map_server)); ++ //Send server closed. ++ WFIFOW(fd,0) = 0x81; ++ WFIFOB(fd,2) = 1; // 01 = Server closed ++ WFIFOSET(fd,3); ++ break; + } ++ WFIFOW(map_fd,0) = 0x2afd; ++ WFIFOW(map_fd,2) = 20 + sizeof(struct mmo_charstatus); ++ WFIFOL(map_fd,4) = auth_fifo[auth_fifo_pos].account_id; ++ WFIFOL(map_fd,8) = auth_fifo[auth_fifo_pos].login_id1; ++ WFIFOL(map_fd,16) = auth_fifo[auth_fifo_pos].login_id2; ++ WFIFOL(map_fd,12) = (unsigned long)auth_fifo[auth_fifo_pos].connect_until_time; ++ memcpy(WFIFOP(map_fd,20), cd, sizeof(struct mmo_charstatus)); ++ WFIFOSET(map_fd, WFIFOW(map_fd,2)); ++ ++ set_char_online(i, cd->char_id, cd->account_id); ++ //Sets char online in the party and breaks even share if needed. ++ inter_party_logged(cd->party_id, cd->account_id, cd->char_id); ++ ++ auth_fifo_pos++; + } +- RFIFOSKIP(fd,3); + break; + + case 0x67: // 作成 +- if (RFIFOREST(fd) < 37) +- return 0; ++ FIFOSD_CHECK(37); ++ ++ if(char_new == 0) //turn character creation on/off [Kevin] ++ i = -2; ++ else + i = make_new_char(fd, RFIFOP(fd,2)); +- if (i < 0) { ++ ++ if(i == -1){ //added some better faile reporting to client on the txt version [Kevin] ++ //already exists ++ WFIFOHEAD(fd, 3); + WFIFOW(fd,0) = 0x6e; + WFIFOB(fd,2) = 0x00; + WFIFOSET(fd,3); + RFIFOSKIP(fd,37); + break; ++ }else if(i == -2){ ++ //denied ++ WFIFOHEAD(fd, 3); ++ WFIFOW(fd, 0) = 0x6e; ++ WFIFOB(fd, 2) = 0x02; ++ WFIFOSET(fd, 3); ++ RFIFOSKIP(fd, 37); ++ break; ++ }else if(i == -3){ ++ //underaged XD ++ WFIFOHEAD(fd, 3); ++ WFIFOW(fd, 0) = 0x6e; ++ WFIFOB(fd, 2) = 0x01; ++ WFIFOSET(fd, 3); ++ RFIFOSKIP(fd, 37); ++ break; + } + ++ WFIFOHEAD(fd, 108); + WFIFOW(fd,0) = 0x6d; + memset(WFIFOP(fd,2), 0, 106); + +- WFIFOL(fd,2) = char_dat[i].char_id; +- WFIFOL(fd,2+4) = char_dat[i].base_exp; +- WFIFOL(fd,2+8) = char_dat[i].zeny; +- WFIFOL(fd,2+12) = char_dat[i].job_exp; +- WFIFOL(fd,2+16) = char_dat[i].job_level; ++ WFIFOL(fd,2) = char_dat[i].status.char_id; ++ WFIFOL(fd,2+4) = char_dat[i].status.base_exp>LONG_MAX?LONG_MAX:char_dat[i].status.base_exp; ++ WFIFOL(fd,2+8) = char_dat[i].status.zeny; ++ WFIFOL(fd,2+12) = char_dat[i].status.job_exp>LONG_MAX?LONG_MAX:char_dat[i].status.job_exp; ++ WFIFOL(fd,2+16) = char_dat[i].status.job_level; + +- WFIFOL(fd,2+28) = char_dat[i].karma; +- WFIFOL(fd,2+32) = char_dat[i].manner; ++ WFIFOL(fd,2+28) = char_dat[i].status.karma; ++ WFIFOL(fd,2+32) = char_dat[i].status.manner; + + WFIFOW(fd,2+40) = 0x30; +- WFIFOW(fd,2+42) = (char_dat[i].hp > 0x7fff) ? 0x7fff : char_dat[i].hp; +- WFIFOW(fd,2+44) = (char_dat[i].max_hp > 0x7fff) ? 0x7fff : char_dat[i].max_hp; +- WFIFOW(fd,2+46) = (char_dat[i].sp > 0x7fff) ? 0x7fff : char_dat[i].sp; +- WFIFOW(fd,2+48) = (char_dat[i].max_sp > 0x7fff) ? 0x7fff : char_dat[i].max_sp; +- WFIFOW(fd,2+50) = DEFAULT_WALK_SPEED; // char_dat[i].speed; +- WFIFOW(fd,2+52) = char_dat[i].class; +- WFIFOW(fd,2+54) = char_dat[i].hair; +- +- WFIFOW(fd,2+58) = char_dat[i].base_level; +- WFIFOW(fd,2+60) = char_dat[i].skill_point; +- +- WFIFOW(fd,2+64) = char_dat[i].shield; +- WFIFOW(fd,2+66) = char_dat[i].head_top; +- WFIFOW(fd,2+68) = char_dat[i].head_mid; +- WFIFOW(fd,2+70) = char_dat[i].hair_color; +- +- memcpy(WFIFOP(fd,2+74), char_dat[i].name, 24); +- +- WFIFOB(fd,2+98) = (char_dat[i].str > 255) ? 255 : char_dat[i].str; +- WFIFOB(fd,2+99) = (char_dat[i].agi > 255) ? 255 : char_dat[i].agi; +- WFIFOB(fd,2+100) = (char_dat[i].vit > 255) ? 255 : char_dat[i].vit; +- WFIFOB(fd,2+101) = (char_dat[i].int_ > 255) ? 255 : char_dat[i].int_; +- WFIFOB(fd,2+102) = (char_dat[i].dex > 255) ? 255 : char_dat[i].dex; +- WFIFOB(fd,2+103) = (char_dat[i].luk > 255) ? 255 : char_dat[i].luk; +- WFIFOB(fd,2+104) = char_dat[i].char_num; ++ WFIFOW(fd,2+42) = (char_dat[i].status.hp > 0x7fff) ? 0x7fff : char_dat[i].status.hp; ++ WFIFOW(fd,2+44) = (char_dat[i].status.max_hp > 0x7fff) ? 0x7fff : char_dat[i].status.max_hp; ++ WFIFOW(fd,2+46) = (char_dat[i].status.sp > 0x7fff) ? 0x7fff : char_dat[i].status.sp; ++ WFIFOW(fd,2+48) = (char_dat[i].status.max_sp > 0x7fff) ? 0x7fff : char_dat[i].status.max_sp; ++ WFIFOW(fd,2+50) = DEFAULT_WALK_SPEED; // char_dat[i].status.speed; ++ WFIFOW(fd,2+52) = char_dat[i].status.class_; ++ WFIFOW(fd,2+54) = char_dat[i].status.hair; ++ ++ WFIFOW(fd,2+58) = char_dat[i].status.base_level; ++ WFIFOW(fd,2+60) = char_dat[i].status.skill_point; ++ ++ WFIFOW(fd,2+64) = char_dat[i].status.shield; ++ WFIFOW(fd,2+66) = char_dat[i].status.head_top; ++ WFIFOW(fd,2+68) = char_dat[i].status.head_mid; ++ WFIFOW(fd,2+70) = char_dat[i].status.hair_color; ++ ++ memcpy(WFIFOP(fd,2+74), char_dat[i].status.name, NAME_LENGTH); ++ ++ WFIFOB(fd,2+98) = (char_dat[i].status.str > 255) ? 255 : char_dat[i].status.str; ++ WFIFOB(fd,2+99) = (char_dat[i].status.agi > 255) ? 255 : char_dat[i].status.agi; ++ WFIFOB(fd,2+100) = (char_dat[i].status.vit > 255) ? 255 : char_dat[i].status.vit; ++ WFIFOB(fd,2+101) = (char_dat[i].status.int_ > 255) ? 255 : char_dat[i].status.int_; ++ WFIFOB(fd,2+102) = (char_dat[i].status.dex > 255) ? 255 : char_dat[i].status.dex; ++ WFIFOB(fd,2+103) = (char_dat[i].status.luk > 255) ? 255 : char_dat[i].status.luk; ++ WFIFOB(fd,2+104) = char_dat[i].status.char_num; + + WFIFOSET(fd,108); + RFIFOSKIP(fd,37); +@@ -2578,8 +3426,8 @@ + } + + case 0x68: // delete char //Yor's Fix +- if (RFIFOREST(fd) < 46) +- return 0; ++ FIFOSD_CHECK(46); ++ + memcpy(email, RFIFOP(fd,6), 40); + if (e_mail_check(email) == 0) + strncpy(email, "a@a.com", 40); // default e-mail +@@ -2596,7 +3444,7 @@ + } else { + // we change the packet to set it like selection. + for (i = 0; i < 9; i++) +- if (char_dat[sd->found_char[i]].char_id == RFIFOL(fd,2)) { ++ if (char_dat[sd->found_char[i]].status.char_id == RFIFOL(fd,2)) { + // we save new e-mail + memcpy(sd->email, email, 40); + // we send new e-mail to login-server ('online' login-server is checked before) +@@ -2608,7 +3456,7 @@ + RFIFOSKIP(fd,43); + // change value to put new packet (char selection) + RFIFOW(fd, 0) = 0x66; +- RFIFOB(fd, 2) = char_dat[sd->found_char[i]].char_num; ++ RFIFOB(fd, 2) = char_dat[sd->found_char[i]].status.char_num; + // not send packet, it's modify of actual packet + break; + } +@@ -2630,7 +3478,7 @@ + } else { + for (i = 0; i < 9; i++) { + struct mmo_charstatus *cs = NULL; +- if ((cs = &char_dat[sd->found_char[i]])->char_id == RFIFOL(fd,2)) { ++ if ((cs = &char_dat[sd->found_char[i]].status)->char_id == RFIFOL(fd,2)) { + char_delete(cs); // deletion process + + if (sd->found_char[i] != char_num - 1) { +@@ -2640,8 +3488,8 @@ + int j, k; + struct char_session_data *sd2; + for (j = 0; j < fd_max; j++) { +- if (session[j] && (sd2 = session[j]->session_data) && +- sd2->account_id == char_dat[char_num-1].account_id) { ++ if (session[j] && (sd2 = (struct char_session_data*)session[j]->session_data) && ++ sd2->account_id == char_dat[char_num-1].status.account_id) { + for (k = 0; k < 9; k++) { + if (sd2->found_char[k] == char_num-1) { + sd2->found_char[k] = sd->found_char[i]; +@@ -2682,7 +3530,7 @@ + if (server_fd[i] < 0) + break; + } +- if (i == MAX_MAP_SERVERS || strcmp(RFIFOP(fd,2), userid) || strcmp(RFIFOP(fd,26), passwd)){ ++ if (i == MAX_MAP_SERVERS || strcmp((char*)RFIFOP(fd,2), userid) || strcmp((char*)RFIFOP(fd,26), passwd)){ + WFIFOB(fd,2) = 3; + WFIFOSET(fd,3); + RFIFOSKIP(fd,60); +@@ -2691,8 +3539,6 @@ + WFIFOB(fd,2) = 0; + session[fd]->func_parse = parse_frommap; + server_fd[i] = fd; +- if(anti_freeze_enable) +- server_freezeflag[i] = 5; // Map anti-freeze system. Counter. 5 ok, 4...0 freezed + server[i].ip = RFIFOL(fd,54); + server[i].port = RFIFOW(fd,58); + server[i].users = 0; +@@ -2735,9 +3581,6 @@ + return 0; + + case 0x7532: // 接続の切断(defaultと処理は一緒だが明示的にするため) +- session[fd]->eof = 1; +- return 0; +- + default: + session[fd]->eof = 1; + return 0; +@@ -2747,6 +3590,30 @@ + return 0; + } + ++// Console Command Parser [Wizputer] ++int parse_console(char *buf) { ++ char *type,*command; ++ ++ type = (char *)aCalloc(64,1); ++ command = (char *)aCalloc(64,1); ++ ++// memset(type,0,64); ++// memset(command,0,64); ++ ++ ShowStatus("Console: %s\n",buf); ++ ++ if ( sscanf(buf, "%[^:]:%[^\n]", type , command ) < 2 ) ++ sscanf(buf,"%[^\n]",type); ++ ++ ShowDebug("Type of command: %s || Command: %s \n",type,command); ++ ++ if(buf) aFree(buf); ++ if(type) aFree(type); ++ if(command) aFree(command); ++ ++ return 0; ++} ++ + // 全てのMAPサーバーにデータ送信(送信したmap鯖の数を返す) + int mapif_sendall(unsigned char *buf, unsigned int len) { + int i, c; +@@ -2755,6 +3622,16 @@ + for(i = 0; i < MAX_MAP_SERVERS; i++) { + int fd; + if ((fd = server_fd[i]) >= 0) { ++ if (session[fd] == NULL) ++ { //Could this be the crash's source? [Skotlex] ++ ShowError("mapif_sendall: Attempting to write to invalid session %d! Map Server #%d disconnected.\n", fd, i); ++ server_fd[i] = -1; ++ memset(&server[i], 0, sizeof(struct mmo_map_server)); ++ continue; ++ } ++ WFIFOHEAD(fd, len); ++ if (WFIFOSPACE(fd) < len) //Increase buffer size. ++ realloc_writefifo(fd, len); + memcpy(WFIFOP(fd,0), buf, len); + WFIFOSET(fd,len); + c++; +@@ -2771,6 +3648,9 @@ + for(i = 0; i < MAX_MAP_SERVERS; i++) { + int fd; + if ((fd = server_fd[i]) >= 0 && fd != sfd) { ++ WFIFOHEAD(fd, len); ++ if (WFIFOSPACE(fd) < len) //Increase buffer size. ++ realloc_writefifo(fd, len); + memcpy(WFIFOP(fd,0), buf, len); + WFIFOSET(fd, len); + c++; +@@ -2785,6 +3665,9 @@ + if (fd >= 0) { + for(i = 0; i < MAX_MAP_SERVERS; i++) { + if (fd == server_fd[i]) { ++ WFIFOHEAD(fd, len); ++ if (WFIFOSPACE(fd) < len) //Increase buffer size. ++ realloc_writefifo(fd, len); + memcpy(WFIFOP(fd,0), buf, len); + WFIFOSET(fd,len); + return 1; +@@ -2796,10 +3679,11 @@ + + int send_users_tologin(int tid, unsigned int tick, int id, int data) { + int users = count_users(); +- char buf[16]; ++ unsigned char buf[16]; + + if (login_fd > 0 && session[login_fd]) { + // send number of user to login server ++ WFIFOHEAD(login_fd, 6); + WFIFOW(login_fd,0) = 0x2714; + WFIFOL(login_fd,2) = users; + WFIFOSET(login_fd,6); +@@ -2812,17 +3696,52 @@ + return 0; + } + ++static int send_accounts_tologin_sub(DBKey key, void* data, va_list ap) { ++ struct online_char_data* character = (struct online_char_data*)data; ++ int *i = va_arg(ap, int*); ++ int count = va_arg(ap, int); ++ if ((*i) >= count) ++ return 0; //This is an error that shouldn't happen.... ++ if(character->server > -1) { ++ WFIFOHEAD(login_fd, 8+count*4); ++ WFIFOL(login_fd, 8+(*i)*4) =character->account_id; ++ (*i)++; ++ return 1; ++ } ++ return 0; ++} ++ ++int send_accounts_tologin(int tid, unsigned int tick, int id, int data) { ++ int users = count_users(), i=0; ++ ++ if (login_fd > 0 && session[login_fd]) { ++ // send account list to login server ++ WFIFOHEAD(login_fd, 8+users*4); ++ WFIFOW(login_fd,0) = 0x272d; ++ WFIFOL(login_fd,4) = users; ++ online_char_db->foreach(online_char_db, send_accounts_tologin_sub, &i); ++ WFIFOW(login_fd,2) = 8+ i*4; ++ if (i > 0) ++ WFIFOSET(login_fd,WFIFOW(login_fd,2)); ++ } ++ return 0; ++} ++ + int check_connect_login_server(int tid, unsigned int tick, int id, int data) { + if (login_fd <= 0 || session[login_fd] == NULL) { +- printf("Attempt to connect to login-server...\n"); ++ ShowInfo("Attempt to connect to login-server...\n"); + login_fd = make_connection(login_ip, login_port); ++ if (login_fd == -1) ++ { //Try again later... [Skotlex] ++ login_fd = 0; ++ return 0; ++ } + session[login_fd]->func_parse = parse_tologin; + realloc_fifo(login_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK); ++ WFIFOHEAD(login_fd, 86); + WFIFOW(login_fd,0) = 0x2710; +- memset(WFIFOP(login_fd,2), 0, 24); +- memcpy(WFIFOP(login_fd,2), userid, strlen(userid) < 24 ? strlen(userid) : 24); +- memset(WFIFOP(login_fd,26), 0, 24); +- memcpy(WFIFOP(login_fd,26), passwd, strlen(passwd) < 24 ? strlen(passwd) : 24); ++ memcpy(WFIFOP(login_fd,2), userid, 24); ++ memcpy(WFIFOP(login_fd,26), passwd, 24); + WFIFOL(login_fd,50) = 0; + WFIFOL(login_fd,54) = char_ip; + WFIFOL(login_fd,58) = char_port; +@@ -2830,12 +3749,28 @@ + memcpy(WFIFOP(login_fd,60), server_name, strlen(server_name) < 20 ? strlen(server_name) : 20); + WFIFOW(login_fd,80) = 0; + WFIFOW(login_fd,82) = char_maintenance; +- WFIFOW(login_fd,84) = char_new; ++ ++ WFIFOW(login_fd,84) = char_new_display; //only display (New) if they want to [Kevin] ++ + WFIFOSET(login_fd,86); + } + return 0; + } + ++//------------------------------------------------ ++//Invoked 15 seconds after mapif_disconnectplayer in case the map server doesn't ++//replies/disconnect the player we tried to kick. [Skotlex] ++//------------------------------------------------ ++static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, int data) ++{ ++ struct online_char_data* character; ++ if ((character = idb_get(online_char_db, id)) != NULL && character->waiting_disconnect) ++ { //Mark it offline due to timeout. ++ set_char_offline(character->char_id, character->account_id); ++ } ++ return 0; ++} ++ + //---------------------------------------------------------- + // Return numerical value of a switch configuration by [Yor] + // on/off, english, fran軋is, deutsch, espaol +@@ -2849,92 +3784,56 @@ + return atoi(str); + } + +-//------------------------------------------- +-// Reading Lan Support configuration by [Yor] +-//------------------------------------------- +-int lan_config_read(const char *lancfgName) { +- int j; +- struct hostent * h = NULL; +- char line[1024], w1[1024], w2[1024]; +- FILE *fp; ++//---------------------------------- ++// Reading Lan Support configuration ++// Rewrote: Anvanced subnet check [LuzZza] ++//---------------------------------- ++int char_lan_config_read(const char *lancfgName) { + +- // set default configuration +- strncpy(lan_map_ip, "127.0.0.1", sizeof(lan_map_ip)); +- subneti[0] = 127; +- subneti[1] = 0; +- subneti[2] = 0; +- subneti[3] = 1; +- for(j = 0; j < 4; j++) +- subnetmaski[j] = 255; +- +- fp = fopen(lancfgName, "r"); ++ FILE *fp; ++ int line_num = 0; ++ char line[1024], w1[64], w2[64], w3[64], w4[64], w5[64]; + +- if (fp == NULL) { +- printf("LAN support configuration file not found: %s\n", lancfgName); ++ if((fp = fopen(lancfgName, "r")) == NULL) { ++ ShowWarning("LAN Support configuration file is not found: %s\n", lancfgName); + return 1; + } + +- printf ("---start reading of Lan Support configuration...\n"); ++ ShowInfo("Reading the configuration file %s...\n", lancfgName); + + while(fgets(line, sizeof(line)-1, fp)) { +- if (line[0] == '/' && line[1] == '/') ++ ++ line_num++; ++ if ((line[0] == '/' && line[1] == '/') || line[0] == '\n' || line[1] == '\n') + continue; + + line[sizeof(line)-1] = '\0'; +- if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2) +- continue; ++ if(sscanf(line,"%[^:]: %[^/]/%[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4, w5) != 5) { + +- remove_control_chars(w1); +- remove_control_chars(w2); +- if (strcmpi(w1, "lan_map_ip") == 0) { // Read map-server Lan IP Address +- h = gethostbyname(w2); +- if (h != NULL) { +- sprintf(lan_map_ip, "%d.%d.%d.%d", (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); +- } else { +- strncpy(lan_map_ip, w2, sizeof(lan_map_ip)); +- lan_map_ip[sizeof(lan_map_ip)-1] = 0; +- } +- printf("LAN IP of map-server: %s.\n", lan_map_ip); +- } else if (strcmpi(w1, "subnet") == 0) { // Read Subnetwork +- for(j = 0; j < 4; j++) +- subneti[j] = 0; +- h = gethostbyname(w2); +- if (h != NULL) { +- for(j = 0; j < 4; j++) +- subneti[j] = (unsigned char)h->h_addr[j]; +- } else { +- sscanf(w2, "%d.%d.%d.%d", &subneti[0], &subneti[1], &subneti[2], &subneti[3]); +- } +- printf("Sub-network of the map-server: %d.%d.%d.%d.\n", subneti[0], subneti[1], subneti[2], subneti[3]); +- } else if (strcmpi(w1, "subnetmask") == 0){ // Read Subnetwork Mask +- for(j = 0; j < 4; j++) +- subnetmaski[j] = 255; +- h = gethostbyname(w2); +- if (h != NULL) { +- for(j = 0; j < 4; j++) +- subnetmaski[j] = (unsigned char)h->h_addr[j]; +- } else { +- sscanf(w2, "%d.%d.%d.%d", &subnetmaski[0], &subnetmaski[1], &subnetmaski[2], &subnetmaski[3]); +- } +- printf("Sub-network mask of the map-server: %d.%d.%d.%d.\n", subnetmaski[0], subnetmaski[1], subnetmaski[2], subnetmaski[3]); +- } ++ ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num); ++ continue; + } +- fclose(fp); + +- // sub-network check of the map-server +- { +- unsigned int a0, a1, a2, a3; +- unsigned char p[4]; +- sscanf(lan_map_ip, "%d.%d.%d.%d", &a0, &a1, &a2, &a3); +- p[0] = a0; p[1] = a1; p[2] = a2; p[3] = a3; +- printf("LAN test of LAN IP of the map-server: "); +- if (lan_ip_check(p) == 0) { +- printf("\033[1;31m***ERROR: LAN IP of the map-server doesn't belong to the specified Sub-network.\033[0m\n"); +- } ++ remove_control_chars((unsigned char *)w1); ++ remove_control_chars((unsigned char *)w2); ++ remove_control_chars((unsigned char *)w3); ++ remove_control_chars((unsigned char *)w4); ++ remove_control_chars((unsigned char *)w5); ++ ++ if(strcmpi(w1, "subnet") == 0) { ++ ++ subnet[subnet_count].subnet = inet_addr(w2); ++ subnet[subnet_count].mask = inet_addr(w3); ++ subnet[subnet_count].char_ip = inet_addr(w4); ++ subnet[subnet_count].map_ip = inet_addr(w5); ++ ++ subnet_count++; + } + +- printf("---End reading of Lan Support configuration...\n"); ++ ShowStatus("Information about %d subnetworks readen.\n", subnet_count); ++ } + ++ fclose(fp); + return 0; + } + +@@ -2944,10 +3843,11 @@ + FILE *fp = fopen(cfgName, "r"); + + if (fp == NULL) { +- printf("Configuration file not found: %s.\n", cfgName); ++ ShowFatalError("Configuration file not found: %s.\n", cfgName); + exit(1); + } + ++ ShowInfo("Reading configuration file %s...\n", cfgName); + while(fgets(line, sizeof(line)-1, fp)) { + if (line[0] == '/' && line[1] == '/') + continue; +@@ -2956,86 +3856,122 @@ + if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2) + continue; + +- remove_control_chars(w1); +- remove_control_chars(w2); +- if (strcmpi(w1, "userid") == 0) { +- memcpy(userid, w2, 24); ++ remove_control_chars((unsigned char *)w1); ++ remove_control_chars((unsigned char *)w2); ++ if(strcmpi(w1,"timestamp_format") == 0) { ++ strncpy(timestamp_format, w2, 20); ++ } else if(strcmpi(w1,"console_silent")==0){ ++ msg_silent = 0; //To always allow the next line to show up. ++ ShowInfo("Console Silent Setting: %d\n", atoi(w2)); ++ msg_silent = atoi(w2); ++ } else if (strcmpi(w1, "userid") == 0) { ++ strncpy(userid, w2, 24); + } else if (strcmpi(w1, "passwd") == 0) { +- memcpy(passwd, w2, 24); ++ strncpy(passwd, w2, 24); + } else if (strcmpi(w1, "server_name") == 0) { + memcpy(server_name, w2, sizeof(server_name)); + server_name[sizeof(server_name) - 1] = '\0'; +- printf("%s server has been intialized\n", w2); ++ ShowStatus("%s server has been initialized\n", w2); + } else if (strcmpi(w1, "wisp_server_name") == 0) { + if (strlen(w2) >= 4) { + memcpy(wisp_server_name, w2, sizeof(wisp_server_name)); + wisp_server_name[sizeof(wisp_server_name) - 1] = '\0'; + } + } else if (strcmpi(w1, "login_ip") == 0) { ++ login_ip_set_ = 1; + h = gethostbyname(w2); + if (h != NULL) { +- printf("Login server IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); ++ ShowStatus("Login server IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); + sprintf(login_ip_str, "%d.%d.%d.%d", (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); + } else + memcpy(login_ip_str, w2, 16); + } else if (strcmpi(w1, "login_port") == 0) { + login_port = atoi(w2); + } else if (strcmpi(w1, "char_ip") == 0) { ++ char_ip_set_ = 1; + h = gethostbyname(w2); + if (h != NULL) { +- printf("Character server IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); ++ ShowStatus("Character server IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); + sprintf(char_ip_str, "%d.%d.%d.%d", (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); + } else + memcpy(char_ip_str, w2, 16); ++ } else if (strcmpi(w1, "bind_ip") == 0) { ++ bind_ip_set_ = 1; ++ h = gethostbyname(w2); ++ if (h != NULL) { ++ ShowStatus("Character server binding IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); ++ sprintf(bind_ip_str, "%d.%d.%d.%d", (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]); ++ } else ++ memcpy(bind_ip_str, w2, 16); + } else if (strcmpi(w1, "char_port") == 0) { + char_port = atoi(w2); + } else if (strcmpi(w1, "char_maintenance") == 0) { + char_maintenance = atoi(w2); + } else if (strcmpi(w1, "char_new") == 0) { + char_new = atoi(w2); ++ } else if (strcmpi(w1, "char_new_display") == 0) { ++ char_new_display = atoi(w2); + } else if (strcmpi(w1, "email_creation") == 0) { + email_creation = config_switch(w2); + } else if (strcmpi(w1, "char_txt") == 0) { + strcpy(char_txt, w2); ++ } else if (strcmpi(w1, "scdata_txt") == 0) { //By Skotlex ++ strcpy(scdata_txt, w2); + } else if (strcmpi(w1, "backup_txt") == 0) { //By zanetheinsane + strcpy(backup_txt, w2); ++ } else if (strcmpi(w1, "friends_txt") == 0) { //By davidsiaw ++ strcpy(friends_txt, w2); + } else if (strcmpi(w1, "backup_txt_flag") == 0) { // The backup_txt file was created because char deletion bug existed. Now it's finish and that take a lot of time to create a second file when there are a lot of characters. By [Yor] + backup_txt_flag = config_switch(w2); + } else if (strcmpi(w1, "max_connect_user") == 0) { + max_connect_user = atoi(w2); + if (max_connect_user < 0) + max_connect_user = 0; // unlimited online players ++ } else if(strcmpi(w1, "gm_allow_level") == 0) { ++ gm_allow_level = atoi(w2); ++ if(gm_allow_level < 0) ++ gm_allow_level = 99; + } else if (strcmpi(w1, "check_ip_flag") == 0) { + check_ip_flag = config_switch(w2); ++ } else if (strcmpi(w1, "online_check") == 0) { ++ online_check = config_switch(w2); + } else if (strcmpi(w1, "autosave_time") == 0) { + autosave_interval = atoi(w2)*1000; + if (autosave_interval <= 0) + autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; ++ } else if (strcmpi(w1, "save_log") == 0) { ++ save_log = config_switch(w2); + } else if (strcmpi(w1, "start_point") == 0) { + char map[32]; + int x, y; + if (sscanf(w2, "%[^,],%d,%d", map, &x, &y) < 3) + continue; + if (strstr(map, ".gat") != NULL) { // Verify at least if '.gat' is in the map name +- memcpy(start_point.map, map, 16); ++ start_point.map = mapindex_name2id(map); ++ if (!start_point.map) { ++ ShowError("Specified start_point %s not found in map-index cache.\n", map); ++ start_point.map = 0; ++ } + start_point.x = x; + start_point.y = y; + } ++ } else if(strcmpi(w1,"log_char")==0) { //log char or not [devil] ++ log_char = atoi(w2); + } else if (strcmpi(w1, "start_zeny") == 0) { + start_zeny = atoi(w2); + if (start_zeny < 0) + start_zeny = 0; + } else if (strcmpi(w1, "start_weapon") == 0) { +- start_zeny = atoi(w2); ++ start_weapon = atoi(w2); + if (start_weapon < 0) + start_weapon = 0; + } else if (strcmpi(w1, "start_armor") == 0) { +- start_zeny = atoi(w2); ++ start_armor = atoi(w2); + if (start_armor < 0) + start_armor = 0; + } else if (strcmpi(w1, "unknown_char_name") == 0) { + strcpy(unknown_char_name, w2); +- unknown_char_name[24] = 0; ++ unknown_char_name[NAME_LENGTH-1] = '\0'; + } else if (strcmpi(w1, "char_log_filename") == 0) { + strcpy(char_log_filename, w2); + } else if (strcmpi(w1, "name_ignoring_case") == 0) { +@@ -3061,52 +3997,130 @@ + online_refresh_html = atoi(w2); + if (online_refresh_html < 1) + online_refresh_html = 1; +- } else if(strcmpi(w1,"anti_freeze_enable")==0){ +- anti_freeze_enable = config_switch(w2); +- } else if (strcmpi(w1, "anti_freeze_interval") == 0) { +- ANTI_FREEZE_INTERVAL = atoi(w2); +- if (ANTI_FREEZE_INTERVAL < 5) +- ANTI_FREEZE_INTERVAL = 5; // minimum 5 seconds ++ } else if(strcmpi(w1,"db_path")==0) { ++ strcpy(db_path,w2); ++ } else if (strcmpi(w1, "console") == 0) { ++ if(strcmpi(w2,"on") == 0 || strcmpi(w2,"yes") == 0 ) ++ console = 1; ++ } else if (strcmpi(w1, "fame_list_alchemist") == 0) { ++ fame_list_size_chemist = atoi(w2); ++ if (fame_list_size_chemist > MAX_FAME_LIST) { ++ ShowWarning("Max fame list size is %d (fame_list_alchemist)\n", MAX_FAME_LIST); ++ fame_list_size_chemist = MAX_FAME_LIST; ++ } ++ } else if (strcmpi(w1, "fame_list_blacksmith") == 0) { ++ fame_list_size_smith = atoi(w2); ++ if (fame_list_size_smith > MAX_FAME_LIST) { ++ ShowWarning("Max fame list size is %d (fame_list_blacksmith)\n", MAX_FAME_LIST); ++ fame_list_size_smith = MAX_FAME_LIST; ++ } ++ } else if (strcmpi(w1, "fame_list_taekwon") == 0) { ++ fame_list_size_taekwon = atoi(w2); ++ if (fame_list_size_taekwon > MAX_FAME_LIST) { ++ ShowWarning("Max fame list size is %d (fame_list_taekwon)\n", MAX_FAME_LIST); ++ fame_list_size_taekwon = MAX_FAME_LIST; ++ } + } else if (strcmpi(w1, "import") == 0) { + char_config_read(w2); + } + } + fclose(fp); + ++ ShowInfo("done reading %s.\n", cfgName); + return 0; + } + ++int chardb_final(int key, void* data, va_list va) ++{ ++ aFree(data); ++ return 0; ++} + void do_final(void) { +- int i; +- ++ ShowStatus("Terminating server.\n"); + // write online players files with no player +- for(i = 0; i < char_num; i++) +- online_chars[i] = -1; ++ online_char_db->clear(online_char_db, NULL); //clean the db... + create_online_files(); +- free(online_chars); ++ online_char_db->destroy(online_char_db, NULL); //dispose the db... + + mmo_char_sync(); + inter_save(); ++ set_all_offline(); + +- if (gm_account != NULL) +- free(gm_account); ++ if(gm_account) aFree(gm_account); ++ if(char_dat) aFree(char_dat); + +- free(char_dat); + delete_session(login_fd); + delete_session(char_fd); + ++#ifdef ENABLE_SC_SAVING ++ status_final(); ++#endif ++ inter_final(); ++ mapindex_final(); ++ + char_log("----End of char-server (normal end with closing of all files)." RETCODE); + } + ++void set_server_type(void) ++{ ++ SERVER_TYPE = ATHENA_SERVER_CHAR; ++} ++ ++static int online_data_cleanup_sub(DBKey key, void *data, va_list ap) ++{ ++ struct online_char_data *character= (struct online_char_data*)data; ++ if (character->server == -2) //Unknown server.. set them offline ++ set_char_offline(character->char_id, character->account_id); ++ if (character->server < 0) ++ //Free data from players that have not been online for a while. ++ db_remove(online_char_db, key); ++ return 0; ++} ++ ++static int online_data_cleanup(int tid, unsigned int tick, int id, int data) ++{ ++ online_char_db->foreach(online_char_db, online_data_cleanup_sub); ++ return 0; ++} ++ + int do_init(int argc, char **argv) { + int i; + ++ mapindex_init(); //Needed here for the start-point reading. ++ start_point.map = mapindex_name2id("new_1-1.gat"); ++ char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]); ++ char_lan_config_read((argc > 3) ? argv[3] : LOGIN_LAN_CONF_NAME); ++ ++ if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) { ++ ShowError("Using the default user/password s1/p1 is NOT RECOMMENDED.\n"); ++ ShowNotice("Please edit your save/account.txt file to create a proper inter-server user/password (gender 'S')\n"); ++ ShowNotice("And then change the user/password to use in conf/char_athena.conf (or conf/import/char_conf.txt)\n"); ++ } ++ + // a newline in the log... + char_log(""); ++ // moved behind char_config_read in case we changed the filename [celest] + char_log("The char-server starting..." RETCODE); + +- char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]); +- lan_config_read((argc > 1) ? argv[1] : LOGIN_LAN_CONF_NAME); ++ if ((naddr_ != 0) && (login_ip_set_ == 0 || char_ip_set_ == 0)) { ++ // The char server should know what IP address it is running on ++ // - MouseJstr ++ int localaddr = ntohl(addr_[0]); ++ unsigned char *ptr = (unsigned char *) &localaddr; ++ char buf[16]; ++ sprintf(buf, "%d.%d.%d.%d", ptr[0], ptr[1], ptr[2], ptr[3]);; ++ if (naddr_ != 1) ++ ShowStatus("Multiple interfaces detected.. using %s as our IP address\n", buf); ++ else ++ ShowStatus("Defaulting to %s as our IP address\n", buf); ++ if (login_ip_set_ == 0) ++ strcpy(login_ip_str, buf); ++ if (char_ip_set_ == 0) ++ strcpy(char_ip_str, buf); ++ ++ if (ptr[0] == 192 && ptr[1] == 168) ++ ShowWarning("Firewall detected.. edit lan_support.conf and char_athena.conf\n"); ++ } + + login_ip = inet_addr(login_ip_str); + char_ip = inet_addr(char_ip_str); +@@ -3116,34 +4130,45 @@ + server_fd[i] = -1; + } + +- mmo_char_init(); ++ online_char_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); + ++ mmo_char_init(); ++#ifdef ENABLE_SC_SAVING ++ status_init(); ++#endif + update_online = time(NULL); + create_online_files(); // update online players files at start of the server + + inter_init((argc > 2) ? argv[2] : inter_cfgName); // inter server 初期化 + +- set_termfunc(do_final); + set_defaultparse(parse_char); + +- char_fd = make_listen_port(char_port); ++ if (bind_ip_set_) ++ char_fd = make_listen_bind(inet_addr(bind_ip_str),char_port); ++ else ++ char_fd = make_listen_bind(INADDR_ANY,char_port); + + add_timer_func_list(check_connect_login_server, "check_connect_login_server"); + add_timer_func_list(send_users_tologin, "send_users_tologin"); ++ add_timer_func_list(send_accounts_tologin, "send_accounts_tologin"); + add_timer_func_list(mmo_char_sync_timer, "mmo_char_sync_timer"); ++ add_timer_func_list(chardb_waiting_disconnect, "chardb_waiting_disconnect"); ++ add_timer_func_list(online_data_cleanup, "online_data_cleanup"); + +- i = add_timer_interval(gettick() + 1000, check_connect_login_server, 0, 0, 10 * 1000); +- i = add_timer_interval(gettick() + 1000, send_users_tologin, 0, 0, 5 * 1000); +- i = add_timer_interval(gettick() + autosave_interval, mmo_char_sync_timer, 0, 0, autosave_interval); +- +- if(anti_freeze_enable > 0) { +- add_timer_func_list(map_anti_freeze_system, "map_anti_freeze_system"); +- i = add_timer_interval(gettick() + 1000, map_anti_freeze_system, 0, 0, ANTI_FREEZE_INTERVAL * 1000); // checks every X seconds user specifies ++ add_timer_interval(gettick() + 600*1000, online_data_cleanup, 0, 0, 600 * 1000); ++ add_timer_interval(gettick() + 1000, check_connect_login_server, 0, 0, 10 * 1000); ++ add_timer_interval(gettick() + 1000, send_users_tologin, 0, 0, 5 * 1000); ++ add_timer_interval(gettick() + 3600*1000, send_accounts_tologin, 0, 0, 3600*1000); //Sync online accounts every hour ++ add_timer_interval(gettick() + autosave_interval, mmo_char_sync_timer, 0, 0, autosave_interval); ++ ++ if(console) { ++ set_defaultconsoleparse(parse_console); ++ start_console(); + } + + char_log("The char-server is ready (Server is listening on the port %d)." RETCODE, char_port); + +- printf("The char-server is \033[1;32mready\033[0m (Server is listening on the port %d).\n\n", char_port); ++ ShowStatus("The char-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %d).\n\n", char_port); + + return 0; + } diff --git a/misc/src/char/int_guild.c b/misc/src/char/int_guild.c new file mode 100644 index 0000000..665e017 --- /dev/null +++ b/misc/src/char/int_guild.c @@ -0,0 +1,1441 @@ +// $Id: int_guild.c,v 1.2 2004/09/25 19:36:53 Akitasha Exp $ +#include "inter.h" +#include "int_guild.h" +#include "int_storage.h" +#include "mmo.h" +#include "char.h" +#include "socket.h" +#include "db.h" +#include "lock.h" + +#include +#include +#include + +char guild_txt[1024] = "save/guild.txt"; +char castle_txt[1024] = "save/castle.txt"; + +static struct dbt *guild_db; +static struct dbt *castle_db; + +static int guild_newid = 10000; + +static int guild_exp[100]; + +int mapif_parse_GuildLeave(int fd, int guild_id, int account_id, int char_id, int flag, const char *mes); +int mapif_guild_broken(int guild_id, int flag); +int guild_check_empty(struct guild *g); +int guild_calcinfo(struct guild *g); +int mapif_guild_basicinfochanged(int guild_id, int type, const void *data, int len); +int mapif_guild_info(int fd, struct guild *g); +int guild_break_sub(void *key, void *data, va_list ap); + +// ギルドデータの文字列への変換 +int inter_guild_tostr(char *str, struct guild *g) { + int i, c, len; + + // 基本データ + len = sprintf(str, "%d\t%s\t%s\t%d,%d,%d,%d,%d\t%s#\t%s#\t", + g->guild_id, g->name, g->master, + g->guild_lv, g->max_member, g->exp, g->skill_point, g->castle_id, + g->mes1, g->mes2); + // メンバー + for(i = 0; i < g->max_member; i++) { + struct guild_member *m = &g->member[i]; + len += sprintf(str + len, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\t%s\t", + m->account_id, m->char_id, + m->hair, m->hair_color, m->gender, + m->class, m->lv, m->exp, m->exp_payper, m->position, + ((m->account_id > 0) ? m->name : "-")); + } + // 役職 + for(i = 0; i < MAX_GUILDPOSITION; i++) { + struct guild_position *p = &g->position[i]; + len += sprintf(str + len, "%d,%d\t%s#\t", p->mode, p->exp_mode, p->name); + } + // エンブレム + len += sprintf(str + len, "%d,%d,", g->emblem_len, g->emblem_id); + for(i = 0; i < g->emblem_len; i++) { + len += sprintf(str + len, "%02x", (unsigned char)(g->emblem_data[i])); + } + len += sprintf(str + len, "$\t"); + // 同盟リスト + c = 0; + for(i = 0; i < MAX_GUILDALLIANCE; i++) + if (g->alliance[i].guild_id > 0) + c++; + len += sprintf(str + len, "%d\t", c); + for(i = 0; i < MAX_GUILDALLIANCE; i++) { + struct guild_alliance *a = &g->alliance[i]; + if (a->guild_id > 0) + len += sprintf(str + len, "%d,%d\t%s\t", a->guild_id, a->opposition, a->name); + } + // 追放リスト + c = 0; + for(i = 0; i < MAX_GUILDEXPLUSION; i++) + if (g->explusion[i].account_id > 0) + c++; + len += sprintf(str + len, "%d\t", c); + for(i = 0; i < MAX_GUILDEXPLUSION; i++) { + struct guild_explusion *e = &g->explusion[i]; + if (e->account_id > 0) + len += sprintf(str + len, "%d,%d,%d,%d\t%s\t%s\t%s#\t", + e->account_id, e->rsv1, e->rsv2, e->rsv3, + e->name, e->acc, e->mes ); + } + // ギルドスキル + for(i = 0; i < MAX_GUILDSKILL; i++) { + len += sprintf(str + len, "%d,%d ", g->skill[i].id, g->skill[i].lv); + } + len += sprintf(str + len, "\t"); + + return 0; +} + +// ギルドデータの文字列からの変換 +int inter_guild_fromstr(char *str, struct guild *g) { + int i, j, c; + int tmp_int[16]; + char tmp_str[4][256]; + char tmp_str2[4096]; + char *pstr; + + // 基本データ + memset(g, 0, sizeof(struct guild)); + if (sscanf(str, "%d\t%[^\t]\t%[^\t]\t%d,%d,%d,%d,%d\t%[^\t]\t%[^\t]\t", &tmp_int[0], + tmp_str[0], tmp_str[1], + &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4], &tmp_int[5], + tmp_str[2], tmp_str[3]) < 8) + return 1; + + g->guild_id = tmp_int[0]; + g->guild_lv = tmp_int[1]; + g->max_member = tmp_int[2]; + g->exp = tmp_int[3]; + g->skill_point = tmp_int[4]; + g->castle_id = tmp_int[5]; + memcpy(g->name, tmp_str[0], 24); + memcpy(g->master, tmp_str[1], 24); + memcpy(g->mes1, tmp_str[2], 60); + memcpy(g->mes2, tmp_str[3], 120); + g->mes1[strlen(g->mes1)-1] = 0; + g->mes2[strlen(g->mes2)-1] = 0; + + for(j = 0; j < 6 && str != NULL; j++) // 位置スキップ + str = strchr(str + 1, '\t'); +// printf("GuildBaseInfo OK\n"); + + // メンバー + for(i = 0; i < g->max_member; i++) { + struct guild_member *m = &g->member[i]; + if (sscanf(str + 1, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\t%[^\t]\t", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4], + &tmp_int[5], &tmp_int[6], &tmp_int[7], &tmp_int[8], &tmp_int[9], + tmp_str[0]) < 11) + return 1; + m->account_id = tmp_int[0]; + m->char_id = tmp_int[1]; + m->hair = tmp_int[2]; + m->hair_color = tmp_int[3]; + m->gender = tmp_int[4]; + m->class = tmp_int[5]; + m->lv = tmp_int[6]; + m->exp = tmp_int[7]; + m->exp_payper = tmp_int[8]; + m->position = tmp_int[9]; + memcpy(m->name, tmp_str[0], 24); + + for(j = 0; j < 2 && str != NULL; j++) // 位置スキップ + str = strchr(str + 1, '\t'); + } +// printf("GuildMemberInfo OK\n"); + // 役職 + i = 0; + while (sscanf(str+1, "%d,%d%n", &tmp_int[0], &tmp_int[1], &j) == 2 && str[1+j] == '\t') { + struct guild_position *p = &g->position[i]; + if (sscanf(str+1, "%d,%d\t%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str[0]) < 3) + return 1; + p->mode = tmp_int[0]; + p->exp_mode = tmp_int[1]; + tmp_str[0][strlen(tmp_str[0])-1] = 0; + memcpy(p->name, tmp_str[0], 24); + + for(j = 0; j < 2 && str != NULL; j++) // 位置スキップ + str = strchr(str+1, '\t'); + i++; + } +// printf("GuildPositionInfo OK\n"); + // エンブレム + tmp_int[1] = 0; + if (sscanf(str + 1, "%d,%d,%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str2)< 3 && + sscanf(str + 1, "%d,%[^\t]\t", &tmp_int[0], tmp_str2) < 2) + return 1; + g->emblem_len = tmp_int[0]; + g->emblem_id = tmp_int[1]; + for(i = 0, pstr = tmp_str2; i < g->emblem_len; i++, pstr += 2) { + int c1 = pstr[0], c2 = pstr[1], x1 = 0, x2 = 0; + if (c1 >= '0' && c1 <= '9') x1 = c1 - '0'; + if (c1 >= 'a' && c1 <= 'f') x1 = c1 - 'a' + 10; + if (c1 >= 'A' && c1 <= 'F') x1 = c1 - 'A' + 10; + if (c2 >= '0' && c2 <= '9') x2 = c2 - '0'; + if (c2 >= 'a' && c2 <= 'f') x2 = c2 - 'a' + 10; + if (c2 >= 'A' && c2 <= 'F') x2 = c2 - 'A' + 10; + g->emblem_data[i] = (x1<<4) | x2; + } +// printf("GuildEmblemInfo OK\n"); + str=strchr(str + 1, '\t'); // 位置スキップ + + // 同盟リスト + if (sscanf(str + 1, "%d\t", &c) < 1) + return 1; + str = strchr(str + 1, '\t'); // 位置スキップ + for(i = 0; i < c; i++) { + struct guild_alliance *a = &g->alliance[i]; + if (sscanf(str + 1, "%d,%d\t%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str[0]) < 3) + return 1; + a->guild_id = tmp_int[0]; + a->opposition = tmp_int[1]; + memcpy(a->name, tmp_str[0], 24); + + for(j = 0; j < 2 && str != NULL; j++) // 位置スキップ + str = strchr(str + 1, '\t'); + } +// printf("GuildAllianceInfo OK\n"); + // 追放リスト + if (sscanf(str+1, "%d\t", &c) < 1) + return 1; + str = strchr(str + 1, '\t'); // 位置スキップ + for(i = 0; i < c; i++) { + struct guild_explusion *e = &g->explusion[i]; + if (sscanf(str + 1, "%d,%d,%d,%d\t%[^\t]\t%[^\t]\t%[^\t]\t", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], + tmp_str[0], tmp_str[1], tmp_str[2]) < 6) + return 1; + e->account_id = tmp_int[0]; + e->rsv1 = tmp_int[1]; + e->rsv2 = tmp_int[2]; + e->rsv3 = tmp_int[3]; + memcpy(e->name, tmp_str[0], 24); + memcpy(e->acc, tmp_str[1], 24); + tmp_str[2][strlen(tmp_str[2])-1] = 0; + memcpy(e->mes, tmp_str[2], 40); + + for(j = 0; j < 4 && str != NULL; j++) // 位置スキップ + str = strchr(str + 1, '\t'); + } +// printf("GuildExplusionInfo OK\n"); + // ギルドスキル + for(i = 0; i < MAX_GUILDSKILL; i++) { + if (sscanf(str+1,"%d,%d ", &tmp_int[0], &tmp_int[1]) < 2) + break; + g->skill[i].id = tmp_int[0]; + g->skill[i].lv = tmp_int[1]; + str = strchr(str + 1, ' '); + } + str = strchr(str + 1, '\t'); +// printf("GuildSkillInfo OK\n"); + + return 0; +} + +// ギルド城データの文字列への変換 +int inter_guildcastle_tostr(char *str, struct guild_castle *gc) { + int len; + + len = sprintf(str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", // added Guardian HP [Valaris] + gc->castle_id, gc->guild_id, gc->economy, gc->defense, gc->triggerE, + gc->triggerD, gc->nextTime, gc->payTime, gc->createTime, gc->visibleC, + gc->visibleG0, gc->visibleG1, gc->visibleG2, gc->visibleG3, gc->visibleG4, + gc->visibleG5, gc->visibleG6, gc->visibleG7, gc->Ghp0, gc->Ghp1, gc->Ghp2, + gc->Ghp3, gc->Ghp4, gc->Ghp5, gc->Ghp6, gc->Ghp7); + + return 0; +} + +// ギルド城データの文字列からの変換 +int inter_guildcastle_fromstr(char *str, struct guild_castle *gc) { + int tmp_int[26]; + + memset(gc, 0, sizeof(struct guild_castle)); + // new structure of guild castle + if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], &tmp_int[13], + &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], &tmp_int[19], &tmp_int[20], + &tmp_int[21], &tmp_int[22], &tmp_int[23], &tmp_int[24], &tmp_int[25]) == 26) { + gc->castle_id = tmp_int[0]; + gc->guild_id = tmp_int[1]; + gc->economy = tmp_int[2]; + gc->defense = tmp_int[3]; + gc->triggerE = tmp_int[4]; + gc->triggerD = tmp_int[5]; + gc->nextTime = tmp_int[6]; + gc->payTime = tmp_int[7]; + gc->createTime = tmp_int[8]; + gc->visibleC = tmp_int[9]; + gc->visibleG0 = tmp_int[10]; + gc->visibleG1 = tmp_int[11]; + gc->visibleG2 = tmp_int[12]; + gc->visibleG3 = tmp_int[13]; + gc->visibleG4 = tmp_int[14]; + gc->visibleG5 = tmp_int[15]; + gc->visibleG6 = tmp_int[16]; + gc->visibleG7 = tmp_int[17]; + gc->Ghp0 = tmp_int[18]; + gc->Ghp1 = tmp_int[19]; + gc->Ghp2 = tmp_int[20]; + gc->Ghp3 = tmp_int[21]; + gc->Ghp4 = tmp_int[22]; + gc->Ghp5 = tmp_int[23]; + gc->Ghp6 = tmp_int[24]; + gc->Ghp7 = tmp_int[25]; // end additions [Valaris] + // old structure of guild castle + } else if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], &tmp_int[13], + &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17]) == 18) { + gc->castle_id = tmp_int[0]; + gc->guild_id = tmp_int[1]; + gc->economy = tmp_int[2]; + gc->defense = tmp_int[3]; + gc->triggerE = tmp_int[4]; + gc->triggerD = tmp_int[5]; + gc->nextTime = tmp_int[6]; + gc->payTime = tmp_int[7]; + gc->createTime = tmp_int[8]; + gc->visibleC = tmp_int[9]; + gc->visibleG0 = tmp_int[10]; + gc->visibleG1 = tmp_int[11]; + gc->visibleG2 = tmp_int[12]; + gc->visibleG3 = tmp_int[13]; + gc->visibleG4 = tmp_int[14]; + gc->visibleG5 = tmp_int[15]; + gc->visibleG6 = tmp_int[16]; + gc->visibleG7 = tmp_int[17]; + if (gc->visibleG0 == 1) + gc->Ghp0 = 15670 + 2000 * gc->defense; + else + gc->Ghp0 = 0; + if (gc->visibleG1 == 1) + gc->Ghp1 = 15670 + 2000 * gc->defense; + else + gc->Ghp1 = 0; + if (gc->visibleG2 == 1) + gc->Ghp2 = 15670 + 2000 * gc->defense; + else + gc->Ghp2 = 0; + if (gc->visibleG3 == 1) + gc->Ghp3 = 30214 + 2000 * gc->defense; + else + gc->Ghp3 = 0; + if (gc->visibleG4 == 1) + gc->Ghp4 = 30214 + 2000 * gc->defense; + else + gc->Ghp4 = 0; + if (gc->visibleG5 == 1) + gc->Ghp5 = 28634 + 2000 * gc->defense; + else + gc->Ghp5 = 0; + if (gc->visibleG6 == 1) + gc->Ghp6 = 28634 + 2000 * gc->defense; + else + gc->Ghp6 = 0; + if (gc->visibleG7 == 1) + gc->Ghp7 = 28634 + 2000 * gc->defense; + else + gc->Ghp7 = 0; + } else { + return 1; + } + + return 0; +} + +// ギルド関連データベース読み込み +int inter_guild_readdb() { + int i; + FILE *fp; + char line[1024]; + + fp = fopen("db/exp_guild.txt", "r"); + if (fp == NULL) { + printf("can't read db/exp_guild.txt\n"); + return 1; + } + i = 0; + while(fgets(line, sizeof(line)-1, fp) && i < 100){ + if (line[0] == '/' && line[1] == '/') + continue; + guild_exp[i] = atoi(line); + i++; + } + fclose(fp); + + return 0; +} + +// ギルドデータの読み込み +int inter_guild_init() { + char line[16384]; + struct guild *g; + struct guild_castle *gc; + FILE *fp; + int i, j, c = 0; + + inter_guild_readdb(); + + guild_db = numdb_init(); + castle_db = numdb_init(); + + if ((fp = fopen(guild_txt,"r")) == NULL) + return 1; + while(fgets(line, sizeof(line)-1, fp)) { + j = 0; + if (sscanf(line, "%d\t%%newid%%\n%n", &i, &j) == 1 && j > 0 && guild_newid <= i) { + guild_newid = i; + continue; + } + + g = calloc(sizeof(struct guild), 1); + if(g == NULL){ + printf("int_guild: out of memory!\n"); + exit(0); + } + memset(g, 0, sizeof(struct guild)); + if (inter_guild_fromstr(line, g) == 0 && g->guild_id > 0) { + if (g->guild_id >= guild_newid) + guild_newid = g->guild_id + 1; + numdb_insert(guild_db, g->guild_id, g); + guild_check_empty(g); + guild_calcinfo(g); + } else { + printf("int_guild: broken data [%s] line %d\n", guild_txt, c); + free(g); + } + c++; + } + fclose(fp); +// printf("int_guild: %s read done (%d guilds)\n", guild_txt, c); + + c = 0;//カウンタ初期化 + + if ((fp = fopen(castle_txt, "r")) == NULL) { + return 1; + } + + while(fgets(line, sizeof(line)-1, fp)) { + gc = calloc(sizeof(struct guild_castle), 1); + if(gc == NULL){ + printf("int_guild: out of memory!\n"); + exit(0); + } + memset(gc, 0, sizeof(struct guild_castle)); + if (inter_guildcastle_fromstr(line, gc) == 0) { + numdb_insert(castle_db, gc->castle_id, gc); + } else { + printf("int_guild: broken data [%s] line %d\n", castle_txt, c); + free(gc); + } + c++; + } + + if (!c) { + printf(" %s - making Default Data...\n", castle_txt); + //デフォルトデータを作成 + for(i = 0; i < MAX_GUILDCASTLE; i++) { + gc = calloc(sizeof(struct guild_castle), 1); + if (gc == NULL) { + printf("int_guild: out of memory!\n"); + exit(0); + } + memset(gc, 0, sizeof(struct guild_castle)); + gc->castle_id = i; + gc->guild_id = 0; + gc->economy = 0; + gc->defense = 0; + gc->triggerE = 0; + gc->triggerD = 0; + gc->nextTime = 0; + gc->payTime = 0; + gc->createTime = 0; + gc->visibleC = 0; + gc->visibleG0 = 0; + gc->visibleG1 = 0; + gc->visibleG2 = 0; + gc->visibleG3 = 0; + gc->visibleG4 = 0; + gc->visibleG5 = 0; + gc->visibleG6 = 0; + gc->visibleG7 = 0; + gc->Ghp0 = 0; // guardian HP [Valaris] + gc->Ghp1 = 0; + gc->Ghp2 = 0; + gc->Ghp3 = 0; + gc->Ghp4 = 0; + gc->Ghp5 = 0; + gc->Ghp6 = 0; + gc->Ghp7 = 0; // end additions [Valaris] + numdb_insert(castle_db, gc->castle_id, gc); + } + printf(" %s - making done\n",castle_txt); + return 0; + } + + fclose(fp); + + return 0; +} + +struct guild *inter_guild_search(int guild_id) { + struct guild *g; + + g=numdb_search(guild_db, guild_id); + + return g; +} + +// ギルドデータのセーブ用 +int inter_guild_save_sub(void *key,void *data,va_list ap) { + char line[16384]; + FILE *fp; + + inter_guild_tostr(line,(struct guild *)data); + fp=va_arg(ap,FILE *); + fprintf(fp,"%s" RETCODE,line); + + return 0; +} + +// ギルド城データのセーブ用 +int inter_castle_save_sub(void *key, void *data, va_list ap) { + char line[16384]; + FILE *fp; + + inter_guildcastle_tostr(line, (struct guild_castle *)data); + fp = va_arg(ap, FILE *); + fprintf(fp, "%s" RETCODE, line); + + return 0; +} + +// ギルドデータのセーブ +int inter_guild_save() { + FILE *fp; + int lock; + + if ((fp = lock_fopen(guild_txt, &lock)) == NULL) { + printf("int_guild: cant write [%s] !!! data is lost !!!\n", guild_txt); + return 1; + } + numdb_foreach(guild_db, inter_guild_save_sub, fp); +// fprintf(fp, "%d\t%%newid%%\n", guild_newid); + lock_fclose(fp, guild_txt, &lock); +// printf("int_guild: %s saved.\n", guild_txt); + + if ((fp = lock_fopen(castle_txt,&lock)) == NULL) { + printf("int_guild: cant write [%s] !!! data is lost !!!\n", castle_txt); + return 1; + } + numdb_foreach(castle_db, inter_castle_save_sub, fp); + lock_fclose(fp, castle_txt, &lock); + + return 0; +} + +// ギルド名検索用 +int search_guildname_sub(void *key, void *data, va_list ap) { + struct guild *g = (struct guild *)data, **dst; + char *str; + + str = va_arg(ap, char *); + dst = va_arg(ap, struct guild **); + if (strcmpi(g->name, str) == 0) + *dst = g; + return 0; +} + +// ギルド名検索 +struct guild* search_guildname(char *str) { + struct guild *g = NULL; + numdb_foreach(guild_db, search_guildname_sub, str, &g); + return g; +} + +// ギルドが空かどうかチェック +int guild_check_empty(struct guild *g) { + int i; + + for(i = 0; i < g->max_member; i++) { + if (g->member[i].account_id > 0) { + return 0; + } + } + // 誰もいないので解散 + numdb_foreach(guild_db, guild_break_sub, g->guild_id); + numdb_erase(guild_db, g->guild_id); + inter_guild_storage_delete(g->guild_id); + mapif_guild_broken(g->guild_id, 0); + free(g); + + return 1; +} + +// キャラの競合がないかチェック用 +int guild_check_conflict_sub(void *key, void *data, va_list ap) { + struct guild *g = (struct guild *)data; + int guild_id, account_id, char_id, i; + + guild_id = va_arg(ap, int); + account_id = va_arg(ap, int); + char_id = va_arg(ap, int); + + if (g->guild_id == guild_id) // 本来の所属なので問題なし + return 0; + + for(i = 0; i < MAX_GUILD; i++) { + if (g->member[i].account_id == account_id && g->member[i].char_id == char_id) { + // 別のギルドに偽の所属データがあるので脱退 + printf("int_guild: guild conflict! %d,%d %d!=%d\n", account_id, char_id, guild_id, g->guild_id); + mapif_parse_GuildLeave(-1, g->guild_id, account_id, char_id, 0, "**データ競合**"); + } + } + + return 0; +} +// キャラの競合がないかチェック +int guild_check_conflict(int guild_id, int account_id, int char_id) { + numdb_foreach(guild_db, guild_check_conflict_sub, guild_id, account_id, char_id); + + return 0; +} + +int guild_nextexp(int level) { + if (level < 100) + return guild_exp[level-1]; + + return 0; +} + +// ギルドスキルがあるか確認 +int guild_checkskill(struct guild *g, int id){ + return g->skill[id-10000].lv; +} + +// ギルドの情報の再計算 +int guild_calcinfo(struct guild *g) { + int i, c, nextexp; + struct guild before = *g; + + // スキルIDの設定 + for(i = 0; i < 5; i++) + g->skill[i].id = i + 10000; + + // ギルドレベル + if (g->guild_lv <= 0) + g->guild_lv = 1; + nextexp = guild_nextexp(g->guild_lv); + if (nextexp > 0) { + while(g->exp >= nextexp) { // レベルアップ処理 + g->exp -= nextexp; + g->guild_lv++; + g->skill_point++; + nextexp = guild_nextexp(g->guild_lv); + } + } + + // ギルドの次の経験値 + g->next_exp = guild_nextexp(g->guild_lv); + + // メンバ上限(ギルド拡張適用) + g->max_member = 16 + guild_checkskill(g, 10004) * 2; + + // 平均レベルとオンライン人数 + g->average_lv = 0; + g->connect_member = 0; + c = 0; + for(i = 0; i < g->max_member; i++) { + if (g->member[i].account_id > 0) { + g->average_lv += g->member[i].lv; + c++; + if (g->member[i].online > 0) + g->connect_member++; + } + } + g->average_lv /= c; + + // 全データを送る必要がありそう + if (g->max_member != before.max_member || + g->guild_lv != before.guild_lv || + g->skill_point != before.skill_point) { + mapif_guild_info(-1, g); + return 1; + } + + return 0; +} + +//------------------------------------------------------------------- +// map serverへの通信 + +// ギルド作成可否 +int mapif_guild_created(int fd, int account_id, struct guild *g) { + WFIFOW(fd,0) = 0x3830; + WFIFOL(fd,2) = account_id; + if (g != NULL) { + WFIFOL(fd,6) = g->guild_id; + printf("int_guild: created! %d %s\n", g->guild_id, g->name); + }else{ + WFIFOL(fd,6) = 0; + } + WFIFOSET(fd,10); + return 0; +} + +// ギルド情報見つからず +int mapif_guild_noinfo(int fd, int guild_id) { + WFIFOW(fd,0) = 0x3831; + WFIFOW(fd,2) = 8; + WFIFOL(fd,4) = guild_id; + WFIFOSET(fd,8); + printf("int_guild: info not found %d\n", guild_id); + + return 0; +} + +// ギルド情報まとめ送り +int mapif_guild_info(int fd, struct guild *g) { + unsigned char buf[4 + sizeof(struct guild)]; + + WBUFW(buf,0) = 0x3831; + memcpy(buf + 4, g, sizeof(struct guild)); + WBUFW(buf,2) = 4 + sizeof(struct guild); +// printf("int_guild: sizeof(guild)=%d\n", sizeof(struct guild)); + if (fd < 0) + mapif_sendall(buf, WBUFW(buf,2)); + else + mapif_send(fd, buf, WBUFW(buf,2)); +// printf("int_guild: info %d %s\n", p->guild_id, p->name); + + return 0; +} + +// メンバ追加可否 +int mapif_guild_memberadded(int fd, int guild_id, int account_id, int char_id, int flag) { + WFIFOW(fd,0) = 0x3832; + WFIFOL(fd,2) = guild_id; + WFIFOL(fd,6) = account_id; + WFIFOL(fd,10) = char_id; + WFIFOB(fd,14) = flag; + WFIFOSET(fd, 15); + + return 0; +} + +// 脱退/追放通知 +int mapif_guild_leaved(int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes) { + unsigned char buf[79]; + + WBUFW(buf, 0) = 0x3834; + WBUFL(buf, 2) = guild_id; + WBUFL(buf, 6) = account_id; + WBUFL(buf,10) = char_id; + WBUFB(buf,14) = flag; + memcpy(WBUFP(buf,15), mes, 40); + memcpy(WBUFP(buf,55), name, 24); + mapif_sendall(buf, 79); + printf("int_guild: guild leaved %d %d %s %s\n", guild_id, account_id, name, mes); + + return 0; +} + +// オンライン状態とLv更新通知 +int mapif_guild_memberinfoshort(struct guild *g, int idx) { + unsigned char buf[19]; + + WBUFW(buf, 0) = 0x3835; + WBUFL(buf, 2) = g->guild_id; + WBUFL(buf, 6) = g->member[idx].account_id; + WBUFL(buf,10) = g->member[idx].char_id; + WBUFB(buf,14) = g->member[idx].online; + WBUFW(buf,15) = g->member[idx].lv; + WBUFW(buf,17) = g->member[idx].class; + mapif_sendall(buf, 19); + return 0; +} + +// 解散通知 +int mapif_guild_broken(int guild_id, int flag) { + unsigned char buf[7]; + + WBUFW(buf,0) = 0x3836; + WBUFL(buf,2) = guild_id; + WBUFB(buf,6) = flag; + mapif_sendall(buf, 7); + printf("int_guild: broken %d\n", guild_id); + + return 0; +} + +// ギルド内発言 +int mapif_guild_message(int guild_id, int account_id, char *mes, int len) { + unsigned char buf[len+12]; + + WBUFW(buf,0) = 0x3837; + WBUFW(buf,2) = len + 12; + WBUFL(buf,4) = guild_id; + WBUFL(buf,8) = account_id; + memcpy(WBUFP(buf,12), mes, len); + mapif_sendall(buf, len + 12); + + return 0; +} + +// ギルド基本情報変更通知 +int mapif_guild_basicinfochanged(int guild_id, int type, const void *data, int len) { + unsigned char buf[2048]; + + WBUFW(buf,0) = 0x3839; + WBUFW(buf,2) = len+10; + WBUFL(buf,4) = guild_id; + WBUFW(buf,8) = type; + memcpy(WBUFP(buf,10),data,len); + mapif_sendall(buf,len+10); + return 0; +} + +// ギルドメンバ情報変更通知 +int mapif_guild_memberinfochanged(int guild_id, int account_id, int char_id, int type, const void *data, int len) { + unsigned char buf[len + 18]; + + WBUFW(buf, 0) = 0x383a; + WBUFW(buf, 2) = len + 18; + WBUFL(buf, 4) = guild_id; + WBUFL(buf, 8) = account_id; + WBUFL(buf,12) = char_id; + WBUFW(buf,16) = type; + memcpy(WBUFP(buf,18), data, len); + mapif_sendall(buf,len+18); + + return 0; +} + +// ギルドスキルアップ通知 +int mapif_guild_skillupack(int guild_id, int skill_num, int account_id) { + unsigned char buf[14]; + + WBUFW(buf, 0) = 0x383c; + WBUFL(buf, 2) = guild_id; + WBUFL(buf, 6) = skill_num; + WBUFL(buf,10) = account_id; + mapif_sendall(buf, 14); + + return 0; +} + +// ギルド同盟/敵対通知 +int mapif_guild_alliance(int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2) { + unsigned char buf[67]; + + WBUFW(buf, 0) = 0x383d; + WBUFL(buf, 2) = guild_id1; + WBUFL(buf, 6) = guild_id2; + WBUFL(buf,10) = account_id1; + WBUFL(buf,14) = account_id2; + WBUFB(buf,18) = flag; + memcpy(WBUFP(buf,19), name1, 24); + memcpy(WBUFP(buf,43), name2, 24); + mapif_sendall(buf, 67); + + return 0; +} + +// ギルド役職変更通知 +int mapif_guild_position(struct guild *g, int idx) { + unsigned char buf[sizeof(struct guild_position) + 12]; + + WBUFW(buf,0) = 0x383b; + WBUFW(buf,2) = sizeof(struct guild_position) + 12; + WBUFL(buf,4) = g->guild_id; + WBUFL(buf,8) = idx; + memcpy(WBUFP(buf,12), &g->position[idx], sizeof(struct guild_position)); + mapif_sendall(buf, WBUFW(buf,2)); + + return 0; +} + +// ギルド告知変更通知 +int mapif_guild_notice(struct guild *g) { + unsigned char buf[186]; + + WBUFW(buf,0) = 0x383e; + WBUFL(buf,2) = g->guild_id; + memcpy(WBUFP(buf,6), g->mes1, 60); + memcpy(WBUFP(buf,66), g->mes2, 120); + mapif_sendall(buf, 186); + + return 0; +} + +// ギルドエンブレム変更通知 +int mapif_guild_emblem(struct guild *g) { + unsigned char buf[2048]; + + WBUFW(buf,0) = 0x383f; + WBUFW(buf,2) = g->emblem_len + 12; + WBUFL(buf,4) = g->guild_id; + WBUFL(buf,8) = g->emblem_id; + memcpy(WBUFP(buf,12), g->emblem_data, g->emblem_len); + mapif_sendall(buf, WBUFW(buf,2)); + + return 0; +} + +int mapif_guild_castle_dataload(int castle_id, int index, int value) { + unsigned char buf[9]; + + WBUFW(buf,0) = 0x3840; + WBUFW(buf,2) = castle_id; + WBUFB(buf,4) = index; + WBUFL(buf,5) = value; + mapif_sendall(buf,9); + + return 0; +} + +int mapif_guild_castle_datasave(int castle_id, int index, int value) { + unsigned char buf[9]; + + WBUFW(buf,0) = 0x3841; + WBUFW(buf,2) = castle_id; + WBUFB(buf,4) = index; + WBUFL(buf,5) = value; + mapif_sendall(buf,9); + + return 0; +} + +int mapif_guild_castle_alldataload_sub(void *key, void *data, va_list ap) { + int fd = va_arg(ap, int); + int *p = va_arg(ap, int*); + + memcpy(WFIFOP(fd,*p), (struct guild_castle*)data, sizeof(struct guild_castle)); + (*p) += sizeof(struct guild_castle); + + return 0; +} + +int mapif_guild_castle_alldataload(int fd) { + int len = 4; + + WFIFOW(fd,0) = 0x3842; + numdb_foreach(castle_db, mapif_guild_castle_alldataload_sub, fd, &len); + WFIFOW(fd,2) = len; + WFIFOSET(fd, len); + + return 0; +} + +//------------------------------------------------------------------- +// map serverからの通信 + +// ギルド作成要求 +int mapif_parse_CreateGuild(int fd, int account_id, char *name, struct guild_member *master) { + struct guild *g; + int i; + + for(i = 0; i < 24 && name[i]; i++) { + if (!(name[i] & 0xe0) || name[i] == 0x7f) { + printf("int_guild: illeagal guild name [%s]\n", name); + mapif_guild_created(fd, account_id, NULL); + return 0; + } + } + + if ((g = search_guildname(name)) != NULL) { + printf("int_guild: same name guild exists [%s]\n", name); + mapif_guild_created(fd, account_id, NULL); + return 0; + } + g = calloc(sizeof(struct guild), 1); + if (g == NULL) { + printf("int_guild: CreateGuild: out of memory !\n"); + mapif_guild_created(fd, account_id, NULL); + exit(0); + } + memset(g, 0, sizeof(struct guild)); + g->guild_id = guild_newid++; + memcpy(g->name, name, 24); + memcpy(g->master, master->name, 24); + memcpy(&g->member[0], master, sizeof(struct guild_member)); + + g->position[0].mode = 0x11; + strcpy(g->position[ 0].name, "GuildMaster"); + strcpy(g->position[MAX_GUILDPOSITION-1].name, "Newbie"); + for(i = 1; i < MAX_GUILDPOSITION-1; i++) + sprintf(g->position[i].name, "Position %d", i + 1); + + // ここでギルド情報計算が必要と思われる + g->max_member = 16; + g->average_lv = master->lv; + for(i = 0; i < 5; i++) + g->skill[i].id = i + 10000; + + numdb_insert(guild_db, g->guild_id, g); + + mapif_guild_created(fd, account_id, g); + mapif_guild_info(fd, g); + + inter_log("guild %s (id=%d) created by master %s (id=%d)" RETCODE, + name, g->guild_id, master->name, master->account_id); + + return 0; +} + +// ギルド情報要求 +int mapif_parse_GuildInfo(int fd, int guild_id) { + struct guild *g; + + g = numdb_search(guild_db, guild_id); + if (g != NULL){ + guild_calcinfo(g); + mapif_guild_info(fd, g); + } else + mapif_guild_noinfo(fd, guild_id); + + return 0; +} + +// ギルドメンバ追加要求 +int mapif_parse_GuildAddMember(int fd, int guild_id, struct guild_member *m) { + struct guild *g; + int i; + + g = numdb_search(guild_db, guild_id); + if (g == NULL) { + mapif_guild_memberadded(fd, guild_id, m->account_id, m->char_id, 1); + return 0; + } + + for(i = 0; i < g->max_member; i++) { + if (g->member[i].account_id == 0) { + memcpy(&g->member[i], m, sizeof(struct guild_member)); + mapif_guild_memberadded(fd, guild_id, m->account_id, m->char_id, 0); + guild_calcinfo(g); + mapif_guild_info(-1, g); + + return 0; + } + } + mapif_guild_memberadded(fd, guild_id, m->account_id, m->char_id, 1); + + return 0; +} + +// ギルド脱退/追放要求 +int mapif_parse_GuildLeave(int fd, int guild_id, int account_id, int char_id, int flag, const char *mes) { + struct guild *g = NULL; + int i, j; + + g = numdb_search(guild_db, guild_id); + if (g != NULL) { + for(i = 0; i < MAX_GUILD; i++) { + if (g->member[i].account_id == account_id && g->member[i].char_id == char_id) { +// printf("%d %d\n", i, (int)(&g->member[i])); +// printf("%d %s\n", i, g->member[i].name); + + if (flag) { // 追放の場合追放リストに入れる + for(j = 0; j < MAX_GUILDEXPLUSION; j++) { + if (g->explusion[j].account_id == 0) + break; + } + if (j == MAX_GUILDEXPLUSION) { // 一杯なので古いのを消す + for(j = 0; j < MAX_GUILDEXPLUSION - 1; j++) + g->explusion[j] = g->explusion[j+1]; + j = MAX_GUILDEXPLUSION - 1; + } + g->explusion[j].account_id = account_id; + memcpy(g->explusion[j].acc, "dummy", 24); + memcpy(g->explusion[j].name, g->member[i].name, 24); + memcpy(g->explusion[j].mes, mes, 40); + } + + mapif_guild_leaved(guild_id, account_id, char_id, flag, g->member[i].name, mes); +// printf("%d %d\n", i, (int)(&g->member[i])); +// printf("%d %s\n", i, (&g->member[i])->name); + memset(&g->member[i], 0, sizeof(struct guild_member)); + + if (guild_check_empty(g) == 0) + mapif_guild_info(-1,g);// まだ人がいるのでデータ送信 + + return 0; + } + } + } + return 0; +} + +// オンライン/Lv更新 +int mapif_parse_GuildChangeMemberInfoShort(int fd, int guild_id, int account_id, int char_id, int online, int lv, int class) { + struct guild *g; + int i, alv, c; + + g = numdb_search(guild_db, guild_id); + if (g == NULL) + return 0; + + g->connect_member = 0; + + alv = 0; + c = 0; + for(i = 0; i < MAX_GUILD; i++) { + if (g->member[i].account_id == account_id && g->member[i].char_id == char_id) { + g->member[i].online = online; + g->member[i].lv = lv; + g->member[i].class = class; + mapif_guild_memberinfoshort(g, i); + } + if (g->member[i].account_id > 0) { + alv += g->member[i].lv; + c++; + } + if (g->member[i].online) + g->connect_member++; + } + // 平均レベル + g->average_lv = alv / c; + + return 0; +} + +// ギルド解散処理用(同盟/敵対を解除) +int guild_break_sub(void *key, void *data, va_list ap) { + struct guild *g = (struct guild *)data; + int guild_id = va_arg(ap, int); + int i; + + for(i = 0; i < MAX_GUILDALLIANCE; i++) { + if (g->alliance[i].guild_id == guild_id) + g->alliance[i].guild_id = 0; + } + return 0; +} + +// ギルド解散要求 +int mapif_parse_BreakGuild(int fd, int guild_id) { + struct guild *g; + + g = numdb_search(guild_db, guild_id); + if(g == NULL) + return 0; + + numdb_foreach(guild_db, guild_break_sub, guild_id); + numdb_erase(guild_db, guild_id); + inter_guild_storage_delete(guild_id); + mapif_guild_broken(guild_id, 0); + + inter_log("guild %s (id=%d) broken" RETCODE, g->name, guild_id); + free(g); + + return 0; +} + +// ギルドメッセージ送信 +int mapif_parse_GuildMessage(int fd, int guild_id, int account_id, char *mes, int len) { + return mapif_guild_message(guild_id, account_id, mes, len); +} + +// ギルド基本データ変更要求 +int mapif_parse_GuildBasicInfoChange(int fd, int guild_id, int type, const char *data, int len) { + struct guild *g; + short dw = *((short *)data); + + g = numdb_search(guild_db, guild_id); + if (g == NULL) + return 0; + + switch(type) { + case GBI_GUILDLV: + if (dw > 0 && g->guild_lv + dw <= 50) { + g->guild_lv+=dw; + g->skill_point+=dw; + } else if (dw < 0 && g->guild_lv + dw >= 1) + g->guild_lv += dw; + mapif_guild_info(-1, g); + return 0; + default: + printf("int_guild: GuildBasicInfoChange: Unknown type %d\n", type); + break; + } + mapif_guild_basicinfochanged(guild_id, type, data, len); + + return 0; +} + +// ギルドメンバデータ変更要求 +int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int char_id, int type, const char *data, int len) { + int i; + struct guild *g; + + g = numdb_search(guild_db, guild_id); + if(g == NULL) + return 0; + + for(i = 0; i < g->max_member; i++) + if (g->member[i].account_id == account_id && g->member[i].char_id == char_id) + break; + if (i == g->max_member) { + printf("int_guild: GuildMemberChange: Not found %d,%d in %d[%s]\n", account_id, char_id, guild_id, g->name); + return 0; + } + switch(type) { + case GMI_POSITION: // 役職 + g->member[i].position = *((int *)data); + break; + case GMI_EXP: // EXP + { + int exp, oldexp = g->member[i].exp; + exp = g->member[i].exp = *((unsigned int *)data); + g->exp += (exp - oldexp); + guild_calcinfo(g); // Lvアップ判断 + mapif_guild_basicinfochanged(guild_id, GBI_EXP, &g->exp, 4); + } + break; + default: + printf("int_guild: GuildMemberInfoChange: Unknown type %d\n", type); + break; + } + mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len); + + return 0; +} + +// ギルド役職名変更要求 +int mapif_parse_GuildPosition(int fd, int guild_id, int idx, struct guild_position *p) { + struct guild *g = numdb_search(guild_db, guild_id); + + if (g == NULL || idx < 0 || idx >= MAX_GUILDPOSITION) { + return 0; + } + memcpy(&g->position[idx], p, sizeof(struct guild_position)); + mapif_guild_position(g, idx); + printf("int_guild: position changed %d\n", idx); + + return 0; +} + +// ギルドスキルアップ要求 +int mapif_parse_GuildSkillUp(int fd, int guild_id, int skill_num, int account_id) { + struct guild *g = numdb_search(guild_db, guild_id); + int idx = skill_num - 10000; + + if (g == NULL || skill_num < 10000) + return 0; + + if (g->skill_point > 0 && g->skill[idx].id > 0 && g->skill[idx].lv < 10) { + g->skill[idx].lv++; + g->skill_point--; + if (guild_calcinfo(g) == 0) + mapif_guild_info(-1, g); + mapif_guild_skillupack(guild_id, skill_num, account_id); + printf("int_guild: skill %d up\n", skill_num); + } + + return 0; +} + +// ギルド同盟要求 +int mapif_parse_GuildAlliance(int fd, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag) { + struct guild *g[2]; + int j, i; + + g[0] = numdb_search(guild_db, guild_id1); + g[1] = numdb_search(guild_db, guild_id2); + if (g[0] == NULL || g[1] == NULL) + return 0; + + if (!(flag & 0x8)) { + for(i = 0; i < 2 - (flag & 1); i++) { + for(j = 0; j < MAX_GUILDALLIANCE; j++) + if (g[i]->alliance[j].guild_id == 0) { + g[i]->alliance[j].guild_id = g[1-i]->guild_id; + memcpy(g[i]->alliance[j].name, g[1-i]->name, 24); + g[i]->alliance[j].opposition = flag & 1; + break; + } + } + } else { // 関係解消 + for(i = 0; i < 2 - (flag & 1); i++) { + for(j = 0; j < MAX_GUILDALLIANCE; j++) + if (g[i]->alliance[j].guild_id == g[1-i]->guild_id && g[i]->alliance[j].opposition == (flag & 1)) { + g[i]->alliance[j].guild_id = 0; + break; + } + } + } + mapif_guild_alliance(guild_id1, guild_id2, account_id1, account_id2, flag, g[0]->name, g[1]->name); + + return 0; +} + +// ギルド告知変更要求 +int mapif_parse_GuildNotice(int fd, int guild_id, const char *mes1, const char *mes2) { + struct guild *g; + + g = numdb_search(guild_db, guild_id); + if (g == NULL) + return 0; + memcpy(g->mes1, mes1, 60); + memcpy(g->mes2, mes2, 120); + + return mapif_guild_notice(g); +} + +// ギルドエンブレム変更要求 +int mapif_parse_GuildEmblem(int fd, int len, int guild_id, int dummy, const char *data) { + struct guild *g; + + g = numdb_search(guild_db, guild_id); + if (g == NULL) + return 0; + memcpy(g->emblem_data, data, len); + g->emblem_len = len; + g->emblem_id++; + + return mapif_guild_emblem(g); +} + +int mapif_parse_GuildCastleDataLoad(int fd, int castle_id, int index) { + struct guild_castle *gc = numdb_search(castle_db, castle_id); + + if (gc == NULL) { + return mapif_guild_castle_dataload(castle_id, 0, 0); + } + switch(index) { + case 1: return mapif_guild_castle_dataload(gc->castle_id, index, gc->guild_id); + case 2: return mapif_guild_castle_dataload(gc->castle_id, index, gc->economy); + case 3: return mapif_guild_castle_dataload(gc->castle_id, index, gc->defense); + case 4: return mapif_guild_castle_dataload(gc->castle_id, index, gc->triggerE); + case 5: return mapif_guild_castle_dataload(gc->castle_id, index, gc->triggerD); + case 6: return mapif_guild_castle_dataload(gc->castle_id, index, gc->nextTime); + case 7: return mapif_guild_castle_dataload(gc->castle_id, index, gc->payTime); + case 8: return mapif_guild_castle_dataload(gc->castle_id, index, gc->createTime); + case 9: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleC); + case 10: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG0); + case 11: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG1); + case 12: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG2); + case 13: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG3); + case 14: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG4); + case 15: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG5); + case 16: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG6); + case 17: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG7); + case 18: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp0); // guardian HP [Valaris] + case 19: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp1); + case 20: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp2); + case 21: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp3); + case 22: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp4); + case 23: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp5); + case 24: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp6); + case 25: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp7); // end additions [Valaris] + + default: + printf("mapif_parse_GuildCastleDataLoad ERROR!! (Not found index=%d)\n", index); + return 0; + } + + return 0; +} + +int mapif_parse_GuildCastleDataSave(int fd, int castle_id, int index, int value) { + struct guild_castle *gc=numdb_search(castle_db, castle_id); + + if (gc == NULL) { + return mapif_guild_castle_datasave(castle_id, index, value); + } + switch(index) { + case 1: + if (gc->guild_id != value) { + int gid = (value) ? value : gc->guild_id; + struct guild *g = numdb_search(guild_db, gid); + inter_log("guild %s (id=%d) %s castle id=%d" RETCODE, + (g) ? g->name : "??", gid, (value) ? "occupy" : "abandon", index); + } + gc->guild_id = value; + break; + case 2: gc->economy = value; break; + case 3: gc->defense = value; break; + case 4: gc->triggerE = value; break; + case 5: gc->triggerD = value; break; + case 6: gc->nextTime = value; break; + case 7: gc->payTime = value; break; + case 8: gc->createTime = value; break; + case 9: gc->visibleC = value; break; + case 10: gc->visibleG0 = value; break; + case 11: gc->visibleG1 = value; break; + case 12: gc->visibleG2 = value; break; + case 13: gc->visibleG3 = value; break; + case 14: gc->visibleG4 = value; break; + case 15: gc->visibleG5 = value; break; + case 16: gc->visibleG6 = value; break; + case 17: gc->visibleG7 = value; break; + case 18: gc->Ghp0 = value; break; // guardian HP [Valaris] + case 19: gc->Ghp1 = value; break; + case 20: gc->Ghp2 = value; break; + case 21: gc->Ghp3 = value; break; + case 22: gc->Ghp4 = value; break; + case 23: gc->Ghp5 = value; break; + case 24: gc->Ghp6 = value; break; + case 25: gc->Ghp7 = value; break; // end additions [Valaris] + default: + printf("mapif_parse_GuildCastleDataSave ERROR!! (Not found index=%d)\n", index); + return 0; + } + + return mapif_guild_castle_datasave(gc->castle_id, index, value); +} + +// ギルドチェック要求 +int mapif_parse_GuildCheck(int fd, int guild_id, int account_id, int char_id) { + return guild_check_conflict(guild_id, account_id, char_id); +} + +// map server からの通信 +// ・1パケットのみ解析すること +// ・パケット長データはinter.cにセットしておくこと +// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない +// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない +int inter_guild_parse_frommap(int fd) { + switch(RFIFOW(fd,0)) { + case 0x3030: mapif_parse_CreateGuild(fd, RFIFOL(fd,4), RFIFOP(fd,8), (struct guild_member *)RFIFOP(fd,32)); break; + case 0x3031: mapif_parse_GuildInfo(fd, RFIFOL(fd,2)); break; + case 0x3032: mapif_parse_GuildAddMember(fd, RFIFOL(fd,4), (struct guild_member *)RFIFOP(fd,8)); break; + case 0x3034: mapif_parse_GuildLeave(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOB(fd,14), RFIFOP(fd,15)); break; + case 0x3035: mapif_parse_GuildChangeMemberInfoShort(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOB(fd,14), RFIFOW(fd,15), RFIFOW(fd,17)); break; + case 0x3036: mapif_parse_BreakGuild(fd, RFIFOL(fd,2)); break; + case 0x3037: mapif_parse_GuildMessage(fd, RFIFOL(fd,4), RFIFOL(fd,8), RFIFOP(fd,12), RFIFOW(fd,2)-12); break; + case 0x3038: mapif_parse_GuildCheck(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); break; + case 0x3039: mapif_parse_GuildBasicInfoChange(fd, RFIFOL(fd,4), RFIFOW(fd,8), RFIFOP(fd,10), RFIFOW(fd,2)-10); break; + case 0x303A: mapif_parse_GuildMemberInfoChange(fd, RFIFOL(fd,4), RFIFOL(fd,8), RFIFOL(fd,12), RFIFOW(fd,16), RFIFOP(fd,18), RFIFOW(fd,2)-18); break; + case 0x303B: mapif_parse_GuildPosition(fd, RFIFOL(fd,4), RFIFOL(fd,8), (struct guild_position *)RFIFOP(fd,12)); break; + case 0x303C: mapif_parse_GuildSkillUp(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); break; + case 0x303D: mapif_parse_GuildAlliance(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14), RFIFOB(fd,18)); break; + case 0x303E: mapif_parse_GuildNotice(fd, RFIFOL(fd,2), RFIFOP(fd,6), RFIFOP(fd,66)); break; + case 0x303F: mapif_parse_GuildEmblem(fd, RFIFOW(fd,2)-12, RFIFOL(fd,4), RFIFOL(fd,8), RFIFOP(fd,12)); break; + case 0x3040: mapif_parse_GuildCastleDataLoad(fd, RFIFOW(fd,2), RFIFOB(fd,4)); break; + case 0x3041: mapif_parse_GuildCastleDataSave(fd, RFIFOW(fd,2), RFIFOB(fd,4), RFIFOL(fd,5)); break; + + default: + return 0; + } + + return 1; +} + +// マップサーバーの接続時処理 +int inter_guild_mapif_init(int fd) { + return mapif_guild_castle_alldataload(fd); +} + +// サーバーから脱退要求(キャラ削除用) +int inter_guild_leave(int guild_id, int account_id, int char_id) { + return mapif_parse_GuildLeave(-1, guild_id, account_id, char_id, 0, "**サーバー命令**"); +} diff --git a/misc/src/char/int_guild.h b/misc/src/char/int_guild.h new file mode 100644 index 0000000..555f5e1 --- /dev/null +++ b/misc/src/char/int_guild.h @@ -0,0 +1,16 @@ +// $Id: int_guild.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $ +#ifndef _INT_GUILD_H_ +#define _INT_GUILD_H_ + +int inter_guild_init(); +int inter_guild_save(); +int inter_guild_parse_frommap(int fd); +struct guild *inter_guild_search(int guild_id); +int inter_guild_mapif_init(int fd); + +int inter_guild_leave(int guild_id,int account_id,int char_id); + +extern char guild_txt[1024]; +extern char castle_txt[1024]; + +#endif diff --git a/misc/src/char/int_party.c b/misc/src/char/int_party.c new file mode 100644 index 0000000..0fd58fa --- /dev/null +++ b/misc/src/char/int_party.c @@ -0,0 +1,595 @@ +// $Id: int_party.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $ +#include "inter.h" +#include "int_party.h" +#include "mmo.h" +#include "char.h" +#include "socket.h" +#include "db.h" +#include "lock.h" +#include +#include +#include + +char party_txt[1024] = "save/party.txt"; + +static struct dbt *party_db; +static int party_newid = 100; + +int mapif_party_broken(int party_id, int flag); +int party_check_empty(struct party *p); +int mapif_parse_PartyLeave(int fd, int party_id, int account_id); + +// パーティデータの文字列への変換 +int inter_party_tostr(char *str, struct party *p) { + int i, len; + + len = sprintf(str, "%d\t%s\t%d,%d\t", p->party_id, p->name, p->exp, p->item); + for(i = 0; i < MAX_PARTY; i++) { + struct party_member *m = &p->member[i]; + len += sprintf(str + len, "%d,%d\t%s\t", m->account_id, m->leader, ((m->account_id > 0) ? m->name : "NoMember")); + } + + return 0; +} + +// パーティデータの文字列からの変換 +int inter_party_fromstr(char *str, struct party *p) { + int i, j; + int tmp_int[16]; + char tmp_str[256]; + + memset(p, 0, sizeof(struct party)); + +// printf("sscanf party main info\n"); + if (sscanf(str, "%d\t%[^\t]\t%d,%d\t", &tmp_int[0], tmp_str, &tmp_int[1], &tmp_int[2]) != 4) + return 1; + + p->party_id = tmp_int[0]; + strcpy(p->name, tmp_str); + p->exp = tmp_int[1]; + p->item = tmp_int[2]; +// printf("%d [%s] %d %d\n", tmp_int[0], tmp_str[0], tmp_int[1], tmp_int[2]); + + for(j = 0; j < 3 && str != NULL; j++) + str = strchr(str + 1, '\t'); + + for(i = 0; i < MAX_PARTY; i++) { + struct party_member *m = &p->member[i]; + if (str == NULL) + return 1; +// printf("sscanf party member info %d\n", i); + + if (sscanf(str + 1, "%d,%d\t%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str) != 3) + return 1; + + m->account_id = tmp_int[0]; + m->leader = tmp_int[1]; + strncpy(m->name, tmp_str, sizeof(m->name)); +// printf(" %d %d [%s]\n", tmp_int[0], tmp_int[1], tmp_str); + + for(j = 0; j < 2 && str != NULL; j++) + str = strchr(str + 1, '\t'); + } + + return 0; +} + +// パーティデータのロード +int inter_party_init() { + char line[8192]; + struct party *p; + FILE *fp; + int c = 0; + int i, j; + + party_db = numdb_init(); + + if ((fp = fopen(party_txt, "r")) == NULL) + return 1; + + while(fgets(line, sizeof(line) - 1, fp)) { + j = 0; + if (sscanf(line, "%d\t%%newid%%\n%n", &i, &j) == 1 && j > 0 && party_newid <= i) { + party_newid = i; + continue; + } + + p = calloc(sizeof(struct party), 1); + if (p == NULL){ + printf("int_party: out of memory!\n"); + exit(0); + } + memset(p, 0, sizeof(struct party)); + if (inter_party_fromstr(line, p) == 0 && p->party_id > 0) { + if (p->party_id >= party_newid) + party_newid = p->party_id + 1; + numdb_insert(party_db, p->party_id, p); + party_check_empty(p); + } else { + printf("int_party: broken data [%s] line %d\n", party_txt, c + 1); + free(p); + } + c++; + } + fclose(fp); +// printf("int_party: %s read done (%d parties)\n", party_txt, c); + + return 0; +} + +// パーティーデータのセーブ用 +int inter_party_save_sub(void *key, void *data, va_list ap) { + char line[8192]; + FILE *fp; + + inter_party_tostr(line, (struct party *)data); + fp = va_arg(ap, FILE *); + fprintf(fp, "%s" RETCODE, line); + + return 0; +} + +// パーティーデータのセーブ +int inter_party_save() { + FILE *fp; + int lock; + + if ((fp = lock_fopen(party_txt, &lock)) == NULL) { + printf("int_party: cant write [%s] !!! data is lost !!!\n", party_txt); + return 1; + } + numdb_foreach(party_db, inter_party_save_sub, fp); +// fprintf(fp, "%d\t%%newid%%\n", party_newid); + lock_fclose(fp,party_txt, &lock); +// printf("int_party: %s saved.\n", party_txt); + + return 0; +} + +// パーティ名検索用 +int search_partyname_sub(void *key,void *data,va_list ap) { + struct party *p = (struct party *)data,**dst; + char *str; + + str = va_arg(ap, char *); + dst = va_arg(ap, struct party **); + if (strcmpi(p->name, str) == 0) + *dst = p; + + return 0; +} + +// パーティ名検索 +struct party* search_partyname(char *str) { + struct party *p = NULL; + numdb_foreach(party_db, search_partyname_sub, str, &p); + + return p; +} + +// EXP公平分配できるかチェック +int party_check_exp_share(struct party *p) { + int i; + int maxlv = 0, minlv = 0x7fffffff; + + for(i = 0; i < MAX_PARTY; i++) { + int lv = p->member[i].lv; + if (p->member[i].online) { + if (lv < minlv) + minlv = lv; + if (maxlv < lv) + maxlv = lv; + } + } + + return (maxlv == 0 || maxlv-minlv <= party_share_level); +} + +// パーティが空かどうかチェック +int party_check_empty(struct party *p) { + int i; + +// printf("party check empty %08X\n", (int)p); + for(i = 0; i < MAX_PARTY; i++) { +// printf("%d acc=%d\n", i, p->member[i].account_id); + if (p->member[i].account_id > 0) { + return 0; + } + } + // 誰もいないので解散 + mapif_party_broken(p->party_id, 0); + numdb_erase(party_db, p->party_id); + free(p); + + return 1; +} + +// キャラの競合がないかチェック用 +int party_check_conflict_sub(void *key, void *data, va_list ap) { + struct party *p = (struct party *)data; + int party_id, account_id, i; + char *nick; + + party_id=va_arg(ap, int); + account_id=va_arg(ap, int); + nick=va_arg(ap, char *); + + if (p->party_id == party_id) // 本来の所属なので問題なし + return 0; + + for(i = 0; i < MAX_PARTY; i++) { + if (p->member[i].account_id == account_id && strcmp(p->member[i].name, nick) == 0) { + // 別のパーティに偽の所属データがあるので脱退 + printf("int_party: party conflict! %d %d %d\n", account_id, party_id, p->party_id); + mapif_parse_PartyLeave(-1, p->party_id, account_id); + } + } + + return 0; +} + +// キャラの競合がないかチェック +int party_check_conflict(int party_id, int account_id, char *nick) { + numdb_foreach(party_db, party_check_conflict_sub, party_id, account_id, nick); + + return 0; +} + +//------------------------------------------------------------------- +// map serverへの通信 + +// パーティ作成可否 +int mapif_party_created(int fd,int account_id, struct party *p) { + WFIFOW(fd,0) = 0x3820; + WFIFOL(fd,2) = account_id; + if (p != NULL) { + WFIFOB(fd,6) = 0; + WFIFOL(fd,7) = p->party_id; + memcpy(WFIFOP(fd,11), p->name, 24); + printf("int_party: created! %d %s\n", p->party_id, p->name); + } else { + WFIFOB(fd,6) = 1; + WFIFOL(fd,7) = 0; + memcpy(WFIFOP(fd,11), "error", 24); + } + WFIFOSET(fd,35); + + return 0; +} + +// パーティ情報見つからず +int mapif_party_noinfo(int fd, int party_id) { + WFIFOW(fd,0) = 0x3821; + WFIFOW(fd,2) = 8; + WFIFOL(fd,4) = party_id; + WFIFOSET(fd,8); + printf("int_party: info not found %d\n", party_id); + + return 0; +} + +// パーティ情報まとめ送り +int mapif_party_info(int fd, struct party *p) { + unsigned char buf[4 + sizeof(struct party)]; + + WBUFW(buf,0) = 0x3821; + memcpy(buf + 4, p, sizeof(struct party)); + WBUFW(buf,2) = 4 + sizeof(struct party); + if (fd < 0) + mapif_sendall(buf, WBUFW(buf,2)); + else + mapif_send(fd, buf, WBUFW(buf,2)); +// printf("int_party: info %d %s\n", p->party_id, p->name); + + return 0; +} + +// パーティメンバ追加可否 +int mapif_party_memberadded(int fd, int party_id, int account_id, int flag) { + WFIFOW(fd,0) = 0x3822; + WFIFOL(fd,2) = party_id; + WFIFOL(fd,6) = account_id; + WFIFOB(fd,10) = flag; + WFIFOSET(fd,11); + + return 0; +} + +// パーティ設定変更通知 +int mapif_party_optionchanged(int fd,struct party *p, int account_id, int flag) { + unsigned char buf[15]; + + WBUFW(buf,0) = 0x3823; + WBUFL(buf,2) = p->party_id; + WBUFL(buf,6) = account_id; + WBUFW(buf,10) = p->exp; + WBUFW(buf,12) = p->item; + WBUFB(buf,14) = flag; + if (flag == 0) + mapif_sendall(buf, 15); + else + mapif_send(fd, buf, 15); + printf("int_party: option changed %d %d %d %d %d\n", p->party_id, account_id, p->exp, p->item, flag); + + return 0; +} + +// パーティ脱退通知 +int mapif_party_leaved(int party_id,int account_id, char *name) { + unsigned char buf[34]; + + WBUFW(buf,0) = 0x3824; + WBUFL(buf,2) = party_id; + WBUFL(buf,6) = account_id; + memcpy(WBUFP(buf,10), name, 24); + mapif_sendall(buf, 34); + printf("int_party: party leaved %d %d %s\n", party_id, account_id, name); + + return 0; +} + +// パーティマップ更新通知 +int mapif_party_membermoved(struct party *p, int idx) { + unsigned char buf[29]; + + WBUFW(buf,0) = 0x3825; + WBUFL(buf,2) = p->party_id; + WBUFL(buf,6) = p->member[idx].account_id; + memcpy(WBUFP(buf,10), p->member[idx].map, 16); + WBUFB(buf,26) = p->member[idx].online; + WBUFW(buf,27) = p->member[idx].lv; + mapif_sendall(buf, 29); + + return 0; +} + +// パーティ解散通知 +int mapif_party_broken(int party_id, int flag) { + unsigned char buf[7]; + WBUFW(buf,0) = 0x3826; + WBUFL(buf,2) = party_id; + WBUFB(buf,6) = flag; + mapif_sendall(buf, 7); + printf("int_party: broken %d\n", party_id); + + return 0; +} + +// パーティ内発言 +int mapif_party_message(int party_id, int account_id, char *mes, int len) { + unsigned char buf[len+12]; + + WBUFW(buf,0) = 0x3827; + WBUFW(buf,2) = len + 12; + WBUFL(buf,4) = party_id; + WBUFL(buf,8) = account_id; + memcpy(WBUFP(buf,12), mes, len); + mapif_sendall(buf,len + 12); + + return 0; +} + +//------------------------------------------------------------------- +// map serverからの通信 + + +// パーティ +int mapif_parse_CreateParty(int fd, int account_id, char *name, char *nick, char *map, int lv) { + struct party *p; + int i; + + for(i = 0; i < 24 && name[i]; i++) { + if (!(name[i] & 0xe0) || name[i] == 0x7f) { + printf("int_party: illegal party name [%s]\n", name); + mapif_party_created(fd, account_id, NULL); + return 0; + } + } + + if ((p = search_partyname(name)) != NULL) { + printf("int_party: same name party exists [%s]\n", name); + mapif_party_created(fd, account_id, NULL); + return 0; + } + p = calloc(sizeof(struct party), 1); + if (p == NULL) { + printf("int_party: out of memory !\n"); + mapif_party_created(fd,account_id,NULL); + return 0; + } + memset(p, 0, sizeof(struct party)); + p->party_id = party_newid++; + memcpy(p->name, name, 24); + p->exp = 0; + p->item = 0; + p->member[0].account_id = account_id; + memcpy(p->member[0].name, nick, 24); + memcpy(p->member[0].map, map, 16); + p->member[0].leader = 1; + p->member[0].online = 1; + p->member[0].lv = lv; + + numdb_insert(party_db, p->party_id, p); + + mapif_party_created(fd, account_id, p); + mapif_party_info(fd, p); + + return 0; +} + +// パーティ情報要求 +int mapif_parse_PartyInfo(int fd, int party_id) { + struct party *p; + + p = numdb_search(party_db, party_id); + if (p != NULL) + mapif_party_info(fd, p); + else + mapif_party_noinfo(fd, party_id); + + return 0; +} + +// パーティ追加要求 +int mapif_parse_PartyAddMember(int fd, int party_id, int account_id, char *nick, char *map, int lv) { + struct party *p; + int i; + + p = numdb_search(party_db, party_id); + if (p == NULL) { + mapif_party_memberadded(fd, party_id, account_id, 1); + return 0; + } + + for(i = 0; i < MAX_PARTY; i++) { + if (p->member[i].account_id == 0) { + int flag = 0; + + p->member[i].account_id = account_id; + memcpy(p->member[i].name, nick, 24); + memcpy(p->member[i].map, map, 16); + p->member[i].leader = 0; + p->member[i].online = 1; + p->member[i].lv = lv; + mapif_party_memberadded(fd, party_id, account_id, 0); + mapif_party_info(-1, p); + + if (p->exp > 0 && !party_check_exp_share(p)) { + p->exp = 0; + flag = 0x01; + } + if (flag) + mapif_party_optionchanged(fd, p, 0, 0); + return 0; + } + } + mapif_party_memberadded(fd, party_id, account_id, 1); + + return 0; +} + +// パーティー設定変更要求 +int mapif_parse_PartyChangeOption(int fd, int party_id, int account_id, int exp, int item) { + struct party *p; + int flag = 0; + + p = numdb_search(party_db, party_id); + if (p == NULL) + return 0; + + p->exp = exp; + if (exp>0 && !party_check_exp_share(p)) { + flag |= 0x01; + p->exp = 0; + } + + p->item = item; + + mapif_party_optionchanged(fd, p, account_id, flag); + return 0; +} + +// パーティ脱退要求 +int mapif_parse_PartyLeave(int fd, int party_id, int account_id) { + struct party *p; + int i; + + p = numdb_search(party_db, party_id); + if (p != NULL) { + for(i = 0; i < MAX_PARTY; i++) { + if (p->member[i].account_id == account_id) { + mapif_party_leaved(party_id, account_id, p->member[i].name); + + memset(&p->member[i], 0, sizeof(struct party_member)); + if (party_check_empty(p) == 0) + mapif_party_info(-1, p);// まだ人がいるのでデータ送信 + return 0; + } + } + } + + return 0; +} + +// パーティマップ更新要求 +int mapif_parse_PartyChangeMap(int fd, int party_id, int account_id, char *map, int online, int lv) { + struct party *p; + int i; + + p = numdb_search(party_db, party_id); + if (p == NULL) + return 0; + + for(i = 0; i < MAX_PARTY; i++) { + if (p->member[i].account_id == account_id) { + int flag = 0; + + memcpy(p->member[i].map, map, 16); + p->member[i].online = online; + p->member[i].lv = lv; + mapif_party_membermoved(p, i); + + if (p->exp > 0 && !party_check_exp_share(p)) { + p->exp = 0; + flag = 1; + } + if (flag) + mapif_party_optionchanged(fd, p, 0, 0); + break; + } + } + + return 0; +} + +// パーティ解散要求 +int mapif_parse_BreakParty(int fd, int party_id) { + struct party *p; + + p = numdb_search(party_db, party_id); + if (p == NULL) + return 0; + + numdb_erase(party_db, party_id); + mapif_party_broken(fd, party_id); + + return 0; +} + +// パーティメッセージ送信 +int mapif_parse_PartyMessage(int fd, int party_id, int account_id, char *mes, int len) { + return mapif_party_message(party_id, account_id, mes, len); +} +// パーティチェック要求 +int mapif_parse_PartyCheck(int fd, int party_id, int account_id, char *nick) { + return party_check_conflict(party_id, account_id, nick); +} + +// map server からの通信 +// ・1パケットのみ解析すること +// ・パケット長データはinter.cにセットしておくこと +// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない +// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない +int inter_party_parse_frommap(int fd) { + switch(RFIFOW(fd,0)) { + case 0x3020: mapif_parse_CreateParty(fd, RFIFOL(fd,2), RFIFOP(fd,6), RFIFOP(fd,30), RFIFOP(fd,54), RFIFOW(fd,70)); break; + case 0x3021: mapif_parse_PartyInfo(fd, RFIFOL(fd,2)); break; + case 0x3022: mapif_parse_PartyAddMember(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOP(fd,10), RFIFOP(fd,34), RFIFOW(fd,50)); break; + case 0x3023: mapif_parse_PartyChangeOption(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOW(fd,10), RFIFOW(fd,12)); break; + case 0x3024: mapif_parse_PartyLeave(fd, RFIFOL(fd,2), RFIFOL(fd,6)); break; + case 0x3025: mapif_parse_PartyChangeMap(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOP(fd,10), RFIFOB(fd,26), RFIFOW(fd,27)); break; + case 0x3026: mapif_parse_BreakParty(fd, RFIFOL(fd,2)); break; + case 0x3027: mapif_parse_PartyMessage(fd, RFIFOL(fd,4), RFIFOL(fd,8), RFIFOP(fd,12), RFIFOW(fd,2)-12); break; + case 0x3028: mapif_parse_PartyCheck(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOP(fd,10)); break; + default: + return 0; + } + + return 1; +} + +// サーバーから脱退要求(キャラ削除用) +int inter_party_leave(int party_id, int account_id) { + return mapif_parse_PartyLeave(-1, party_id, account_id); +} + diff --git a/misc/src/char/int_party.h b/misc/src/char/int_party.h new file mode 100644 index 0000000..b265b4c --- /dev/null +++ b/misc/src/char/int_party.h @@ -0,0 +1,14 @@ +// $Id: int_party.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $ +#ifndef _INT_PARTY_H_ +#define _INT_PARTY_H_ + +int inter_party_init(); +int inter_party_save(); + +int inter_party_parse_frommap(int fd); + +int inter_party_leave(int party_id,int account_id); + +extern char party_txt[1024]; + +#endif diff --git a/misc/src/char/int_pet.c b/misc/src/char/int_pet.c new file mode 100644 index 0000000..cff1e43 --- /dev/null +++ b/misc/src/char/int_pet.c @@ -0,0 +1,364 @@ +// $Id: int_pet.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $ +#include "inter.h" +#include "int_pet.h" +#include "mmo.h" +#include "char.h" +#include "socket.h" +#include "db.h" +#include "lock.h" +#include +#include +#include + + +char pet_txt[1024]="save/pet.txt"; + +static struct dbt *pet_db; +static int pet_newid = 100; + +int inter_pet_tostr(char *str,struct s_pet *p) +{ + int len; + + if(p->hungry < 0) + p->hungry = 0; + else if(p->hungry > 100) + p->hungry = 100; + if(p->intimate < 0) + p->intimate = 0; + else if(p->intimate > 1000) + p->intimate = 1000; + + len=sprintf(str,"%d,%d,%s\t%d,%d,%d,%d,%d,%d,%d,%d,%d", + p->pet_id,p->class,p->name,p->account_id,p->char_id,p->level,p->egg_id, + p->equip,p->intimate,p->hungry,p->rename_flag,p->incuvate); + + return 0; +} + +int inter_pet_fromstr(char *str,struct s_pet *p) +{ + int s; + int tmp_int[16]; + char tmp_str[256]; + + memset(p,0,sizeof(struct s_pet)); + +// printf("sscanf pet main info\n"); + s=sscanf(str,"%d,%d,%[^\t]\t%d,%d,%d,%d,%d,%d,%d,%d,%d",&tmp_int[0],&tmp_int[1],tmp_str,&tmp_int[2], + &tmp_int[3],&tmp_int[4],&tmp_int[5],&tmp_int[6],&tmp_int[7],&tmp_int[8],&tmp_int[9],&tmp_int[10]); + + if(s!=12) + return 1; + + p->pet_id = tmp_int[0]; + p->class = tmp_int[1]; + memcpy(p->name,tmp_str,24); + p->account_id = tmp_int[2]; + p->char_id = tmp_int[3]; + p->level = tmp_int[4]; + p->egg_id = tmp_int[5]; + p->equip = tmp_int[6]; + p->intimate = tmp_int[7]; + p->hungry = tmp_int[8]; + p->rename_flag = tmp_int[9]; + p->incuvate = tmp_int[10]; + + if(p->hungry < 0) + p->hungry = 0; + else if(p->hungry > 100) + p->hungry = 100; + if(p->intimate < 0) + p->intimate = 0; + else if(p->intimate > 1000) + p->intimate = 1000; + + return 0; +} + +int inter_pet_init() +{ + char line[8192]; + struct s_pet *p; + FILE *fp; + int c=0; + + pet_db=numdb_init(); + + if( (fp=fopen(pet_txt,"r"))==NULL ) + return 1; + while(fgets(line,sizeof(line),fp)){ + p=calloc(sizeof(struct s_pet), 1); + if(p==NULL){ + printf("int_pet: out of memory!\n"); + exit(0); + } + memset(p,0,sizeof(struct s_pet)); + if(inter_pet_fromstr(line,p)==0 && p->pet_id>0){ + if( p->pet_id >= pet_newid) + pet_newid=p->pet_id+1; + numdb_insert(pet_db,p->pet_id,p); + }else{ + printf("int_pet: broken data [%s] line %d\n",pet_txt,c); + free(p); + } + c++; + } + fclose(fp); +// printf("int_pet: %s read done (%d pets)\n",pet_txt,c); + return 0; +} + +int inter_pet_save_sub(void *key,void *data,va_list ap) +{ + char line[8192]; + FILE *fp; + inter_pet_tostr(line,(struct s_pet *)data); + fp=va_arg(ap,FILE *); + fprintf(fp,"%s" RETCODE,line); + return 0; +} + +int inter_pet_save() +{ + FILE *fp; + int lock; + if( (fp=lock_fopen(pet_txt,&lock))==NULL ){ + printf("int_pet: cant write [%s] !!! data is lost !!!\n",pet_txt); + return 1; + } + numdb_foreach(pet_db,inter_pet_save_sub,fp); + lock_fclose(fp,pet_txt,&lock); +// printf("int_pet: %s saved.\n",pet_txt); + return 0; +} + +int inter_pet_delete(int pet_id) +{ + struct s_pet *p; + p = numdb_search(pet_db,pet_id); + if( p == NULL) + return 1; + else { + numdb_erase(pet_db,pet_id); + printf("pet_id: %d deleted\n",pet_id); + } + return 0; +} + +int mapif_pet_created(int fd,int account_id,struct s_pet *p) +{ + WFIFOW(fd,0)=0x3880; + WFIFOL(fd,2)=account_id; + if(p!=NULL){ + WFIFOB(fd,6)=0; + WFIFOL(fd,7)=p->pet_id; + printf("int_pet: created! %d %s\n",p->pet_id,p->name); + }else{ + WFIFOB(fd,6)=1; + WFIFOL(fd,7)=0; + } + WFIFOSET(fd,11); + + return 0; +} + +int mapif_pet_info(int fd,int account_id,struct s_pet *p) +{ + WFIFOW(fd,0)=0x3881; + WFIFOW(fd,2)=sizeof(struct s_pet) + 9; + WFIFOL(fd,4)=account_id; + WFIFOB(fd,8)=0; + memcpy(WFIFOP(fd,9),p,sizeof(struct s_pet)); + WFIFOSET(fd,WFIFOW(fd,2)); + + return 0; +} + +int mapif_pet_noinfo(int fd,int account_id) +{ + WFIFOW(fd,0)=0x3881; + WFIFOW(fd,2)=sizeof(struct s_pet) + 9; + WFIFOL(fd,4)=account_id; + WFIFOB(fd,8)=1; + memset(WFIFOP(fd,9),0,sizeof(struct s_pet)); + WFIFOSET(fd,WFIFOW(fd,2)); + + return 0; +} + +int mapif_save_pet_ack(int fd,int account_id,int flag) +{ + WFIFOW(fd,0)=0x3882; + WFIFOL(fd,2)=account_id; + WFIFOB(fd,6)=flag; + WFIFOSET(fd,7); + + return 0; +} + +int mapif_delete_pet_ack(int fd,int flag) +{ + WFIFOW(fd,0)=0x3883; + WFIFOB(fd,2)=flag; + WFIFOSET(fd,3); + + return 0; +} + +int mapif_create_pet(int fd,int account_id,int char_id,short pet_class,short pet_lv,short pet_egg_id, + short pet_equip,short intimate,short hungry,char rename_flag,char incuvate,char *pet_name) +{ + struct s_pet *p; + p=malloc(sizeof(struct s_pet)); + if(p==NULL){ + printf("int_pet: out of memory !\n"); + mapif_pet_created(fd,account_id,NULL); + return 0; + } + memset(p,0,sizeof(struct s_pet)); + p->pet_id = pet_newid++; + memcpy(p->name,pet_name,24); + if(incuvate == 1) + p->account_id = p->char_id = 0; + else { + p->account_id = account_id; + p->char_id = char_id; + } + p->class = pet_class; + p->level = pet_lv; + p->egg_id = pet_egg_id; + p->equip = pet_equip; + p->intimate = intimate; + p->hungry = hungry; + p->rename_flag = rename_flag; + p->incuvate = incuvate; + + if(p->hungry < 0) + p->hungry = 0; + else if(p->hungry > 100) + p->hungry = 100; + if(p->intimate < 0) + p->intimate = 0; + else if(p->intimate > 1000) + p->intimate = 1000; + + numdb_insert(pet_db,p->pet_id,p); + + mapif_pet_created(fd,account_id,p); + + return 0; +} + +int mapif_load_pet(int fd,int account_id,int char_id,int pet_id) +{ + struct s_pet *p; + p=numdb_search(pet_db,pet_id); + if(p!=NULL) { + if(p->incuvate == 1) { + p->account_id = p->char_id = 0; + mapif_pet_info(fd,account_id,p); + } + else if(account_id == p->account_id && char_id == p->char_id) + mapif_pet_info(fd,account_id,p); + else + mapif_pet_noinfo(fd,account_id); + } + else + mapif_pet_noinfo(fd,account_id); + + return 0; +} + +int mapif_save_pet(int fd,int account_id,struct s_pet *data) +{ + struct s_pet *p; + int pet_id; + int len=RFIFOW(fd,2); + if(sizeof(struct s_pet)!=len-8) { + printf("inter pet: data size error %d %d\n",sizeof(struct s_pet),len-8); + } + else{ + pet_id = data->pet_id; + p=numdb_search(pet_db,pet_id); + if(p == NULL) { + p=malloc(sizeof(struct s_pet)); + if(p==NULL){ + printf("int_pet: out of memory !\n"); + mapif_save_pet_ack(fd,account_id,1); + return 0; + } + memset(p,0,sizeof(struct s_pet)); + p->pet_id = data->pet_id; + if(p->pet_id == 0) + data->pet_id = p->pet_id = pet_newid++; + numdb_insert(pet_db,p->pet_id,p); + } + if(data->hungry < 0) + data->hungry = 0; + else if(data->hungry > 100) + data->hungry = 100; + if(data->intimate < 0) + data->intimate = 0; + else if(data->intimate > 1000) + data->intimate = 1000; + memcpy(p,data,sizeof(struct s_pet)); + if(p->incuvate == 1) + p->account_id = p->char_id = 0; + + mapif_save_pet_ack(fd,account_id,0); + } + + return 0; +} + +int mapif_delete_pet(int fd,int pet_id) +{ + mapif_delete_pet_ack(fd,inter_pet_delete(pet_id)); + + return 0; +} + +int mapif_parse_CreatePet(int fd) +{ + mapif_create_pet(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOW(fd,10),RFIFOW(fd,12),RFIFOW(fd,14),RFIFOW(fd,16),RFIFOL(fd,18), + RFIFOL(fd,20),RFIFOB(fd,22),RFIFOB(fd,23),RFIFOP(fd,24)); + return 0; +} + +int mapif_parse_LoadPet(int fd) +{ + mapif_load_pet(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10)); + return 0; +} + +int mapif_parse_SavePet(int fd) +{ + mapif_save_pet(fd,RFIFOL(fd,4),(struct s_pet *)RFIFOP(fd,8)); + return 0; +} + +int mapif_parse_DeletePet(int fd) +{ + mapif_delete_pet(fd,RFIFOL(fd,2)); + return 0; +} + +// map server からの通信 +// ・1パケットのみ解析すること +// ・パケット長データはinter.cにセットしておくこと +// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない +// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない +int inter_pet_parse_frommap(int fd) +{ + switch(RFIFOW(fd,0)){ + case 0x3080: mapif_parse_CreatePet(fd); break; + case 0x3081: mapif_parse_LoadPet(fd); break; + case 0x3082: mapif_parse_SavePet(fd); break; + case 0x3083: mapif_parse_DeletePet(fd); break; + default: + return 0; + } + return 1; +} + diff --git a/misc/src/char/int_pet.h b/misc/src/char/int_pet.h new file mode 100644 index 0000000..993f913 --- /dev/null +++ b/misc/src/char/int_pet.h @@ -0,0 +1,13 @@ +// $Id: int_pet.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $ +#ifndef _INT_PET_H_ +#define _INT_PET_H_ + +int inter_pet_init(); +int inter_pet_save(); +int inter_pet_delete(int pet_id); + +int inter_pet_parse_frommap(int fd); + +extern char pet_txt[1024]; + +#endif diff --git a/misc/src/char/int_storage.c b/misc/src/char/int_storage.c new file mode 100644 index 0000000..8b656fc --- /dev/null +++ b/misc/src/char/int_storage.c @@ -0,0 +1,504 @@ +// $Id: int_storage.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $ +#include "inter.h" +#include "int_storage.h" +#include "int_pet.h" +#include "int_guild.h" +#include "mmo.h" +#include "char.h" +#include "socket.h" +#include "db.h" +#include "lock.h" + +#include +#include + +// ファイル名のデフォルト +// inter_config_read()で再設定される +char storage_txt[1024]="save/storage.txt"; +char guild_storage_txt[1024]="save/g_storage.txt"; + +static struct dbt *storage_db; +static struct dbt *guild_storage_db; + +// 倉庫データを文字列に変換 +int storage_tostr(char *str,struct storage *p) +{ + int i,f=0; + char *str_p = str; + str_p += sprintf(str_p,"%d,%d\t",p->account_id,p->storage_amount); + + for(i=0;istorage[i].nameid) && (p->storage[i].amount) ){ + str_p += sprintf(str_p,"%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ", + p->storage[i].id,p->storage[i].nameid,p->storage[i].amount,p->storage[i].equip, + p->storage[i].identify,p->storage[i].refine,p->storage[i].attribute, + p->storage[i].card[0],p->storage[i].card[1],p->storage[i].card[2],p->storage[i].card[3],p->storage[i].broken); + f++; + } + + *(str_p++)='\t'; + + *str_p='\0'; + if(!f) + str[0]=0; + return 0; +} + +// 文字列を倉庫データに変換 +int storage_fromstr(char *str,struct storage *p) +{ + int tmp_int[256]; + int set,next,len,i; + + set=sscanf(str,"%d,%d%n",&tmp_int[0],&tmp_int[1],&next); + p->storage_amount=tmp_int[1]; + + if(set!=2) + return 1; + if(str[next]=='\n' || str[next]=='\r') + return 0; + next++; + for(i=0;str[next] && str[next]!='\t';i++){ + if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], + &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &len) == 12) { + p->storage[i].id = tmp_int[0]; + p->storage[i].nameid = tmp_int[1]; + p->storage[i].amount = tmp_int[2]; + p->storage[i].equip = tmp_int[3]; + p->storage[i].identify = tmp_int[4]; + p->storage[i].refine = tmp_int[5]; + p->storage[i].attribute = tmp_int[6]; + p->storage[i].card[0] = tmp_int[7]; + p->storage[i].card[1] = tmp_int[8]; + p->storage[i].card[2] = tmp_int[9]; + p->storage[i].card[3] = tmp_int[10]; + p->storage[i].broken = tmp_int[11]; + next += len; + if (str[next] == ' ') + next++; + } + + else if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], + &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) { + p->storage[i].id = tmp_int[0]; + p->storage[i].nameid = tmp_int[1]; + p->storage[i].amount = tmp_int[2]; + p->storage[i].equip = tmp_int[3]; + p->storage[i].identify = tmp_int[4]; + p->storage[i].refine = tmp_int[5]; + p->storage[i].attribute = tmp_int[6]; + p->storage[i].card[0] = tmp_int[7]; + p->storage[i].card[1] = tmp_int[8]; + p->storage[i].card[2] = tmp_int[9]; + p->storage[i].card[3] = tmp_int[10]; + p->storage[i].broken = 0; + next += len; + if (str[next] == ' ') + next++; + } + + else return 1; + } + return 0; +} + +int guild_storage_tostr(char *str,struct guild_storage *p) +{ + int i,f=0; + char *str_p = str; + str_p+=sprintf(str,"%d,%d\t",p->guild_id,p->storage_amount); + + for(i=0;istorage[i].nameid) && (p->storage[i].amount) ){ + str_p += sprintf(str_p,"%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ", + p->storage[i].id,p->storage[i].nameid,p->storage[i].amount,p->storage[i].equip, + p->storage[i].identify,p->storage[i].refine,p->storage[i].attribute, + p->storage[i].card[0],p->storage[i].card[1],p->storage[i].card[2],p->storage[i].card[3],p->storage[i].broken); + f++; + } + + *(str_p++)='\t'; + + *str_p='\0'; + if(!f) + str[0]=0; + return 0; +} + +int guild_storage_fromstr(char *str,struct guild_storage *p) +{ + int tmp_int[256]; + int set,next,len,i; + + set=sscanf(str,"%d,%d%n",&tmp_int[0],&tmp_int[1],&next); + p->storage_amount=tmp_int[1]; + + if(set!=2) + return 1; + if(str[next]=='\n' || str[next]=='\r') + return 0; + next++; + for(i=0;str[next] && str[next]!='\t';i++){ + if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], + &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &len) == 12) { + p->storage[i].id = tmp_int[0]; + p->storage[i].nameid = tmp_int[1]; + p->storage[i].amount = tmp_int[2]; + p->storage[i].equip = tmp_int[3]; + p->storage[i].identify = tmp_int[4]; + p->storage[i].refine = tmp_int[5]; + p->storage[i].attribute = tmp_int[6]; + p->storage[i].card[0] = tmp_int[7]; + p->storage[i].card[1] = tmp_int[8]; + p->storage[i].card[2] = tmp_int[9]; + p->storage[i].card[3] = tmp_int[10]; + p->storage[i].broken = tmp_int[11]; + next += len; + if (str[next] == ' ') + next++; + } + + else if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n", + &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], + &tmp_int[4], &tmp_int[5], &tmp_int[6], + &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) { + p->storage[i].id = tmp_int[0]; + p->storage[i].nameid = tmp_int[1]; + p->storage[i].amount = tmp_int[2]; + p->storage[i].equip = tmp_int[3]; + p->storage[i].identify = tmp_int[4]; + p->storage[i].refine = tmp_int[5]; + p->storage[i].attribute = tmp_int[6]; + p->storage[i].card[0] = tmp_int[7]; + p->storage[i].card[1] = tmp_int[8]; + p->storage[i].card[2] = tmp_int[9]; + p->storage[i].card[3] = tmp_int[10]; + p->storage[i].broken = 0; + next += len; + if (str[next] == ' ') + next++; + } + + else return 1; + } + return 0; +} + +// アカウントから倉庫データインデックスを得る(新規倉庫追加可能) +struct storage *account2storage(int account_id) +{ + struct storage *s; + s=numdb_search(storage_db,account_id); + if(s == NULL) { + s = calloc(sizeof(struct storage), 1); + if(s==NULL){ + printf("int_storage: out of memory!\n"); + exit(0); + } + memset(s,0,sizeof(struct storage)); + s->account_id=account_id; + numdb_insert(storage_db,s->account_id,s); + } + return s; +} + +struct guild_storage *guild2storage(int guild_id) +{ + struct guild_storage *gs = NULL; + if(inter_guild_search(guild_id) != NULL) { + gs=numdb_search(guild_storage_db,guild_id); + if(gs == NULL) { + gs = calloc(sizeof(struct guild_storage), 1); + if(gs==NULL){ + printf("int_storage: out of memory!\n"); + exit(0); + } + memset(gs,0,sizeof(struct guild_storage)); + gs->guild_id=guild_id; + numdb_insert(guild_storage_db,gs->guild_id,gs); + } + } + return gs; +} + +//--------------------------------------------------------- +// 倉庫データを読み込む +int inter_storage_init() +{ + char line[65536]; + int c=0,tmp_int; + struct storage *s; + struct guild_storage *gs; + FILE *fp; + + storage_db = numdb_init(); + + fp=fopen(storage_txt,"r"); + if(fp==NULL){ + printf("cant't read : %s\n",storage_txt); + return 1; + } + while(fgets(line,65535,fp)){ + sscanf(line,"%d",&tmp_int); + s=calloc(sizeof(struct storage), 1); + if(s==NULL){ + printf("int_storage: out of memory!\n"); + exit(0); + } + memset(s,0,sizeof(struct storage)); + s->account_id=tmp_int; + if(s->account_id > 0 && storage_fromstr(line,s) == 0) { + numdb_insert(storage_db,s->account_id,s); + } + else{ + printf("int_storage: broken data [%s] line %d\n",storage_txt,c); + free(s); + } + c++; + } + fclose(fp); + + c = 0; + guild_storage_db = numdb_init(); + + fp=fopen(guild_storage_txt,"r"); + if(fp==NULL){ + printf("cant't read : %s\n",guild_storage_txt); + return 1; + } + while(fgets(line,65535,fp)){ + sscanf(line,"%d",&tmp_int); + gs=calloc(sizeof(struct guild_storage), 1); + if(gs==NULL){ + printf("int_storage: out of memory!\n"); + exit(0); + } + memset(gs,0,sizeof(struct guild_storage)); + gs->guild_id=tmp_int; + if(gs->guild_id > 0 && guild_storage_fromstr(line,gs) == 0) { + numdb_insert(guild_storage_db,gs->guild_id,gs); + } + else{ + printf("int_storage: broken data [%s] line %d\n",guild_storage_txt,c); + free(gs); + } + c++; + } + fclose(fp); + + return 0; +} + +int inter_storage_save_sub(void *key,void *data,va_list ap) +{ + char line[65536]; + FILE *fp; + storage_tostr(line,(struct storage *)data); + fp=va_arg(ap,FILE *); + if(*line) + fprintf(fp,"%s" RETCODE,line); + return 0; +} +//--------------------------------------------------------- +// 倉庫データを書き込む +int inter_storage_save() +{ + FILE *fp; + int lock; + if( (fp=lock_fopen(storage_txt,&lock))==NULL ){ + printf("int_storage: cant write [%s] !!! data is lost !!!\n",storage_txt); + return 1; + } + numdb_foreach(storage_db,inter_storage_save_sub,fp); + lock_fclose(fp,storage_txt,&lock); +// printf("int_storage: %s saved.\n",storage_txt); + return 0; +} + +int inter_guild_storage_save_sub(void *key,void *data,va_list ap) +{ + char line[65536]; + FILE *fp; + if(inter_guild_search(((struct guild_storage *)data)->guild_id) != NULL) { + guild_storage_tostr(line,(struct guild_storage *)data); + fp=va_arg(ap,FILE *); + if(*line) + fprintf(fp,"%s" RETCODE,line); + } + return 0; +} +//--------------------------------------------------------- +// 倉庫データを書き込む +int inter_guild_storage_save() +{ + FILE *fp; + int lock; + if( (fp=lock_fopen(guild_storage_txt,&lock))==NULL ){ + printf("int_storage: cant write [%s] !!! data is lost !!!\n",guild_storage_txt); + return 1; + } + numdb_foreach(guild_storage_db,inter_guild_storage_save_sub,fp); + lock_fclose(fp,guild_storage_txt,&lock); +// printf("int_storage: %s saved.\n",guild_storage_txt); + return 0; +} + +// 倉庫データ削除 +int inter_storage_delete(int account_id) +{ + struct storage *s = numdb_search(storage_db,account_id); + if(s) { + int i; + for(i=0;istorage_amount;i++){ + if(s->storage[i].card[0] == (short)0xff00) + inter_pet_delete(*((long *)(&s->storage[i].card[2]))); + } + numdb_erase(storage_db,account_id); + free(s); + } + return 0; +} + +// ギルド倉庫データ削除 +int inter_guild_storage_delete(int guild_id) +{ + struct guild_storage *gs = numdb_search(guild_storage_db,guild_id); + if(gs) { + int i; + for(i=0;istorage_amount;i++){ + if(gs->storage[i].card[0] == (short)0xff00) + inter_pet_delete(*((long *)(&gs->storage[i].card[2]))); + } + numdb_erase(guild_storage_db,guild_id); + free(gs); + } + return 0; +} + +//--------------------------------------------------------- +// map serverへの通信 + +// 倉庫データの送信 +int mapif_load_storage(int fd,int account_id) +{ + struct storage *s=account2storage(account_id); + WFIFOW(fd,0)=0x3810; + WFIFOW(fd,2)=sizeof(struct storage)+8; + WFIFOL(fd,4)=account_id; + memcpy(WFIFOP(fd,8),s,sizeof(struct storage)); + WFIFOSET(fd,WFIFOW(fd,2)); + return 0; +} +// 倉庫データ保存完了送信 +int mapif_save_storage_ack(int fd,int account_id) +{ + WFIFOW(fd,0)=0x3811; + WFIFOL(fd,2)=account_id; + WFIFOB(fd,6)=0; + WFIFOSET(fd,7); + return 0; +} + +int mapif_load_guild_storage(int fd,int account_id,int guild_id) +{ + struct guild_storage *gs=guild2storage(guild_id); + WFIFOW(fd,0)=0x3818; + if(gs) { + WFIFOW(fd,2)=sizeof(struct guild_storage)+12; + WFIFOL(fd,4)=account_id; + WFIFOL(fd,8)=guild_id; + memcpy(WFIFOP(fd,12),gs,sizeof(struct guild_storage)); + } + else { + WFIFOW(fd,2)=12; + WFIFOL(fd,4)=account_id; + WFIFOL(fd,8)=0; + } + WFIFOSET(fd,WFIFOW(fd,2)); + + return 0; +} +int mapif_save_guild_storage_ack(int fd,int account_id,int guild_id,int fail) +{ + WFIFOW(fd,0)=0x3819; + WFIFOL(fd,2)=account_id; + WFIFOL(fd,6)=guild_id; + WFIFOB(fd,10)=fail; + WFIFOSET(fd,11); + return 0; +} + +//--------------------------------------------------------- +// map serverからの通信 + +// 倉庫データ要求受信 +int mapif_parse_LoadStorage(int fd) +{ + mapif_load_storage(fd,RFIFOL(fd,2)); + return 0; +} +// 倉庫データ受信&保存 +int mapif_parse_SaveStorage(int fd) +{ + struct storage *s; + int account_id=RFIFOL(fd,4); + int len=RFIFOW(fd,2); + if(sizeof(struct storage)!=len-8){ + printf("inter storage: data size error %d %d\n",sizeof(struct storage),len-8); + } + else { + s=account2storage(account_id); + memcpy(s,RFIFOP(fd,8),sizeof(struct storage)); + mapif_save_storage_ack(fd,account_id); + } + return 0; +} + +int mapif_parse_LoadGuildStorage(int fd) +{ + mapif_load_guild_storage(fd,RFIFOL(fd,2),RFIFOL(fd,6)); + return 0; +} +int mapif_parse_SaveGuildStorage(int fd) +{ + struct guild_storage *gs; + int guild_id=RFIFOL(fd,8); + int len=RFIFOW(fd,2); + if(sizeof(struct guild_storage)!=len-12){ + printf("inter storage: data size error %d %d\n",sizeof(struct guild_storage),len-12); + } + else { + gs=guild2storage(guild_id); + if(gs) { + memcpy(gs,RFIFOP(fd,12),sizeof(struct guild_storage)); + mapif_save_guild_storage_ack(fd,RFIFOL(fd,4),guild_id,0); + } + else + mapif_save_guild_storage_ack(fd,RFIFOL(fd,4),guild_id,1); + } + return 0; +} + +// map server からの通信 +// ・1パケットのみ解析すること +// ・パケット長データはinter.cにセットしておくこと +// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない +// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない +int inter_storage_parse_frommap(int fd) +{ + switch(RFIFOW(fd,0)){ + case 0x3010: mapif_parse_LoadStorage(fd); break; + case 0x3011: mapif_parse_SaveStorage(fd); break; + case 0x3018: mapif_parse_LoadGuildStorage(fd); break; + case 0x3019: mapif_parse_SaveGuildStorage(fd); break; + default: + return 0; + } + return 1; +} diff --git a/misc/src/char/int_storage.h b/misc/src/char/int_storage.h new file mode 100644 index 0000000..d918f5f --- /dev/null +++ b/misc/src/char/int_storage.h @@ -0,0 +1,16 @@ +// $Id: int_storage.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $ +#ifndef _INT_STORAGE_H_ +#define _INT_STORAGE_H_ + +int inter_storage_init(); +int inter_storage_save(); +int inter_guild_storage_save(); +int inter_storage_delete(int account_id); +int inter_guild_storage_delete(int guild_id); + +int inter_storage_parse_frommap(int fd); + +extern char storage_txt[1024]; +extern char guild_storage_txt[1024]; + +#endif diff --git a/misc/src/char/inter.c b/misc/src/char/inter.c new file mode 100644 index 0000000..29ec57b --- /dev/null +++ b/misc/src/char/inter.c @@ -0,0 +1,561 @@ +// $Id: inter.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $ +#include "mmo.h" +#include "char.h" +#include "socket.h" +#include "timer.h" +#include "db.h" +#include +#include + +#include "inter.h" +#include "int_party.h" +#include "int_guild.h" +#include "int_storage.h" +#include "int_pet.h" +#include "lock.h" + +#define WISDATA_TTL (60*1000) // Existence time of Wisp/page data (60 seconds) + // that is the waiting time of answers of all map-servers +#define WISDELLIST_MAX 256 // Number of elements of Wisp/page data deletion list + +char inter_log_filename[1024] = "log/inter.log"; + +char accreg_txt[1024] = "save/accreg.txt"; +static struct dbt *accreg_db = NULL; + +struct accreg { + int account_id, reg_num; + struct global_reg reg[ACCOUNT_REG_NUM]; +}; + +int party_share_level = 10; + + +// 送信パケット長リスト +int inter_send_packet_length[] = { + -1,-1,27,-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + -1, 7, 0, 0, 0, 0, 0, 0, -1,11, 0, 0, 0, 0, 0, 0, + 35,-1,11,15, 34,29, 7,-1, 0, 0, 0, 0, 0, 0, 0, 0, + 10,-1,15, 0, 79,19, 7,-1, 0,-1,-1,-1, 14,67,186,-1, + 9, 9,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 11,-1, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; +// 受信パケット長リスト +int inter_recv_packet_length[] = { + -1,-1, 7,-1, -1, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 6,-1, 0, 0, 0, 0, 0, 0, 10,-1, 0, 0, 0, 0, 0, 0, + 72, 6,52,14, 10,29, 6,-1, 34, 0, 0, 0, 0, 0, 0, 0, + -1, 6,-1, 0, 55,19, 6,-1, 14,-1,-1,-1, 14,19,186,-1, + 5, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48,14,-1, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +struct WisData { + int id, fd, count, len; + unsigned long tick; + unsigned char src[24], dst[24], msg[1024]; +}; +static struct dbt * wis_db = NULL; +static int wis_dellist[WISDELLIST_MAX], wis_delnum; + + +//-------------------------------------------------------- + +// アカウント変数を文字列へ変換 +int inter_accreg_tostr(char *str, struct accreg *reg) { + int j; + char *p = str; + + p += sprintf(p, "%d\t", reg->account_id); + for(j = 0; j < reg->reg_num; j++) { + p += sprintf(p,"%s,%d ", reg->reg[j].str, reg->reg[j].value); + } + + return 0; +} + +// アカウント変数を文字列から変換 +int inter_accreg_fromstr(const char *str, struct accreg *reg) { + int j, v, n; + char buf[128]; + const char *p = str; + + if (sscanf(p, "%d\t%n", ®->account_id, &n ) != 1 || reg->account_id <= 0) + return 1; + + for(j = 0, p += n; j < ACCOUNT_REG_NUM; j++, p += n) { + if (sscanf(p, "%[^,],%d %n", buf, &v, &n) != 2) + break; + memcpy(reg->reg[j].str, buf, 32); + reg->reg[j].value = v; + } + reg->reg_num = j; + + return 0; +} + +// アカウント変数の読み込み +int inter_accreg_init() { + char line[8192]; + FILE *fp; + int c = 0; + struct accreg *reg; + + accreg_db = numdb_init(); + + if( (fp = fopen(accreg_txt, "r")) == NULL) + return 1; + while(fgets(line, sizeof(line)-1, fp)){ + line[sizeof(line)-1] = '\0'; + + reg = calloc(sizeof(struct accreg), 1); + if (reg == NULL) { + printf("inter: accreg: out of memory!\n"); + exit(0); + } + if (inter_accreg_fromstr(line, reg) == 0 && reg->account_id > 0) { + numdb_insert(accreg_db, reg->account_id, reg); + } else { + printf("inter: accreg: broken data [%s] line %d\n", accreg_txt, c); + free(reg); + } + c++; + } + fclose(fp); +// printf("inter: %s read done (%d)\n", accreg_txt, c); + + return 0; +} + +// アカウント変数のセーブ用 +int inter_accreg_save_sub(void *key, void *data, va_list ap) { + char line[8192]; + FILE *fp; + struct accreg *reg = (struct accreg *)data; + + if (reg->reg_num > 0) { + inter_accreg_tostr(line,reg); + fp = va_arg(ap, FILE *); + fprintf(fp, "%s" RETCODE, line); + } + + return 0; +} + +// アカウント変数のセーブ +int inter_accreg_save() { + FILE *fp; + int lock; + + if ((fp = lock_fopen(accreg_txt,&lock)) == NULL) { + printf("int_accreg: cant write [%s] !!! data is lost !!!\n", accreg_txt); + return 1; + } + numdb_foreach(accreg_db, inter_accreg_save_sub,fp); + lock_fclose(fp, accreg_txt, &lock); +// printf("inter: %s saved.\n", accreg_txt); + + return 0; +} + +//-------------------------------------------------------- + +/*========================================== + * 設定ファイルを読み込む + *------------------------------------------ + */ +int inter_config_read(const char *cfgName) { + char line[1024], w1[1024], w2[1024]; + FILE *fp; + + fp = fopen(cfgName, "r"); + if (fp == NULL) { + printf("file not found: %s\n", cfgName); + return 1; + } + while(fgets(line, sizeof(line) - 1, fp)) { + if (line[0] == '/' && line[1] == '/') + continue; + line[sizeof(line)-1] = '\0'; + + if (sscanf(line,"%[^:]: %[^\r\n]", w1, w2) != 2) + continue; + + if (strcmpi(w1, "storage_txt") == 0) { + strncpy(storage_txt, w2, sizeof(storage_txt)); + } else if (strcmpi(w1, "party_txt") == 0) { + strncpy(party_txt, w2, sizeof(party_txt)); + } else if (strcmpi(w1, "guild_txt") == 0) { + strncpy(guild_txt, w2, sizeof(guild_txt)); + } else if (strcmpi(w1, "pet_txt") == 0) { + strncpy(pet_txt, w2, sizeof(pet_txt)); + } else if (strcmpi(w1, "castle_txt") == 0) { + strncpy(castle_txt, w2, sizeof(castle_txt)); + } else if (strcmpi(w1, "accreg_txt") == 0) { + strncpy(accreg_txt, w2, sizeof(accreg_txt)); + } else if (strcmpi(w1, "guild_storage_txt") == 0) { + strncpy(guild_storage_txt, w2, sizeof(guild_storage_txt)); + } else if (strcmpi(w1, "party_share_level") == 0) { + party_share_level = atoi(w2); + if (party_share_level < 0) + party_share_level = 0; + } else if (strcmpi(w1, "inter_log_filename") == 0) { + strncpy(inter_log_filename, w2, sizeof(inter_log_filename)); + } else if (strcmpi(w1, "import") == 0) { + inter_config_read(w2); + } + } + fclose(fp); + + return 0; +} + +// ログ書き出し +int inter_log(char *fmt,...) { + FILE *logfp; + va_list ap; + + va_start(ap,fmt); + logfp = fopen(inter_log_filename, "a"); + if (logfp) { + vfprintf(logfp, fmt, ap); + fclose(logfp); + } + va_end(ap); + + return 0; +} + +// セーブ +int inter_save() { + inter_party_save(); + inter_guild_save(); + inter_storage_save(); + inter_guild_storage_save(); + inter_pet_save(); + inter_accreg_save(); + + return 0; +} + +// 初期化 +int inter_init(const char *file) { + inter_config_read(file); + + wis_db = numdb_init(); + + inter_party_init(); + inter_guild_init(); + inter_storage_init(); + inter_pet_init(); + inter_accreg_init(); + + return 0; +} + +// マップサーバー接続 +int inter_mapif_init(int fd) { + inter_guild_mapif_init(fd); + + return 0; +} + +//-------------------------------------------------------- +// sended packets to map-server + +// GMメッセージ送信 +int mapif_GMmessage(unsigned char *mes, int len) { + unsigned char buf[len]; + + WBUFW(buf,0) = 0x3800; + WBUFW(buf,2) = len; + memcpy(WBUFP(buf,4), mes, len - 4); + mapif_sendall(buf, len); +// printf("inter server: GM:%d %s\n", len, mes); + + return 0; +} + +// Wisp/page transmission to all map-server +int mapif_wis_message(struct WisData *wd) { + unsigned char buf[56 + wd->len]; + + WBUFW(buf, 0) = 0x3801; + WBUFW(buf, 2) = 56 + wd->len; + WBUFL(buf, 4) = wd->id; + memcpy(WBUFP(buf, 8), wd->src, 24); + memcpy(WBUFP(buf,32), wd->dst, 24); + memcpy(WBUFP(buf,56), wd->msg, wd->len); + wd->count = mapif_sendall(buf, WBUFW(buf,2)); + + return 0; +} + +// Wisp/page transmission result to map-server +int mapif_wis_end(struct WisData *wd, int flag) { + unsigned char buf[27]; + + WBUFW(buf, 0) = 0x3802; + memcpy(WBUFP(buf, 2), wd->src, 24); + WBUFB(buf,26) = flag; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + mapif_send(wd->fd, buf, 27); +// printf("inter server wis_end: flag: %d\n", flag); + + return 0; +} + +// アカウント変数送信 +int mapif_account_reg(int fd, unsigned char *src) { + unsigned char buf[WBUFW(src,2)]; + + memcpy(WBUFP(buf,0),src,WBUFW(src,2)); + WBUFW(buf, 0) = 0x3804; + mapif_sendallwos(fd, buf, WBUFW(buf,2)); + + return 0; +} + +// アカウント変数要求返信 +int mapif_account_reg_reply(int fd,int account_id) { + struct accreg *reg = numdb_search(accreg_db,account_id); + + WFIFOW(fd,0) = 0x3804; + WFIFOL(fd,4) = account_id; + if (reg == NULL) { + WFIFOW(fd,2) = 8; + } else { + int j, p; + for(j = 0, p = 8; j < reg->reg_num; j++, p += 36) { + memcpy(WFIFOP(fd,p), reg->reg[j].str, 32); + WFIFOL(fd,p+32) = reg->reg[j].value; + } + WFIFOW(fd,2) = p; + } + WFIFOSET(fd,WFIFOW(fd,2)); + + return 0; +} + +//-------------------------------------------------------- + +// Existence check of WISP data +int check_ttl_wisdata_sub(void *key, void *data, va_list ap) { + unsigned long tick; + struct WisData *wd = (struct WisData *)data; + tick = va_arg(ap, unsigned long); + + if (DIFF_TICK(tick, wd->tick) > WISDATA_TTL && wis_delnum < WISDELLIST_MAX) + wis_dellist[wis_delnum++] = wd->id; + + return 0; +} + +int check_ttl_wisdata() { + unsigned long tick = gettick(); + int i; + + do { + wis_delnum = 0; + numdb_foreach(wis_db, check_ttl_wisdata_sub, tick); + for(i = 0; i < wis_delnum; i++) { + struct WisData *wd = numdb_search(wis_db, wis_dellist[i]); + printf("inter: wis data id=%d time out : from %s to %s\n", wd->id, wd->src, wd->dst); + // removed. not send information after a timeout. Just no answer for the player + //mapif_wis_end(wd, 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + numdb_erase(wis_db, wd->id); + free(wd); + } + } while(wis_delnum >= WISDELLIST_MAX); + + return 0; +} + +//-------------------------------------------------------- +// received packets from map-server + +// GMメッセージ送信 +int mapif_parse_GMmessage(int fd) { + mapif_GMmessage(RFIFOP(fd,4), RFIFOW(fd,2)); + + return 0; +} + +// Wisp/page request to send +int mapif_parse_WisRequest(int fd) { + struct WisData* wd; + static int wisid = 0; + int index; + + if (RFIFOW(fd,2)-52 >= sizeof(wd->msg)) { + printf("inter: Wis message size too long.\n"); + return 0; + } else if (RFIFOW(fd,2)-52 <= 0) { // normaly, impossible, but who knows... + printf("inter: Wis message doesn't exist.\n"); + return 0; + } + + // search if character exists before to ask all map-servers + if ((index = search_character_index(RFIFOP(fd,28))) == -1) { + unsigned char buf[27]; + WBUFW(buf, 0) = 0x3802; + memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), 24); + WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + mapif_send(fd, buf, 27); + // Character exists. So, ask all map-servers + } else { + // to be sure of the correct name, rewrite it + memset(RFIFOP(fd,28), 0, 24); + strncpy(RFIFOP(fd,28), search_character_name(index), 24); + // if source is destination, don't ask other servers. + if (strcmp(RFIFOP(fd,4),RFIFOP(fd,28)) == 0) { + unsigned char buf[27]; + WBUFW(buf, 0) = 0x3802; + memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), 24); + WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + mapif_send(fd, buf, 27); + } else { + + wd = (struct WisData *)calloc(sizeof(struct WisData), 1); + if (wd == NULL){ + printf("inter: WisRequest: out of memory !\n"); + return 0; + } + + // Whether the failure of previous wisp/page transmission (timeout) + check_ttl_wisdata(); + + wd->id = ++wisid; + wd->fd = fd; + wd->len= RFIFOW(fd,2)-52; + memcpy(wd->src, RFIFOP(fd, 4), 24); + memcpy(wd->dst, RFIFOP(fd,28), 24); + memcpy(wd->msg, RFIFOP(fd,52), wd->len); + wd->tick = gettick(); + numdb_insert(wis_db, wd->id, wd); + mapif_wis_message(wd); + } + } + + return 0; +} + +// Wisp/page transmission result +int mapif_parse_WisReply(int fd) { + int id = RFIFOL(fd,2), flag = RFIFOB(fd,6); + struct WisData *wd = numdb_search(wis_db, id); + + if (wd == NULL) + return 0; // This wisp was probably suppress before, because it was timeout of because of target was found on another map-server + + if ((--wd->count) <= 0 || flag != 1) { + mapif_wis_end(wd, flag); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target + numdb_erase(wis_db, id); + free(wd); + } + + return 0; +} + +// Received wisp message from map-server for ALL gm (just copy the message and resends it to ALL map-servers) +int mapif_parse_WisToGM(int fd) { + unsigned char buf[RFIFOW(fd,2)]; // 0x3003/0x3803 .w .24B .w .?B + + memcpy(WBUFP(buf,0), RFIFOP(fd,0), RFIFOW(fd,2)); + WBUFW(buf, 0) = 0x3803; + mapif_sendall(buf, RFIFOW(fd,2)); + + return 0; +} + +// アカウント変数保存要求 +int mapif_parse_AccReg(int fd) { + int j, p; + struct accreg *reg = numdb_search(accreg_db, RFIFOL(fd,4)); + + if (reg == NULL) { + if ((reg = calloc(sizeof(struct accreg), 1)) == NULL) { + printf("inter: accreg: out of memory !\n"); + exit(0); + } + reg->account_id = RFIFOL(fd,4); + numdb_insert(accreg_db, RFIFOL(fd,4), reg); + } + + for(j = 0, p = 8; j < ACCOUNT_REG_NUM && p < RFIFOW(fd,2); j++, p += 36) { + memcpy(reg->reg[j].str, RFIFOP(fd,p), 32); + reg->reg[j].value = RFIFOL(fd, p + 32); + } + reg->reg_num = j; + + mapif_account_reg(fd, RFIFOP(fd,0)); // 他のMAPサーバーに送信 + + return 0; +} + +// アカウント変数送信要求 +int mapif_parse_AccRegRequest(int fd) { +// printf("mapif: accreg request\n"); + return mapif_account_reg_reply(fd, RFIFOL(fd,2)); +} + +//-------------------------------------------------------- + +// map server からの通信(1パケットのみ解析すること) +// エラーなら0(false)、処理できたなら1、 +// パケット長が足りなければ2をかえさなければならない +int inter_parse_frommap(int fd) { + int cmd = RFIFOW(fd,0); + int len = 0; + + // inter鯖管轄かを調べる + if (cmd < 0x3000 || cmd >= 0x3000 + (sizeof(inter_recv_packet_length) / sizeof(inter_recv_packet_length[0]))) + return 0; + + // パケット長を調べる + if ((len = inter_check_length(fd, inter_recv_packet_length[cmd - 0x3000])) == 0) + return 2; + + switch(cmd) { + case 0x3000: mapif_parse_GMmessage(fd); break; + case 0x3001: mapif_parse_WisRequest(fd); break; + case 0x3002: mapif_parse_WisReply(fd); break; + case 0x3003: mapif_parse_WisToGM(fd); break; + case 0x3004: mapif_parse_AccReg(fd); break; + case 0x3005: mapif_parse_AccRegRequest(fd); break; + default: + if (inter_party_parse_frommap(fd)) + break; + if (inter_guild_parse_frommap(fd)) + break; + if (inter_storage_parse_frommap(fd)) + break; + if (inter_pet_parse_frommap(fd)) + break; + return 0; + } + RFIFOSKIP(fd, len); + + return 1; +} + +// RFIFOのパケット長確認 +// 必要パケット長があればパケット長、まだ足りなければ0 +int inter_check_length(int fd, int length) { + if (length == -1) { // 可変パケット長 + if (RFIFOREST(fd) < 4) // パケット長が未着 + return 0; + length = RFIFOW(fd,2); + } + + if (RFIFOREST(fd) < length) // パケットが未着 + return 0; + + return length; +} + diff --git a/misc/src/char/inter.h b/misc/src/char/inter.h new file mode 100644 index 0000000..b004c9b --- /dev/null +++ b/misc/src/char/inter.h @@ -0,0 +1,19 @@ +// $Id: inter.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $ +#ifndef _INTER_H_ +#define _INTER_H_ + +int inter_init(const char *file); +int inter_save(); +int inter_parse_frommap(int fd); +int inter_mapif_init(int fd); + +int inter_check_length(int fd,int length); + +int inter_log(char *fmt,...); + +#define inter_cfgName "conf/inter_athena.conf" + +extern int party_share_level; +extern char inter_log_filename[1024]; + +#endif -- cgit v1.2.3-60-g2f50