summaryrefslogtreecommitdiff
path: root/src/login/login.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/login/login.cpp')
-rw-r--r--src/login/login.cpp3386
1 files changed, 1576 insertions, 1810 deletions
diff --git a/src/login/login.cpp b/src/login/login.cpp
index ce3fd4e..cd41e17 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -37,13 +37,13 @@
#include <type_traits>
static_assert(std::is_same<time_t, long>::value, "much code assumes time_t is a long");
-int account_id_count = START_ACCOUNT_NUM;
-int server_num;
-int new_account_flag = 0;
-int login_port = 6900;
+int account_id_count = START_ACCOUNT_NUM;
+int server_num;
+int new_account_flag = 0;
+int login_port = 6900;
char lan_char_ip[16];
-int subneti[4];
-int subnetmaski[4];
+int subneti[4];
+int subnetmaski[4];
char update_host[128] = "";
char main_server[20] = "";
@@ -53,21 +53,21 @@ char login_log_filename[1024] = "log/login.log";
char login_log_unknown_packets_filename[1024] =
"log/login_unknown_packets.log";
char date_format[32] = "%Y-%m-%d %H:%M:%S";
-int save_unknown_packets = 0;
+int save_unknown_packets = 0;
long creation_time_GM_account_file;
-int gm_account_filename_check_timer = 15; // Timer to check if GM_account file has been changed and reload GM account automaticaly (in seconds; default: 15)
+int gm_account_filename_check_timer = 15; // Timer to check if GM_account file has been changed and reload GM account automaticaly (in seconds; default: 15)
-int display_parse_login = 0; // 0: no, 1: yes
-int display_parse_admin = 0; // 0: no, 1: yes
-int display_parse_fromchar = 0; // 0: no, 1: yes (without packet 0x2714), 2: all packets
+int display_parse_login = 0; // 0: no, 1: yes
+int display_parse_admin = 0; // 0: no, 1: yes
+int display_parse_fromchar = 0; // 0: no, 1: yes (without packet 0x2714), 2: all packets
struct mmo_char_server server[MAX_SERVERS];
-int server_fd[MAX_SERVERS];
-int server_freezeflag[MAX_SERVERS]; // Char-server anti-freeze system. Counter. 5 ok, 4...0 freezed
-int anti_freeze_enable = 0;
-int ANTI_FREEZE_INTERVAL = 15;
+int server_fd[MAX_SERVERS];
+int server_freezeflag[MAX_SERVERS]; // Char-server anti-freeze system. Counter. 5 ok, 4...0 freezed
+int anti_freeze_enable = 0;
+int ANTI_FREEZE_INTERVAL = 15;
-int login_fd;
+int login_fd;
enum
{
@@ -77,56 +77,56 @@ enum
ACO_STRSIZE = 128,
};
-int access_order = ACO_DENY_ALLOW;
-int access_allownum = 0;
-int access_denynum = 0;
+int access_order = ACO_DENY_ALLOW;
+int access_allownum = 0;
+int access_denynum = 0;
char *access_allow = NULL;
char *access_deny = NULL;
-int access_ladmin_allownum = 0;
+int access_ladmin_allownum = 0;
char *access_ladmin_allow = NULL;
-int min_level_to_connect = 0; // minimum level of player/GM (0: player, 1-99: gm) to connect on the server
-int add_to_unlimited_account = 0; // Give possibility or not to adjust (ladmin command: timeadd) the time of an unlimited account.
-int start_limited_time = -1; // Starting additional sec from now for the limited time at creation of accounts (-1: unlimited time, 0 or more: additional sec from now)
-int check_ip_flag = 1; // It's to check IP of a player between login-server and char-server (part of anti-hacking system)
+int min_level_to_connect = 0; // minimum level of player/GM (0: player, 1-99: gm) to connect on the server
+int add_to_unlimited_account = 0; // Give possibility or not to adjust (ladmin command: timeadd) the time of an unlimited account.
+int start_limited_time = -1; // Starting additional sec from now for the limited time at creation of accounts (-1: unlimited time, 0 or more: additional sec from now)
+int check_ip_flag = 1; // It's to check IP of a player between login-server and char-server (part of anti-hacking system)
struct login_session_data
{
- int md5keylen;
+ int md5keylen;
char md5key[20];
};
#define AUTH_FIFO_SIZE 256
struct
{
- int account_id, login_id1, login_id2;
- int ip, sex, delflag;
+ int account_id, login_id1, login_id2;
+ int ip, sex, delflag;
} auth_fifo[AUTH_FIFO_SIZE];
-int auth_fifo_pos = 0;
+int auth_fifo_pos = 0;
struct auth_dat
{
- int account_id, sex;
+ int account_id, sex;
char userid[24], pass[40], lastlogin[24];
- int logincount;
- int state; // packet 0x006a value + 1 (0: compte OK)
+ int logincount;
+ int state; // packet 0x006a value + 1 (0: compte OK)
char email[40]; // e-mail (by default: a@a.com)
char error_message[20]; // Message of error code #6 = Your are Prohibited to log in until %s (packet 0x006a)
time_t ban_until_time; // # of seconds 1/1/1970 (timestamp): ban time limit of the account (0 = no ban)
time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
char last_ip[16]; // save of last IP of connection
char memo[255]; // a memo field
- int account_reg2_num;
+ int account_reg2_num;
struct global_reg account_reg2[ACCOUNT_REG2_NUM];
} *auth_dat;
-int auth_num = 0, auth_max = 0;
+int auth_num = 0, auth_max = 0;
-int admin_state = 0;
+int admin_state = 0;
char admin_pass[24] = "";
char gm_pass[64] = "";
-int level_new_gm = 60;
+int level_new_gm = 60;
static struct dbt *gm_account_db;
@@ -139,32 +139,32 @@ pid_t pid = 0; // For forked DB writes
// Writing function of logs file
//------------------------------
static __attribute__((format(printf, 1, 2)))
-int login_log (const char *fmt, ...)
+int login_log(const char *fmt, ...)
{
FILE *logfp;
va_list ap;
struct timeval tv;
char tmpstr[2048];
- va_start (ap, fmt);
+ va_start(ap, fmt);
- logfp = fopen_ (login_log_filename, "a");
+ logfp = fopen_(login_log_filename, "a");
if (logfp)
{
if (fmt[0] == '\0') // jump a line if no message
- fprintf (logfp, "\n");
+ fprintf(logfp, "\n");
else
{
- gettimeofday (&tv, NULL);
- strftime (tmpstr, 24, date_format, gmtime (&(tv.tv_sec)));
- sprintf (tmpstr + strlen (tmpstr), ".%03d: %s",
+ gettimeofday(&tv, NULL);
+ strftime(tmpstr, 24, date_format, gmtime(&(tv.tv_sec)));
+ sprintf(tmpstr + strlen(tmpstr), ".%03d: %s",
(int) tv.tv_usec / 1000, fmt);
- vfprintf (logfp, tmpstr, ap);
+ vfprintf(logfp, tmpstr, ap);
}
- fclose_ (logfp);
+ fclose_(logfp);
}
- va_end (ap);
+ va_end(ap);
return 0;
}
@@ -173,9 +173,9 @@ int login_log (const char *fmt, ...)
// and returns its level (or 0 if it isn't a GM account or if not found)
//----------------------------------------------------------------------
static
-int isGM (int account_id)
+int isGM(int account_id)
{
- struct gm_account *p = (struct gm_account*) numdb_search (gm_account_db, account_id);
+ struct gm_account *p = (struct gm_account*) numdb_search(gm_account_db, account_id);
if (p == NULL)
return 0;
return p->level;
@@ -185,96 +185,87 @@ int isGM (int account_id)
// Reading function of GM accounts file (and their level)
//-------------------------------------------------------
static
-int read_gm_account (void)
+int read_gm_account(void)
{
char line[512];
struct gm_account *p;
FILE *fp;
- int c = 0;
- int GM_level;
+ int c = 0;
+ int GM_level;
struct stat file_stat;
- free (gm_account_db);
- gm_account_db = numdb_init ();
+ free(gm_account_db);
+ gm_account_db = numdb_init();
// get last modify time/date
- if (stat (GM_account_filename, &file_stat))
+ if (stat(GM_account_filename, &file_stat))
creation_time_GM_account_file = 0; // error
else
creation_time_GM_account_file = file_stat.st_mtime;
- if ((fp = fopen_ (GM_account_filename, "r")) == NULL)
+ if ((fp = fopen_(GM_account_filename, "r")) == NULL)
{
- printf ("read_gm_account: GM accounts file [%s] not found.\n",
+ printf("read_gm_account: GM accounts file [%s] not found.\n",
GM_account_filename);
- printf
- (" Actually, there is no GM accounts on the server.\n");
- login_log ("read_gm_account: GM accounts file [%s] not found.\n",
+ printf(" Actually, there is no GM accounts on the server.\n");
+ login_log("read_gm_account: GM accounts file [%s] not found.\n",
GM_account_filename);
- login_log
- (" Actually, there is no GM accounts on the server.\n");
+ login_log(" Actually, there is no GM accounts on the server.\n");
return 1;
}
// 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)
- while (fgets (line, sizeof (line) - 1, fp) && c < 4000)
+ while (fgets(line, sizeof(line) - 1, fp) && c < 4000)
{
if ((line[0] == '/' && line[1] == '/') || line[0] == '\0'
|| line[0] == '\n' || line[0] == '\r')
continue;
- CREATE (p, struct gm_account, 1);
- if (sscanf (line, "%d %d", &p->account_id, &p->level) != 2
- && sscanf (line, "%d: %d", &p->account_id, &p->level) != 2)
- printf
- ("read_gm_account: file [%s], invalid 'id_acount level' format.\n",
+ CREATE(p, struct gm_account, 1);
+ if (sscanf(line, "%d %d", &p->account_id, &p->level) != 2
+ && sscanf(line, "%d: %d", &p->account_id, &p->level) != 2)
+ printf("read_gm_account: file [%s], invalid 'id_acount level' format.\n",
GM_account_filename);
else if (p->level <= 0)
- printf
- ("read_gm_account: file [%s] %dth account (invalid level [0 or negative]: %d).\n",
+ printf("read_gm_account: file [%s] %dth account (invalid level [0 or negative]: %d).\n",
GM_account_filename, c + 1, p->level);
else
{
if (p->level > 99)
{
- printf
- ("read_gm_account: file [%s] %dth account (invalid level, but corrected: %d->99).\n",
+ printf("read_gm_account: file [%s] %dth account (invalid level, but corrected: %d->99).\n",
GM_account_filename, c + 1, p->level);
p->level = 99;
}
- if ((GM_level = isGM (p->account_id)) > 0)
+ if ((GM_level = isGM(p->account_id)) > 0)
{ // if it's not a new account
if (GM_level == p->level)
- printf
- ("read_gm_account: GM account %d defined twice (same level: %d).\n",
+ printf("read_gm_account: GM account %d defined twice (same level: %d).\n",
p->account_id, p->level);
else
- printf
- ("read_gm_account: GM account %d defined twice (levels: %d and %d).\n",
+ printf("read_gm_account: GM account %d defined twice (levels: %d and %d).\n",
p->account_id, GM_level, p->level);
}
if (GM_level != p->level)
{ // if new account or new level
- numdb_insert (gm_account_db, p->account_id, p);
+ numdb_insert(gm_account_db, p->account_id, p);
//printf("GM account:%d, level: %d->%d\n", p->account_id, GM_level, p->level);
if (GM_level == 0)
{ // if new account
c++;
if (c >= 4000)
{
- printf
- ("***WARNING: 4000 GM accounts found. Next GM accounts are not readed.\n");
- login_log
- ("***WARNING: 4000 GM accounts found. Next GM accounts are not readed.\n");
+ printf("***WARNING: 4000 GM accounts found. Next GM accounts are not readed.\n");
+ login_log("***WARNING: 4000 GM accounts found. Next GM accounts are not readed.\n");
}
}
}
}
}
- fclose_ (fp);
+ fclose_(fp);
- printf ("read_gm_account: file '%s' readed (%d GM accounts found).\n",
+ printf("read_gm_account: file '%s' readed (%d GM accounts found).\n",
GM_account_filename, c);
- login_log ("read_gm_account: file '%s' readed (%d GM accounts found).\n",
+ login_log("read_gm_account: file '%s' readed (%d GM accounts found).\n",
GM_account_filename, c);
return 0;
@@ -285,49 +276,49 @@ int read_gm_account (void)
// (ip: IP to be tested, str: mask x.x.x.x/# or x.x.x.x/y.y.y.y)
//--------------------------------------------------------------
static
-int check_ipmask (struct in_addr ip, const char *str)
+int check_ipmask(struct in_addr ip, const char *str)
{
unsigned int mask = 0, i = 0, m, ip2, a0, a1, a2, a3;
unsigned char *p = (unsigned char *) &ip2, *p2 = (unsigned char *) &mask;
- if (sscanf (str, "%d.%d.%d.%d/%n", &a0, &a1, &a2, &a3, &i) != 4 || i == 0)
+ if (sscanf(str, "%d.%d.%d.%d/%n", &a0, &a1, &a2, &a3, &i) != 4 || i == 0)
return 0;
p[0] = a0;
p[1] = a1;
p[2] = a2;
p[3] = a3;
- if (sscanf (str + i, "%d.%d.%d.%d", &a0, &a1, &a2, &a3) == 4)
+ if (sscanf(str + i, "%d.%d.%d.%d", &a0, &a1, &a2, &a3) == 4)
{
p2[0] = a0;
p2[1] = a1;
p2[2] = a2;
p2[3] = a3;
- mask = ntohl (mask);
+ mask = ntohl(mask);
}
- else if (sscanf (str + i, "%d", &m) == 1 && m <= 32)
+ else if (sscanf(str + i, "%d", &m) == 1 && m <= 32)
{
for (i = 0; i < m && i < 32; i++)
mask = (mask >> 1) | 0x80000000;
}
else
{
- printf ("check_ipmask: invalid mask [%s].\n", str);
+ printf("check_ipmask: invalid mask [%s].\n", str);
return 0;
}
// printf("Tested IP: %08x, network: %08x, network mask: %08x\n",
// (unsigned int)ntohl(ip), (unsigned int)ntohl(ip2), (unsigned int)mask);
- return ((ntohl (ip.s_addr) & mask) == (ntohl (ip2) & mask));
+ return ((ntohl(ip.s_addr) & mask) == (ntohl(ip2) & mask));
}
//---------------------
// Access control by IP
//---------------------
static
-int check_ip (struct in_addr ip)
+int check_ip(struct in_addr ip)
{
- int i;
+ int i;
enum
{ ACF_DEF, ACF_ALLOW, ACF_DENY } flag = ACF_DEF;
@@ -348,7 +339,7 @@ int check_ip (struct in_addr ip)
for (i = 0; i < access_allownum; i++)
{
const char *p = access_allow + i * ACO_STRSIZE;
- if (memcmp (p, buf, strlen (p)) == 0 || check_ipmask (ip, p))
+ if (memcmp(p, buf, strlen(p)) == 0 || check_ipmask(ip, p))
{
flag = ACF_ALLOW;
if (access_order == ACO_ALLOW_DENY)
@@ -360,7 +351,7 @@ int check_ip (struct in_addr ip)
for (i = 0; i < access_denynum; i++)
{
const char *p = access_deny + i * ACO_STRSIZE;
- if (memcmp (p, buf, strlen (p)) == 0 || check_ipmask (ip, p))
+ if (memcmp(p, buf, strlen(p)) == 0 || check_ipmask(ip, p))
{
flag = ACF_DENY;
return 0; // At this point, if it's 'deny', we refuse connection.
@@ -379,9 +370,9 @@ int check_ip (struct in_addr ip)
// Access control by IP for ladmin
//--------------------------------
static
-int check_ladminip (struct in_addr ip)
+int check_ladminip(struct in_addr ip)
{
- int i;
+ int i;
if (access_ladmin_allownum == 0)
return 1; // When there is no restriction, all IP are authorised.
@@ -400,7 +391,7 @@ int check_ladminip (struct in_addr ip)
for (i = 0; i < access_ladmin_allownum; i++)
{
const char *p = access_ladmin_allow + i * ACO_STRSIZE;
- if (memcmp (p, buf, strlen (p)) == 0 || check_ipmask (ip, p))
+ if (memcmp(p, buf, strlen(p)) == 0 || check_ipmask(ip, p))
{
return 1;
}
@@ -418,19 +409,19 @@ int check_ladminip (struct in_addr ip)
// and similar to the searched name.
//-----------------------------------------------
static
-int search_account_index (char *account_name)
+int search_account_index(char *account_name)
{
- int i, quantity, index;
+ int i, quantity, index;
quantity = 0;
index = -1;
for (i = 0; i < auth_num; i++)
{
// Without case sensitive check (increase the number of similar account names found)
- if (strcasecmp (auth_dat[i].userid, account_name) == 0)
+ if (strcasecmp(auth_dat[i].userid, account_name) == 0)
{
// Strict comparison (if found, we finish the function immediatly with correct value)
- if (strcmp (auth_dat[i].userid, account_name) == 0)
+ if (strcmp(auth_dat[i].userid, account_name) == 0)
return i;
quantity++;
index = i;
@@ -449,12 +440,12 @@ int search_account_index (char *account_name)
// Create a string to save the account in the account file
//--------------------------------------------------------
static
-int mmo_auth_tostr (char *str, struct auth_dat *p)
+int mmo_auth_tostr(char *str, struct auth_dat *p)
{
- int i;
+ int i;
char *str_p = str;
- str_p += sprintf (str_p, "%d\t%s\t%s\t%s\t%c\t%d\t%d\t"
+ str_p += sprintf(str_p, "%d\t%s\t%s\t%s\t%c\t%d\t%d\t"
"%s\t%s\t%ld\t%s\t%s\t%ld\t",
p->account_id, p->userid, p->pass, p->lastlogin,
(p->sex == 2) ? 'S' : (p->sex ? 'M' : 'F'),
@@ -466,7 +457,7 @@ int mmo_auth_tostr (char *str, struct auth_dat *p)
for (i = 0; i < p->account_reg2_num; i++)
if (p->account_reg2[i].str[0])
str_p +=
- sprintf (str_p, "%s,%d ", p->account_reg2[i].str,
+ sprintf(str_p, "%s,%d ", p->account_reg2[i].str,
p->account_reg2[i].value);
return 0;
@@ -476,40 +467,39 @@ int mmo_auth_tostr (char *str, struct auth_dat *p)
// Reading of the accounts database
//---------------------------------
static
-int mmo_auth_init (void)
+int mmo_auth_init(void)
{
FILE *fp;
- int account_id, logincount, state, n, i, j, v;
+ int account_id, logincount, state, n, i, j, v;
char line[2048], *p, userid[2048], pass[2048], lastlogin[2048], sex,
email[2048], error_message[2048], last_ip[2048], memo[2048];
time_t ban_until_time;
time_t connect_until_time;
char str[2048];
- int GM_count = 0;
- int server_count = 0;
+ int GM_count = 0;
+ int server_count = 0;
- CREATE (auth_dat, struct auth_dat, 256);
+ CREATE(auth_dat, struct auth_dat, 256);
auth_max = 256;
- fp = fopen_ (account_filename, "r");
+ fp = fopen_(account_filename, "r");
if (fp == NULL)
{
// no account file -> no account -> no login, including char-server (ERROR)
- printf
- ("\033[1;31mmmo_auth_init: Accounts file [%s] not found.\033[0m\n",
+ printf("\033[1;31mmmo_auth_init: Accounts file [%s] not found.\033[0m\n",
account_filename);
return 0;
}
- while (fgets (line, sizeof (line) - 1, fp) != NULL)
+ while (fgets(line, sizeof(line) - 1, fp) != NULL)
{
if (line[0] == '/' && line[1] == '/')
continue;
- line[sizeof (line) - 1] = '\0';
+ line[sizeof(line) - 1] = '\0';
p = line;
// database version reading (v2)
- if (((i = sscanf (line, "%d\t%[^\t]\t%[^\t]\t%[^\t]\t%c\t%d\t%d\t"
+ if (((i = sscanf(line, "%d\t%[^\t]\t%[^\t]\t%[^\t]\t%c\t%d\t%d\t"
"%[^\t]\t%[^\t]\t%ld\t%[^\t]\t%[^\t]\t%ld%n",
&account_id, userid, pass, lastlogin, &sex,
&logincount, &state, email, error_message,
@@ -517,7 +507,7 @@ int mmo_auth_init (void)
&n)) == 13 && line[n] == '\t')
||
((i =
- sscanf (line,
+ sscanf(line,
"%d\t%[^\t]\t%[^\t]\t%[^\t]\t%c\t%d\t%d\t"
"%[^\t]\t%[^\t]\t%ld\t%[^\t]\t%[^\t]%n", &account_id,
userid, pass, lastlogin, &sex, &logincount, &state,
@@ -529,53 +519,41 @@ int mmo_auth_init (void)
// Some checks
if (account_id > END_ACCOUNT_NUM)
{
- printf
- ("\033[1;31mmmo_auth_init: ******Error: an account has an id higher than %d\n",
+ printf("\033[1;31mmmo_auth_init: ******Error: an account has an id higher than %d\n",
END_ACCOUNT_NUM);
- printf
- (" account id #%d -> account not read (saved in log file).\033[0m\n",
+ printf(" account id #%d -> account not read (saved in log file).\033[0m\n",
account_id);
- login_log
- ("mmmo_auth_init: ******Error: an account has an id higher than %d.\n",
+ login_log("mmmo_auth_init: ******Error: an account has an id higher than %d.\n",
END_ACCOUNT_NUM);
- login_log
- (" account id #%d -> account not read (saved in next line):\n",
+ login_log(" account id #%d -> account not read (saved in next line):\n",
account_id);
- login_log ("%s", line);
+ login_log("%s", line);
continue;
}
userid[23] = '\0';
- remove_control_chars (userid);
+ remove_control_chars(userid);
for (j = 0; j < auth_num; j++)
{
if (auth_dat[j].account_id == account_id)
{
- printf
- ("\033[1;31mmmo_auth_init: ******Error: an account has an identical id to another.\n");
- printf
- (" account id #%d -> new account not read (saved in log file).\033[0m\n",
+ printf("\033[1;31mmmo_auth_init: ******Error: an account has an identical id to another.\n");
+ printf(" account id #%d -> new account not read (saved in log file).\033[0m\n",
account_id);
- login_log
- ("mmmo_auth_init: ******Error: an account has an identical id to another.\n");
- login_log
- (" account id #%d -> new account not read (saved in next line):\n",
+ login_log("mmmo_auth_init: ******Error: an account has an identical id to another.\n");
+ login_log(" account id #%d -> new account not read (saved in next line):\n",
account_id);
- login_log ("%s", line);
+ login_log("%s", line);
break;
}
- else if (strcmp (auth_dat[j].userid, userid) == 0)
+ else if (strcmp(auth_dat[j].userid, userid) == 0)
{
- printf
- ("\033[1;31mmmo_auth_init: ******Error: account name already exists.\n");
- printf (" account name '%s' -> new account not read.\n", userid); // 2 lines, account name can be long.
- printf
- (" Account saved in log file.\033[0m\n");
- login_log
- ("mmmo_auth_init: ******Error: an account has an identical id to another.\n");
- login_log
- (" account id #%d -> new account not read (saved in next line):\n",
+ printf("\033[1;31mmmo_auth_init: ******Error: account name already exists.\n");
+ printf(" account name '%s' -> new account not read.\n", userid); // 2 lines, account name can be long.
+ printf(" Account saved in log file.\033[0m\n");
+ login_log("mmmo_auth_init: ******Error: an account has an identical id to another.\n");
+ login_log(" account id #%d -> new account not read (saved in next line):\n",
account_id);
- login_log ("%s", line);
+ login_log("%s", line);
break;
}
}
@@ -585,34 +563,34 @@ int mmo_auth_init (void)
if (auth_num >= auth_max)
{
auth_max += 256;
- RECREATE (auth_dat, struct auth_dat, auth_max);
+ RECREATE(auth_dat, struct auth_dat, auth_max);
}
- memset (&auth_dat[auth_num], '\0', sizeof (struct auth_dat));
+ memset(&auth_dat[auth_num], '\0', sizeof(struct auth_dat));
auth_dat[auth_num].account_id = account_id;
- strncpy (auth_dat[auth_num].userid, userid, 24);
+ strncpy(auth_dat[auth_num].userid, userid, 24);
memo[254] = '\0';
- remove_control_chars (memo);
- strncpy (auth_dat[auth_num].memo, memo, 255);
+ remove_control_chars(memo);
+ strncpy(auth_dat[auth_num].memo, memo, 255);
pass[39] = '\0';
- remove_control_chars (pass);
+ remove_control_chars(pass);
// If a password is not encrypted, we encrypt it now.
- // A password beginning with ! and - in the memo field is our magic
- if (pass[0] != '!' && memo[0] == '-') {
- strcpy(auth_dat[auth_num].pass, MD5_saltcrypt(pass, make_salt()));
- auth_dat[auth_num].memo[0] = '!';
- printf("encrypting pass: %s %s\n", pass, auth_dat[auth_num].pass);
- }
- else
- strcpy(auth_dat[auth_num].pass, pass);
+ // A password beginning with ! and - in the memo field is our magic
+ if (pass[0] != '!' && memo[0] == '-') {
+ strcpy(auth_dat[auth_num].pass, MD5_saltcrypt(pass, make_salt()));
+ auth_dat[auth_num].memo[0] = '!';
+ printf("encrypting pass: %s %s\n", pass, auth_dat[auth_num].pass);
+ }
+ else
+ strcpy(auth_dat[auth_num].pass, pass);
lastlogin[23] = '\0';
- remove_control_chars (lastlogin);
- strncpy (auth_dat[auth_num].lastlogin, lastlogin, 24);
+ remove_control_chars(lastlogin);
+ strncpy(auth_dat[auth_num].lastlogin, lastlogin, 24);
auth_dat[auth_num].sex = (sex == 'S'
|| sex == 's') ? 2 : (sex == 'M'
@@ -630,29 +608,28 @@ int mmo_auth_init (void)
else
auth_dat[auth_num].state = state;
- if (e_mail_check (email) == 0)
+ if (e_mail_check(email) == 0)
{
- printf
- ("Account %s (%d): invalid e-mail (replaced par a@a.com).\n",
+ printf("Account %s (%d): invalid e-mail (replaced par a@a.com).\n",
auth_dat[auth_num].userid,
auth_dat[auth_num].account_id);
- strncpy (auth_dat[auth_num].email, "a@a.com", 40);
+ strncpy(auth_dat[auth_num].email, "a@a.com", 40);
}
else
{
- remove_control_chars (email);
- strncpy (auth_dat[auth_num].email, email, 40);
+ remove_control_chars(email);
+ strncpy(auth_dat[auth_num].email, email, 40);
}
error_message[19] = '\0';
- remove_control_chars (error_message);
+ remove_control_chars(error_message);
if (error_message[0] == '\0' || state != 7)
{ // 7, because state is packet 0x006a value + 1
- strncpy (auth_dat[auth_num].error_message, "-", 20);
+ strncpy(auth_dat[auth_num].error_message, "-", 20);
}
else
{
- strncpy (auth_dat[auth_num].error_message, error_message, 20);
+ strncpy(auth_dat[auth_num].error_message, error_message, 20);
}
if (i == 13)
@@ -663,17 +640,17 @@ int mmo_auth_init (void)
auth_dat[auth_num].connect_until_time = connect_until_time;
last_ip[15] = '\0';
- remove_control_chars (last_ip);
- strncpy (auth_dat[auth_num].last_ip, last_ip, 16);
+ remove_control_chars(last_ip);
+ strncpy(auth_dat[auth_num].last_ip, last_ip, 16);
for (j = 0; j < ACCOUNT_REG2_NUM; j++)
{
p += n;
- if (sscanf (p, "%[^\t,],%d %n", str, &v, &n) != 2)
+ if (sscanf(p, "%[^\t,],%d %n", str, &v, &n) != 2)
{
// We must check if a str is void. If it's, we can continue to read other REG2.
// Account line will have something like: str2,9 ,9 str3,1 (here, ,9 is not good)
- if (p[0] == ',' && sscanf (p, ",%d %n", &v, &n) == 1)
+ if (p[0] == ',' && sscanf(p, ",%d %n", &v, &n) == 1)
{
j--;
continue;
@@ -682,13 +659,13 @@ int mmo_auth_init (void)
break;
}
str[31] = '\0';
- remove_control_chars (str);
- strncpy (auth_dat[auth_num].account_reg2[j].str, str, 32);
+ remove_control_chars(str);
+ strncpy(auth_dat[auth_num].account_reg2[j].str, str, 32);
auth_dat[auth_num].account_reg2[j].value = v;
}
auth_dat[auth_num].account_reg2_num = j;
- if (isGM (account_id) > 0)
+ if (isGM(account_id) > 0)
GM_count++;
if (auth_dat[auth_num].sex == 2)
server_count++;
@@ -700,59 +677,47 @@ int mmo_auth_init (void)
// Old athena database version reading (v1)
}
else if ((i =
- sscanf (line, "%d\t%[^\t]\t%[^\t]\t%[^\t]\t%c\t%d\t%d\t%n",
+ sscanf(line, "%d\t%[^\t]\t%[^\t]\t%[^\t]\t%c\t%d\t%d\t%n",
&account_id, userid, pass, lastlogin, &sex,
&logincount, &state, &n)) >= 5)
{
if (account_id > END_ACCOUNT_NUM)
{
- printf
- ("\033[1;31mmmo_auth_init: ******Error: an account has an id higher than %d\n",
+ printf("\033[1;31mmmo_auth_init: ******Error: an account has an id higher than %d\n",
END_ACCOUNT_NUM);
- printf
- (" account id #%d -> account not read (saved in log file).\033[0m\n",
+ printf(" account id #%d -> account not read (saved in log file).\033[0m\n",
account_id);
- login_log
- ("mmmo_auth_init: ******Error: an account has an id higher than %d.\n",
+ login_log("mmmo_auth_init: ******Error: an account has an id higher than %d.\n",
END_ACCOUNT_NUM);
- login_log
- (" account id #%d -> account not read (saved in next line):\n",
+ login_log(" account id #%d -> account not read (saved in next line):\n",
account_id);
- login_log ("%s", line);
+ login_log("%s", line);
continue;
}
userid[23] = '\0';
- remove_control_chars (userid);
+ remove_control_chars(userid);
for (j = 0; j < auth_num; j++)
{
if (auth_dat[j].account_id == account_id)
{
- printf
- ("\033[1;31mmmo_auth_init: ******Error: an account has an identical id to another.\n");
- printf
- (" account id #%d -> new account not read (saved in log file).\033[0m\n",
+ printf("\033[1;31mmmo_auth_init: ******Error: an account has an identical id to another.\n");
+ printf(" account id #%d -> new account not read (saved in log file).\033[0m\n",
account_id);
- login_log
- ("mmmo_auth_init: ******Error: an account has an identical id to another.\n");
- login_log
- (" account id #%d -> new account not read (saved in next line):\n",
+ login_log("mmmo_auth_init: ******Error: an account has an identical id to another.\n");
+ login_log(" account id #%d -> new account not read (saved in next line):\n",
account_id);
- login_log ("%s", line);
+ login_log("%s", line);
break;
}
- else if (strcmp (auth_dat[j].userid, userid) == 0)
+ else if (strcmp(auth_dat[j].userid, userid) == 0)
{
- printf
- ("\033[1;31mmmo_auth_init: ******Error: account name already exists.\n");
- printf (" account name '%s' -> new account not read.\n", userid); // 2 lines, account name can be long.
- printf
- (" Account saved in log file.\033[0m\n");
- login_log
- ("mmmo_auth_init: ******Error: an account has an identical id to another.\n");
- login_log
- (" account id #%d -> new account not read (saved in next line):\n",
+ printf("\033[1;31mmmo_auth_init: ******Error: account name already exists.\n");
+ printf(" account name '%s' -> new account not read.\n", userid); // 2 lines, account name can be long.
+ printf(" Account saved in log file.\033[0m\n");
+ login_log("mmmo_auth_init: ******Error: an account has an identical id to another.\n");
+ login_log(" account id #%d -> new account not read (saved in next line):\n",
account_id);
- login_log ("%s", line);
+ login_log("%s", line);
break;
}
}
@@ -762,18 +727,18 @@ int mmo_auth_init (void)
if (auth_num >= auth_max)
{
auth_max += 256;
- RECREATE (auth_dat, struct auth_dat, auth_max);
+ RECREATE(auth_dat, struct auth_dat, auth_max);
}
- memset (&auth_dat[auth_num], '\0', sizeof (struct auth_dat));
+ memset(&auth_dat[auth_num], '\0', sizeof(struct auth_dat));
auth_dat[auth_num].account_id = account_id;
- strncpy (auth_dat[auth_num].userid, userid, 24);
+ strncpy(auth_dat[auth_num].userid, userid, 24);
lastlogin[23] = '\0';
- remove_control_chars (lastlogin);
- strncpy (auth_dat[auth_num].lastlogin, lastlogin, 24);
+ remove_control_chars(lastlogin);
+ strncpy(auth_dat[auth_num].lastlogin, lastlogin, 24);
auth_dat[auth_num].sex = (sex == 'S'
|| sex == 's') ? 2 : (sex == 'M'
@@ -802,21 +767,21 @@ int mmo_auth_init (void)
auth_dat[auth_num].state = 0;
// Initialization of new data
- strncpy (auth_dat[auth_num].email, "a@a.com", 40);
- strncpy (auth_dat[auth_num].error_message, "-", 20);
+ strncpy(auth_dat[auth_num].email, "a@a.com", 40);
+ strncpy(auth_dat[auth_num].error_message, "-", 20);
auth_dat[auth_num].ban_until_time = 0;
auth_dat[auth_num].connect_until_time = 0;
- strncpy (auth_dat[auth_num].last_ip, "-", 16);
- strncpy (auth_dat[auth_num].memo, "!", 255);
+ strncpy(auth_dat[auth_num].last_ip, "-", 16);
+ strncpy(auth_dat[auth_num].memo, "!", 255);
for (j = 0; j < ACCOUNT_REG2_NUM; j++)
{
p += n;
- if (sscanf (p, "%[^\t,],%d %n", str, &v, &n) != 2)
+ if (sscanf(p, "%[^\t,],%d %n", str, &v, &n) != 2)
{
// We must check if a str is void. If it's, we can continue to read other REG2.
// Account line will have something like: str2,9 ,9 str3,1 (here, ,9 is not good)
- if (p[0] == ',' && sscanf (p, ",%d %n", &v, &n) == 1)
+ if (p[0] == ',' && sscanf(p, ",%d %n", &v, &n) == 1)
{
j--;
continue;
@@ -825,13 +790,13 @@ int mmo_auth_init (void)
break;
}
str[31] = '\0';
- remove_control_chars (str);
- strncpy (auth_dat[auth_num].account_reg2[j].str, str, 32);
+ remove_control_chars(str);
+ strncpy(auth_dat[auth_num].account_reg2[j].str, str, 32);
auth_dat[auth_num].account_reg2[j].value = v;
}
auth_dat[auth_num].account_reg2_num = j;
- if (isGM (account_id) > 0)
+ if (isGM(account_id) > 0)
GM_count++;
if (auth_dat[auth_num].sex == 2)
server_count++;
@@ -844,67 +809,67 @@ int mmo_auth_init (void)
else
{
i = 0;
- if (sscanf (line, "%d\t%%newid%%\n%n", &account_id, &i) == 1 &&
+ if (sscanf(line, "%d\t%%newid%%\n%n", &account_id, &i) == 1 &&
i > 0 && account_id > account_id_count)
account_id_count = account_id;
}
}
- fclose_ (fp);
+ fclose_(fp);
if (auth_num == 0)
{
- printf ("mmo_auth_init: No account found in %s.\n", account_filename);
- sprintf (line, "No account found in %s.", account_filename);
+ printf("mmo_auth_init: No account found in %s.\n", account_filename);
+ sprintf(line, "No account found in %s.", account_filename);
}
else
{
if (auth_num == 1)
{
- printf ("mmo_auth_init: 1 account read in %s,\n",
+ printf("mmo_auth_init: 1 account read in %s,\n",
account_filename);
- sprintf (line, "1 account read in %s,", account_filename);
+ sprintf(line, "1 account read in %s,", account_filename);
}
else
{
- printf ("mmo_auth_init: %d accounts read in %s,\n", auth_num,
+ printf("mmo_auth_init: %d accounts read in %s,\n", auth_num,
account_filename);
- sprintf (line, "%d accounts read in %s,", auth_num,
+ sprintf(line, "%d accounts read in %s,", auth_num,
account_filename);
}
if (GM_count == 0)
{
- printf (" of which is no GM account, and ");
- sprintf (str, "%s of which is no GM account and", line);
+ printf(" of which is no GM account, and ");
+ sprintf(str, "%s of which is no GM account and", line);
}
else if (GM_count == 1)
{
- printf (" of which is 1 GM account, and ");
- sprintf (str, "%s of which is 1 GM account and", line);
+ printf(" of which is 1 GM account, and ");
+ sprintf(str, "%s of which is 1 GM account and", line);
}
else
{
- printf (" of which is %d GM accounts, and ",
+ printf(" of which is %d GM accounts, and ",
GM_count);
- sprintf (str, "%s of which is %d GM accounts and", line,
+ sprintf(str, "%s of which is %d GM accounts and", line,
GM_count);
}
if (server_count == 0)
{
- printf ("no server account ('S').\n");
- sprintf (line, "%s no server account ('S').", str);
+ printf("no server account ('S').\n");
+ sprintf(line, "%s no server account ('S').", str);
}
else if (server_count == 1)
{
- printf ("1 server account ('S').\n");
- sprintf (line, "%s 1 server account ('S').", str);
+ printf("1 server account ('S').\n");
+ sprintf(line, "%s 1 server account ('S').", str);
}
else
{
- printf ("%d server accounts ('S').\n", server_count);
- sprintf (line, "%s %d server accounts ('S').", str, server_count);
+ printf("%d server accounts ('S').\n", server_count);
+ sprintf(line, "%s %d server accounts ('S').", str, server_count);
}
}
- login_log ("%s\n", line);
+ login_log("%s\n", line);
return 0;
}
@@ -914,11 +879,11 @@ int mmo_auth_init (void)
// (accounts are sorted by id before save)
//------------------------------------------
static
-void mmo_auth_sync (void)
+void mmo_auth_sync(void)
{
FILE *fp;
- int i, j, k, lock;
- int id[auth_num];
+ int i, j, k, lock;
+ int id[auth_num];
char line[65536];
// Sorting before save
@@ -938,29 +903,29 @@ void mmo_auth_sync (void)
}
// Data save
- fp = lock_fopen (account_filename, &lock);
+ fp = lock_fopen(account_filename, &lock);
if (fp == NULL)
return;
- fprintf (fp,
+ fprintf(fp,
"// Accounts file: here are saved all information about the accounts.\n");
- fprintf (fp,
+ fprintf(fp,
"// Structure: ID, account name, password, last login time, sex, # of logins, state, email, error message for state 7, validity time, last (accepted) login ip, memo field, ban timestamp, repeated(register text, register value)\n");
- fprintf (fp, "// Some explanations:\n");
- fprintf (fp,
+ fprintf(fp, "// Some explanations:\n");
+ fprintf(fp,
"// account name : between 4 to 23 char for a normal account (standard client can't send less than 4 char).\n");
- fprintf (fp, "// account password: between 4 to 23 char\n");
- fprintf (fp,
+ fprintf(fp, "// account password: between 4 to 23 char\n");
+ fprintf(fp,
"// sex : M or F for normal accounts, S for server accounts\n");
- fprintf (fp,
+ fprintf(fp,
"// state : 0: account is ok, 1 to 256: error code of packet 0x006a + 1\n");
- fprintf (fp,
+ fprintf(fp,
"// email : between 3 to 39 char (a@a.com is like no email)\n");
- fprintf (fp,
+ fprintf(fp,
"// error message : text for the state 7: 'Your are Prohibited to login until <text>'. Max 19 char\n");
- fprintf (fp,
+ fprintf(fp,
"// valitidy time : 0: unlimited account, <other value>: date calculated by addition of 1/1/1970 + value (number of seconds since the 1/1/1970)\n");
- fprintf (fp, "// memo field : max 254 char\n");
- fprintf (fp,
+ fprintf(fp, "// memo field : max 254 char\n");
+ fprintf(fp,
"// ban time : 0: no ban, <other value>: banned until the date: date calculated by addition of 1/1/1970 + value (number of seconds since the 1/1/1970)\n");
for (i = 0; i < auth_num; i++)
{
@@ -968,12 +933,12 @@ void mmo_auth_sync (void)
if (auth_dat[k].account_id < 0)
continue;
- mmo_auth_tostr (line, &auth_dat[k]);
- fprintf (fp, "%s\n", line);
+ mmo_auth_tostr(line, &auth_dat[k]);
+ fprintf(fp, "%s\n", line);
}
- fprintf (fp, "%d\t%%newid%%\n", account_id_count);
+ fprintf(fp, "%d\t%%newid%%\n", account_id_count);
- lock_fclose (fp, account_filename, &lock);
+ lock_fclose(fp, account_filename, &lock);
return;
}
@@ -984,12 +949,12 @@ void mmo_auth_sync (void)
// we save periodicly on a timer.
//-----------------------------------------------------
static
-void check_auth_sync (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data)
+void check_auth_sync(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data)
{
if (pid != 0)
{
int status;
- pid_t temp = waitpid (pid, &status, WNOHANG);
+ pid_t temp = waitpid(pid, &status, WNOHANG);
// Need to check status too?
if (temp == 0)
@@ -1000,14 +965,14 @@ void check_auth_sync (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d
// This can take a lot of time. Fork a child to handle the work and return at once
// If we're unable to fork just continue running the function normally
- if ((pid = fork ()) > 0)
+ if ((pid = fork()) > 0)
return;
- mmo_auth_sync ();
+ mmo_auth_sync();
// If we're a child we should suicide now.
if (pid == 0)
- _exit (0);
+ _exit(0);
return;
}
@@ -1016,17 +981,17 @@ void check_auth_sync (timer_id tid, tick_t tick, custom_id_t id, custom_data_t d
// Packet send to all char-servers, except one (wos: without our self)
//--------------------------------------------------------------------
static
-int charif_sendallwos (int sfd, unsigned char *buf, unsigned int len)
+int charif_sendallwos(int sfd, unsigned char *buf, unsigned int len)
{
- int i, c;
+ int i, c;
for (i = 0, c = 0; i < MAX_SERVERS; i++)
{
- int fd;
+ int fd;
if ((fd = server_fd[i]) >= 0 && fd != sfd)
{
- memcpy (WFIFOP (fd, 0), buf, len);
- WFIFOSET (fd, len);
+ memcpy(WFIFOP(fd, 0), buf, len);
+ WFIFOSET(fd, len);
c++;
}
}
@@ -1037,25 +1002,25 @@ int charif_sendallwos (int sfd, unsigned char *buf, unsigned int len)
// Send GM accounts to all char-server
//-----------------------------------------------------
static
-void send_GM_accounts (void)
+void send_GM_accounts(void)
{
- int i;
+ int i;
uint8_t buf[32000];
- int GM_value;
- int len;
+ int GM_value;
+ int len;
len = 4;
- WBUFW (buf, 0) = 0x2732;
+ WBUFW(buf, 0) = 0x2732;
for (i = 0; i < auth_num; i++)
// send only existing accounts. We can not create a GM account when server is online.
- if ((GM_value = isGM (auth_dat[i].account_id)) > 0)
+ if ((GM_value = isGM(auth_dat[i].account_id)) > 0)
{
- WBUFL (buf, len) = auth_dat[i].account_id;
- WBUFB (buf, len + 4) = (unsigned char) GM_value;
+ WBUFL(buf, len) = auth_dat[i].account_id;
+ WBUFB(buf, len + 4) = (unsigned char) GM_value;
len += 5;
}
- WBUFW (buf, 2) = len;
- charif_sendallwos (-1, buf, len);
+ WBUFW(buf, 2) = len;
+ charif_sendallwos(-1, buf, len);
return;
}
@@ -1064,7 +1029,7 @@ void send_GM_accounts (void)
// Check if GM file account have been changed
//-----------------------------------------------------
static
-void check_GM_file (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data)
+void check_GM_file(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data)
{
struct stat file_stat;
long new_time;
@@ -1074,15 +1039,15 @@ void check_GM_file (timer_id tid, tick_t tick, custom_id_t id, custom_data_t dat
return;
// get last modify time/date
- if (stat (GM_account_filename, &file_stat))
+ if (stat(GM_account_filename, &file_stat))
new_time = 0; // error
else
new_time = file_stat.st_mtime;
if (new_time != creation_time_GM_account_file)
{
- read_gm_account ();
- send_GM_accounts ();
+ read_gm_account();
+ send_GM_accounts();
}
}
@@ -1090,32 +1055,32 @@ void check_GM_file (timer_id tid, tick_t tick, custom_id_t id, custom_data_t dat
// Account creation (with e-mail check)
//-------------------------------------
static
-int mmo_auth_new (struct mmo_account *account, char sex, const char *email)
+int mmo_auth_new(struct mmo_account *account, char sex, const char *email)
{
time_t timestamp, timestamp_temp;
struct tm *tmtime;
- int i = auth_num;
+ int i = auth_num;
if (auth_num >= auth_max)
{
auth_max += 256;
- RECREATE (auth_dat, struct auth_dat, auth_max);
+ RECREATE(auth_dat, struct auth_dat, auth_max);
}
- memset (&auth_dat[i], '\0', sizeof (struct auth_dat));
+ memset(&auth_dat[i], '\0', sizeof(struct auth_dat));
- while (isGM (account_id_count) > 0)
+ while (isGM(account_id_count) > 0)
account_id_count++;
auth_dat[i].account_id = account_id_count++;
- strncpy (auth_dat[i].userid, account->userid, 24);
+ strncpy(auth_dat[i].userid, account->userid, 24);
auth_dat[i].userid[23] = '\0';
strcpy(auth_dat[i].pass, MD5_saltcrypt(account->passwd, make_salt()));
auth_dat[i].pass[39] = '\0';
- memcpy (auth_dat[i].lastlogin, "-", 2);
+ memcpy(auth_dat[i].lastlogin, "-", 2);
auth_dat[i].sex = (sex == 'M');
@@ -1123,12 +1088,12 @@ int mmo_auth_new (struct mmo_account *account, char sex, const char *email)
auth_dat[i].state = 0;
- if (e_mail_check (email) == 0)
- strncpy (auth_dat[i].email, "a@a.com", 40);
+ if (e_mail_check(email) == 0)
+ strncpy(auth_dat[i].email, "a@a.com", 40);
else
- strncpy (auth_dat[i].email, email, 40);
+ strncpy(auth_dat[i].email, email, 40);
- strncpy (auth_dat[i].error_message, "-", 20);
+ strncpy(auth_dat[i].error_message, "-", 20);
auth_dat[i].ban_until_time = 0;
@@ -1136,49 +1101,49 @@ int mmo_auth_new (struct mmo_account *account, char sex, const char *email)
auth_dat[i].connect_until_time = 0; // unlimited
else
{ // limited time
- timestamp = time (NULL) + start_limited_time;
+ timestamp = time(NULL) + start_limited_time;
// double conversion to be sure that it is possible
- tmtime = gmtime (&timestamp);
- timestamp_temp = mktime (tmtime);
+ tmtime = gmtime(&timestamp);
+ timestamp_temp = mktime(tmtime);
if (timestamp_temp != -1 && (timestamp_temp + 3600) >= timestamp) // check possible value and overflow (and avoid summer/winter hour)
auth_dat[i].connect_until_time = timestamp_temp;
else
auth_dat[i].connect_until_time = 0; // unlimited
}
- strncpy (auth_dat[i].last_ip, "-", 16);
+ strncpy(auth_dat[i].last_ip, "-", 16);
- strncpy (auth_dat[i].memo, "!", 255);
+ strncpy(auth_dat[i].memo, "!", 255);
auth_dat[i].account_reg2_num = 0;
auth_num++;
- return (account_id_count - 1);
+ return(account_id_count - 1);
}
//---------------------------------------
// Check/authentification of a connection
//---------------------------------------
static
-int mmo_auth (struct mmo_account *account, int fd)
+int mmo_auth(struct mmo_account *account, int fd)
{
- int i;
+ int i;
struct timeval tv;
char tmpstr[256];
- int len, newaccount = 0;
+ int len, newaccount = 0;
#ifdef PASSWDENC
char md5str[64], md5bin[32];
#endif
const char *ip = ip2str(session[fd]->client_addr.sin_addr);
- len = strlen (account->userid) - 2;
+ len = strlen(account->userid) - 2;
// Account creation with _M/_F
if (account->passwdenc == 0 && account->userid[len] == '_' &&
(account->userid[len + 1] == 'F' || account->userid[len + 1] == 'M')
&& new_account_flag == 1 && account_id_count <= END_ACCOUNT_NUM
- && len >= 4 && strlen (account->passwd) >= 4)
+ && len >= 4 && strlen(account->passwd) >= 4)
{
if (new_account_flag == 1)
newaccount = 1;
@@ -1188,27 +1153,26 @@ int mmo_auth (struct mmo_account *account, int fd)
// Strict account search
for (i = 0; i < auth_num; i++)
{
- if (strcmp (account->userid, auth_dat[i].userid) == 0)
+ if (strcmp(account->userid, auth_dat[i].userid) == 0)
break;
}
// if there is no creation request and strict account search fails, we do a no sensitive case research for index
if (newaccount == 0 && i == auth_num)
{
- i = search_account_index (account->userid);
+ i = search_account_index(account->userid);
if (i == -1)
i = auth_num;
else
- memcpy (account->userid, auth_dat[i].userid, 24); // for the possible tests/checks afterwards (copy correcte sensitive case).
+ memcpy(account->userid, auth_dat[i].userid, 24); // for the possible tests/checks afterwards (copy correcte sensitive case).
}
if (i != auth_num)
{
- int encpasswdok = 0;
+ int encpasswdok = 0;
struct login_session_data *ld;
if (newaccount)
{
- login_log
- ("Attempt of creation of an already existant account (account: %s_%c, ip: %s)\n",
+ login_log("Attempt of creation of an already existant account (account: %s_%c, ip: %s)\n",
account->userid, account->userid[len + 1], ip);
return 9; // 9 = Account already exists
}
@@ -1216,10 +1180,10 @@ int mmo_auth (struct mmo_account *account, int fd)
#ifdef PASSWORDENC
if (account->passwdenc > 0)
{
- int j = account->passwdenc;
+ int j = account->passwdenc;
if (!ld)
{
- login_log ("Md5 key not created (account: %s, ip: %s)\n",
+ login_log("Md5 key not created (account: %s, ip: %s)\n",
account->userid, ip);
return 1; // 1 = Incorrect Password
}
@@ -1229,52 +1193,51 @@ int mmo_auth (struct mmo_account *account, int fd)
{
if (j == 1)
{
- strncpy (md5str, ld->md5key, sizeof (ld->md5key)); // 20
- strcat (md5str, auth_dat[i].pass); // 24
+ strncpy(md5str, ld->md5key, sizeof(ld->md5key)); // 20
+ strcat(md5str, auth_dat[i].pass); // 24
}
else if (j == 2)
{
- strncpy (md5str, auth_dat[i].pass, sizeof (auth_dat[i].pass)); // 24
- strcat (md5str, ld->md5key); // 20
+ strncpy(md5str, auth_dat[i].pass, sizeof(auth_dat[i].pass)); // 24
+ strcat(md5str, ld->md5key); // 20
}
else
md5str[0] = '\0';
- md5str[sizeof (md5str) - 1] = '\0'; // 64
- MD5_String2binary (md5str, md5bin);
- encpasswdok = (memcmp (account->passwd, md5bin, 16) == 0);
+ md5str[sizeof(md5str) - 1] = '\0'; // 64
+ MD5_String2binary(md5str, md5bin);
+ encpasswdok = (memcmp(account->passwd, md5bin, 16) == 0);
}
while (j < 2 && !encpasswdok && (j++) != account->passwdenc);
// printf("key[%s] md5 [%s] ", md5key, md5);
// printf("client [%s] accountpass [%s]\n", account->passwd, auth_dat[i].pass);
}
#endif
- if ((!pass_ok (account->passwd, auth_dat[i].pass)) && !encpasswdok)
+ if ((!pass_ok(account->passwd, auth_dat[i].pass)) && !encpasswdok)
{
if (account->passwdenc == 0)
- login_log
- ("Invalid password (account: %s, ip: %s)\n",
+ login_log("Invalid password (account: %s, ip: %s)\n",
account->userid, ip);
#ifdef PASSWORDENC
else
{
char logbuf[512], *p = logbuf;
- int j;
- p += sprintf (p,
+ int j;
+ p += sprintf(p,
"Invalid password (account: %s, received md5[",
account->userid);
for (j = 0; j < 16; j++)
- p += sprintf (p, "%02x",
+ p += sprintf(p, "%02x",
((unsigned char *) account->passwd)[j]);
- p += sprintf (p, "] calculated md5[");
+ p += sprintf(p, "] calculated md5[");
for (j = 0; j < 16; j++)
- p += sprintf (p, "%02x", ((unsigned char *) md5bin)[j]);
- p += sprintf (p, "] md5 key[");
+ p += sprintf(p, "%02x", ((unsigned char *) md5bin)[j]);
+ p += sprintf(p, "] md5 key[");
for (j = 0; j < ld->md5keylen; j++)
- p += sprintf (p, "%02x",
+ p += sprintf(p, "%02x",
((unsigned char *) ld->md5key)[j]);
- p += sprintf (p, "], ip: %s)\n", ip);
- login_log (logbuf);
+ p += sprintf(p, "], ip: %s)\n", ip);
+ login_log(logbuf);
}
#endif
return 1; // 1 = Incorrect Password
@@ -1282,8 +1245,7 @@ int mmo_auth (struct mmo_account *account, int fd)
if (auth_dat[i].state)
{
- login_log
- ("Connection refused (account: %s, state: %d, ip: %s)\n",
+ login_log("Connection refused (account: %s, state: %d, ip: %s)\n",
account->userid, auth_dat[i].state,
ip);
switch (auth_dat[i].state)
@@ -1308,68 +1270,63 @@ int mmo_auth (struct mmo_account *account, int fd)
if (auth_dat[i].ban_until_time != 0)
{ // if account is banned
- strftime (tmpstr, 20, date_format,
- gmtime (&auth_dat[i].ban_until_time));
+ strftime(tmpstr, 20, date_format,
+ gmtime(&auth_dat[i].ban_until_time));
tmpstr[19] = '\0';
- if (auth_dat[i].ban_until_time > time (NULL))
+ if (auth_dat[i].ban_until_time > time(NULL))
{ // always banned
- login_log
- ("Connection refused (account: %s, banned until %s, ip: %s)\n",
+ login_log("Connection refused (account: %s, banned until %s, ip: %s)\n",
account->userid, tmpstr, ip);
return 6; // 6 = Your are Prohibited to log in until %s
}
else
{ // ban is finished
- login_log
- ("End of ban (account: %s, previously banned until %s -> not more banned, ip: %s)\n",
+ login_log("End of ban (account: %s, previously banned until %s -> not more banned, ip: %s)\n",
account->userid, tmpstr, ip);
auth_dat[i].ban_until_time = 0; // reset the ban time
}
}
if (auth_dat[i].connect_until_time != 0
- && auth_dat[i].connect_until_time < time (NULL))
+ && auth_dat[i].connect_until_time < time(NULL))
{
- login_log
- ("Connection refused (account: %s, expired ID, ip: %s)\n",
+ login_log("Connection refused (account: %s, expired ID, ip: %s)\n",
account->userid, ip);
return 2; // 2 = This ID is expired
}
- login_log ("Authentification accepted (account: %s (id: %d), ip: %s)\n",
+ login_log("Authentification accepted (account: %s (id: %d), ip: %s)\n",
account->userid, auth_dat[i].account_id, ip);
}
else
{
if (newaccount == 0)
{
- login_log
- ("Unknown account (account: %s, ip: %s)\n",
+ login_log("Unknown account (account: %s, ip: %s)\n",
account->userid, ip);
return 0; // 0 = Unregistered ID
}
else
{
- int new_id =
- mmo_auth_new (account, account->userid[len + 1], "a@a.com");
- login_log
- ("Account creation and authentification accepted (account %s (id: %d), sex: %c, connection with _F/_M, ip: %s)\n",
+ int new_id =
+ mmo_auth_new(account, account->userid[len + 1], "a@a.com");
+ login_log("Account creation and authentification accepted (account %s (id: %d), sex: %c, connection with _F/_M, ip: %s)\n",
account->userid, new_id,
account->userid[len + 1], ip);
}
}
- gettimeofday (&tv, NULL);
- strftime (tmpstr, 24, date_format, gmtime (&(tv.tv_sec)));
- sprintf (tmpstr + strlen (tmpstr), ".%03d", (int) tv.tv_usec / 1000);
+ gettimeofday(&tv, NULL);
+ strftime(tmpstr, 24, date_format, gmtime(&(tv.tv_sec)));
+ sprintf(tmpstr + strlen(tmpstr), ".%03d", (int) tv.tv_usec / 1000);
account->account_id = auth_dat[i].account_id;
- account->login_id1 = mt_random ();
- account->login_id2 = mt_random ();
- memcpy (account->lastlogin, auth_dat[i].lastlogin, 24);
- memcpy (auth_dat[i].lastlogin, tmpstr, 24);
+ account->login_id1 = mt_random();
+ account->login_id2 = mt_random();
+ memcpy(account->lastlogin, auth_dat[i].lastlogin, 24);
+ memcpy(auth_dat[i].lastlogin, tmpstr, 24);
account->sex = auth_dat[i].sex;
- strncpy (auth_dat[i].last_ip, ip, 16);
+ strncpy(auth_dat[i].last_ip, ip, 16);
auth_dat[i].logincount++;
return -1; // account OK
@@ -1379,9 +1336,9 @@ int mmo_auth (struct mmo_account *account, int fd)
// Char-server anti-freeze system
//-------------------------------
static
-void char_anti_freeze_system (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data)
+void char_anti_freeze_system(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data)
{
- int i;
+ int i;
//printf("Entering in char_anti_freeze_system function to check freeze of servers.\n");
for (i = 0; i < MAX_SERVERS; i++)
@@ -1391,11 +1348,9 @@ void char_anti_freeze_system (timer_id tid, tick_t tick, custom_id_t id, custom_
//printf("char_anti_freeze_system: server #%d '%s', flag: %d.\n", i, server[i].name, server_freezeflag[i]);
if (server_freezeflag[i]-- < 1)
{ // Char-server anti-freeze system. Counter. 5 ok, 4...0 freezed
- printf
- ("Char-server anti-freeze system: char-server #%d '%s' is freezed -> disconnection.\n",
+ printf("Char-server anti-freeze system: char-server #%d '%s' is freezed -> disconnection.\n",
i, server[i].name);
- login_log
- ("Char-server anti-freeze system: char-server #%d '%s' is freezed -> disconnection.\n",
+ login_log("Char-server anti-freeze system: char-server #%d '%s' is freezed -> disconnection.\n",
i, server[i].name);
session[server_fd[i]]->eof = 1;
}
@@ -1407,9 +1362,9 @@ void char_anti_freeze_system (timer_id tid, tick_t tick, custom_id_t id, custom_
// Packet parsing for char-servers
//--------------------------------
static
-void parse_fromchar (int fd)
+void parse_fromchar(int fd)
{
- int i, j, id;
+ int i, j, id;
const char *ip = ip2str(session[fd]->client_addr.sin_addr);
@@ -1420,89 +1375,86 @@ void parse_fromchar (int fd)
{
if (id < MAX_SERVERS)
{
- printf ("Char-server '%s' has disconnected.\n", server[id].name);
- login_log ("Char-server '%s' has disconnected (ip: %s).\n",
+ printf("Char-server '%s' has disconnected.\n", server[id].name);
+ login_log("Char-server '%s' has disconnected (ip: %s).\n",
server[id].name, ip);
server_fd[id] = -1;
- memset (&server[id], 0, sizeof (struct mmo_char_server));
+ memset(&server[id], 0, sizeof(struct mmo_char_server));
}
- close (fd);
- delete_session (fd);
+ close(fd);
+ delete_session(fd);
return;
}
- while (RFIFOREST (fd) >= 2)
+ while (RFIFOREST(fd) >= 2)
{
- if (display_parse_fromchar == 2 || (display_parse_fromchar == 1 && RFIFOW (fd, 0) != 0x2714)) // 0x2714 is done very often (number of players)
- printf
- ("parse_fromchar: connection #%d, packet: 0x%x (with being read: %d bytes).\n",
- fd, RFIFOW (fd, 0), RFIFOREST (fd));
+ if (display_parse_fromchar == 2 || (display_parse_fromchar == 1 && RFIFOW(fd, 0) != 0x2714)) // 0x2714 is done very often (number of players)
+ printf("parse_fromchar: connection #%d, packet: 0x%x (with being read: %d bytes).\n",
+ fd, RFIFOW(fd, 0), RFIFOREST(fd));
- switch (RFIFOW (fd, 0))
+ switch (RFIFOW(fd, 0))
{
// request from map-server via char-server to reload GM accounts (by Yor).
case 0x2709:
- login_log
- ("Char-server '%s': Request to re-load GM configuration file (ip: %s).\n",
+ login_log("Char-server '%s': Request to re-load GM configuration file (ip: %s).\n",
server[id].name, ip);
- read_gm_account ();
+ read_gm_account();
// send GM accounts to all char-servers
- send_GM_accounts ();
- RFIFOSKIP (fd, 2);
+ send_GM_accounts();
+ RFIFOSKIP(fd, 2);
break;
case 0x2712: // request from char-server to authentify an account
- if (RFIFOREST (fd) < 19)
+ if (RFIFOREST(fd) < 19)
return;
{
- int acc;
- acc = RFIFOL (fd, 2); // speed up
+ int acc;
+ acc = RFIFOL(fd, 2); // speed up
for (i = 0; i < AUTH_FIFO_SIZE; i++)
{
if (auth_fifo[i].account_id == acc &&
- auth_fifo[i].login_id1 == RFIFOL (fd, 6) &&
+ auth_fifo[i].login_id1 == RFIFOL(fd, 6) &&
#if CMP_AUTHFIFO_LOGIN2 != 0
- auth_fifo[i].login_id2 == RFIFOL (fd, 10) && // relate to the versions higher than 18
+ auth_fifo[i].login_id2 == RFIFOL(fd, 10) && // relate to the versions higher than 18
#endif
- auth_fifo[i].sex == RFIFOB (fd, 14) &&
+ auth_fifo[i].sex == RFIFOB(fd, 14) &&
(!check_ip_flag
- || auth_fifo[i].ip == RFIFOL (fd, 15))
+ || auth_fifo[i].ip == RFIFOL(fd, 15))
&& !auth_fifo[i].delflag)
{
- int p, k;
+ int p, k;
auth_fifo[i].delflag = 1;
- login_log
- ("Char-server '%s': authentification of the account %d accepted (ip: %s).\n",
+ login_log("Char-server '%s': authentification of the account %d accepted (ip: %s).\n",
server[id].name, acc, ip);
// printf("%d\n", i);
for (k = 0; k < auth_num; k++)
{
if (auth_dat[k].account_id == acc)
{
- WFIFOW (fd, 0) = 0x2729; // Sending of the account_reg2
- WFIFOL (fd, 4) = acc;
+ WFIFOW(fd, 0) = 0x2729; // Sending of the account_reg2
+ WFIFOL(fd, 4) = acc;
for (p = 8, j = 0;
j < auth_dat[k].account_reg2_num;
p += 36, j++)
{
- memcpy (WFIFOP (fd, p),
+ memcpy(WFIFOP(fd, p),
auth_dat[k].
account_reg2[j].str, 32);
- WFIFOL (fd, p + 32) =
+ WFIFOL(fd, p + 32) =
auth_dat[k].account_reg2[j].value;
}
- WFIFOW (fd, 2) = p;
- WFIFOSET (fd, p);
+ WFIFOW(fd, 2) = p;
+ WFIFOSET(fd, p);
// printf("parse_fromchar: Sending of account_reg2: login->char (auth fifo)\n");
- WFIFOW (fd, 0) = 0x2713;
- WFIFOL (fd, 2) = acc;
- WFIFOB (fd, 6) = 0;
- memcpy (WFIFOP (fd, 7), auth_dat[k].email,
+ WFIFOW(fd, 0) = 0x2713;
+ WFIFOL(fd, 2) = acc;
+ WFIFOB(fd, 6) = 0;
+ memcpy(WFIFOP(fd, 7), auth_dat[k].email,
40);
- WFIFOL (fd, 47) =
+ WFIFOL(fd, 47) =
(unsigned long)
auth_dat[k].connect_until_time;
- WFIFOSET (fd, 51);
+ WFIFOSET(fd, 51);
break;
}
}
@@ -1512,215 +1464,196 @@ void parse_fromchar (int fd)
// authentification not found
if (i == AUTH_FIFO_SIZE)
{
- login_log
- ("Char-server '%s': authentification of the account %d REFUSED (ip: %s).\n",
+ login_log("Char-server '%s': authentification of the account %d REFUSED (ip: %s).\n",
server[id].name, acc, ip);
- WFIFOW (fd, 0) = 0x2713;
- WFIFOL (fd, 2) = acc;
- WFIFOB (fd, 6) = 1;
+ WFIFOW(fd, 0) = 0x2713;
+ WFIFOL(fd, 2) = acc;
+ WFIFOB(fd, 6) = 1;
// It is unnecessary to send email
// It is unnecessary to send validity date of the account
- WFIFOSET (fd, 51);
+ WFIFOSET(fd, 51);
}
}
- RFIFOSKIP (fd, 19);
+ RFIFOSKIP(fd, 19);
break;
case 0x2714:
- if (RFIFOREST (fd) < 6)
+ if (RFIFOREST(fd) < 6)
return;
//printf("parse_fromchar: Receiving of the users number of the server '%s': %d\n", server[id].name, RFIFOL(fd,2));
- server[id].users = RFIFOL (fd, 2);
+ server[id].users = RFIFOL(fd, 2);
if (anti_freeze_enable)
server_freezeflag[id] = 5; // Char anti-freeze system. Counter. 5 ok, 4...0 freezed
- RFIFOSKIP (fd, 6);
+ RFIFOSKIP(fd, 6);
break;
// we receive a e-mail creation of an account with a default e-mail (no answer)
case 0x2715:
{
- int acc;
+ int acc;
char email[40];
- if (RFIFOREST (fd) < 46)
+ if (RFIFOREST(fd) < 46)
return;
- acc = RFIFOL (fd, 2); // speed up
- memcpy (email, RFIFOP (fd, 6), 40);
+ acc = RFIFOL(fd, 2); // speed up
+ memcpy(email, RFIFOP(fd, 6), 40);
email[39] = '\0';
- remove_control_chars (email);
+ remove_control_chars(email);
//printf("parse_fromchar: an e-mail creation of an account with a default e-mail: server '%s', account: %d, e-mail: '%s'.\n", server[id].name, acc, RFIFOP(fd,6));
- if (e_mail_check (email) == 0)
- login_log
- ("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - e-mail is invalid (account: %d, ip: %s)\n",
+ if (e_mail_check(email) == 0)
+ login_log("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - e-mail is invalid (account: %d, ip: %s)\n",
server[id].name, acc, ip);
else
{
for (i = 0; i < auth_num; i++)
{
if (auth_dat[i].account_id == acc
- && (strcmp (auth_dat[i].email, "a@a.com") == 0
+ && (strcmp(auth_dat[i].email, "a@a.com") == 0
|| auth_dat[i].email[0] == '\0'))
{
- memcpy (auth_dat[i].email, email, 40);
- login_log
- ("Char-server '%s': Create an e-mail on an account with a default e-mail (account: %d, new e-mail: %s, ip: %s).\n",
+ memcpy(auth_dat[i].email, email, 40);
+ login_log("Char-server '%s': Create an e-mail on an account with a default e-mail (account: %d, new e-mail: %s, ip: %s).\n",
server[id].name, acc, email, ip);
break;
}
}
if (i == auth_num)
- login_log
- ("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - account doesn't exist or e-mail of account isn't default e-mail (account: %d, ip: %s).\n",
+ login_log("Char-server '%s': Attempt to create an e-mail on an account with a default e-mail REFUSED - account doesn't exist or e-mail of account isn't default e-mail (account: %d, ip: %s).\n",
server[id].name, acc, ip);
}
- RFIFOSKIP (fd, 46);
+ RFIFOSKIP(fd, 46);
break;
// We receive an e-mail/limited time request, because a player comes back from a map-server to the char-server
}
case 0x2716:
- if (RFIFOREST (fd) < 6)
+ if (RFIFOREST(fd) < 6)
return;
//printf("parse_fromchar: E-mail/limited time request from '%s' server (concerned account: %d)\n", server[id].name, RFIFOL(fd,2));
for (i = 0; i < auth_num; i++)
{
- if (auth_dat[i].account_id == RFIFOL (fd, 2))
+ if (auth_dat[i].account_id == RFIFOL(fd, 2))
{
- login_log
- ("Char-server '%s': e-mail of the account %d found (ip: %s).\n",
- server[id].name, RFIFOL (fd, 2), ip);
- WFIFOW (fd, 0) = 0x2717;
- WFIFOL (fd, 2) = RFIFOL (fd, 2);
- memcpy (WFIFOP (fd, 6), auth_dat[i].email, 40);
- WFIFOL (fd, 46) =
+ login_log("Char-server '%s': e-mail of the account %d found (ip: %s).\n",
+ server[id].name, RFIFOL(fd, 2), ip);
+ WFIFOW(fd, 0) = 0x2717;
+ WFIFOL(fd, 2) = RFIFOL(fd, 2);
+ memcpy(WFIFOP(fd, 6), auth_dat[i].email, 40);
+ WFIFOL(fd, 46) =
(unsigned long) auth_dat[i].connect_until_time;
- WFIFOSET (fd, 50);
+ WFIFOSET(fd, 50);
break;
}
}
if (i == auth_num)
{
- login_log
- ("Char-server '%s': e-mail of the account %d NOT found (ip: %s).\n",
- server[id].name, RFIFOL (fd, 2), ip);
+ login_log("Char-server '%s': e-mail of the account %d NOT found (ip: %s).\n",
+ server[id].name, RFIFOL(fd, 2), ip);
}
- RFIFOSKIP (fd, 6);
+ RFIFOSKIP(fd, 6);
break;
case 0x2720: // To become GM request
- if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2))
+ if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd, 2))
return;
{
- int acc;
+ int acc;
unsigned char buf[10];
FILE *fp;
- acc = RFIFOL (fd, 4);
+ acc = RFIFOL(fd, 4);
//printf("parse_fromchar: Request to become a GM acount from %d account.\n", acc);
- WBUFW (buf, 0) = 0x2721;
- WBUFL (buf, 2) = acc;
- WBUFL (buf, 6) = 0;
- if (strcmp ((const char *)RFIFOP (fd, 8), gm_pass) == 0)
+ WBUFW(buf, 0) = 0x2721;
+ WBUFL(buf, 2) = acc;
+ WBUFL(buf, 6) = 0;
+ if (strcmp((const char *)RFIFOP(fd, 8), gm_pass) == 0)
{
// only non-GM can become GM
- if (isGM (acc) == 0)
+ if (isGM(acc) == 0)
{
// if we autorise creation
if (level_new_gm > 0)
{
// if we can open the file to add the new GM
if ((fp =
- fopen_ (GM_account_filename,
+ fopen_(GM_account_filename,
"a")) != NULL)
{
char tmpstr[24];
struct timeval tv;
- gettimeofday (&tv, NULL);
- strftime (tmpstr, 23, date_format,
- gmtime (&(tv.tv_sec)));
- fprintf (fp,
+ gettimeofday(&tv, NULL);
+ strftime(tmpstr, 23, date_format,
+ gmtime(&(tv.tv_sec)));
+ fprintf(fp,
"\n// %s: @GM command on account %d\n%d %d\n",
tmpstr,
acc, acc, level_new_gm);
- fclose_ (fp);
- WBUFL (buf, 6) = level_new_gm;
- read_gm_account ();
- send_GM_accounts ();
- printf
- ("GM Change of the account %d: level 0 -> %d.\n",
+ fclose_(fp);
+ WBUFL(buf, 6) = level_new_gm;
+ read_gm_account();
+ send_GM_accounts();
+ printf("GM Change of the account %d: level 0 -> %d.\n",
acc, level_new_gm);
- login_log
- ("Char-server '%s': GM Change of the account %d: level 0 -> %d (ip: %s).\n",
+ login_log("Char-server '%s': GM Change of the account %d: level 0 -> %d (ip: %s).\n",
server[id].name, acc,
level_new_gm, ip);
}
else
{
- printf
- ("Error of GM change (suggested account: %d, correct password, unable to add a GM account in GM accounts file)\n",
+ printf("Error of GM change (suggested account: %d, correct password, unable to add a GM account in GM accounts file)\n",
acc);
- login_log
- ("Char-server '%s': Error of GM change (suggested account: %d, correct password, unable to add a GM account in GM accounts file, ip: %s).\n",
+ login_log("Char-server '%s': Error of GM change (suggested account: %d, correct password, unable to add a GM account in GM accounts file, ip: %s).\n",
server[id].name, acc, ip);
}
}
else
{
- printf
- ("Error of GM change (suggested account: %d, correct password, but GM creation is disable (level_new_gm = 0))\n",
+ printf("Error of GM change (suggested account: %d, correct password, but GM creation is disable (level_new_gm = 0))\n",
acc);
- login_log
- ("Char-server '%s': Error of GM change (suggested account: %d, correct password, but GM creation is disable (level_new_gm = 0), ip: %s).\n",
+ login_log("Char-server '%s': Error of GM change (suggested account: %d, correct password, but GM creation is disable (level_new_gm = 0), ip: %s).\n",
server[id].name, acc, ip);
}
}
else
{
- printf
- ("Error of GM change (suggested account: %d (already GM), correct password).\n",
+ printf("Error of GM change (suggested account: %d (already GM), correct password).\n",
acc);
- login_log
- ("Char-server '%s': Error of GM change (suggested account: %d (already GM), correct password, ip: %s).\n",
+ login_log("Char-server '%s': Error of GM change (suggested account: %d (already GM), correct password, ip: %s).\n",
server[id].name, acc, ip);
}
}
else
{
- printf
- ("Error of GM change (suggested account: %d, invalid password).\n",
+ printf("Error of GM change (suggested account: %d, invalid password).\n",
acc);
- login_log
- ("Char-server '%s': Error of GM change (suggested account: %d, invalid password, ip: %s).\n",
+ login_log("Char-server '%s': Error of GM change (suggested account: %d, invalid password, ip: %s).\n",
server[id].name, acc, ip);
}
- charif_sendallwos (-1, buf, 10);
+ charif_sendallwos(-1, buf, 10);
}
- RFIFOSKIP (fd, RFIFOW (fd, 2));
+ RFIFOSKIP(fd, RFIFOW(fd, 2));
return;
// Map server send information to change an email of an account via char-server
case 0x2722: // 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B
- if (RFIFOREST (fd) < 86)
+ if (RFIFOREST(fd) < 86)
return;
{
- int acc;
+ int acc;
char actual_email[40], new_email[40];
- acc = RFIFOL (fd, 2);
- memcpy (actual_email, RFIFOP (fd, 6), 40);
+ acc = RFIFOL(fd, 2);
+ memcpy(actual_email, RFIFOP(fd, 6), 40);
actual_email[39] = '\0';
- remove_control_chars (actual_email);
- memcpy (new_email, RFIFOP (fd, 46), 40);
+ remove_control_chars(actual_email);
+ memcpy(new_email, RFIFOP(fd, 46), 40);
new_email[39] = '\0';
- remove_control_chars (new_email);
- if (e_mail_check (actual_email) == 0)
- login_log
- ("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual email is invalid (account: %d, ip: %s)\n",
+ remove_control_chars(new_email);
+ if (e_mail_check(actual_email) == 0)
+ login_log("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual email is invalid (account: %d, ip: %s)\n",
server[id].name, acc, ip);
- else if (e_mail_check (new_email) == 0)
- login_log
- ("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a invalid new e-mail (account: %d, ip: %s)\n",
+ else if (e_mail_check(new_email) == 0)
+ login_log("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a invalid new e-mail (account: %d, ip: %s)\n",
server[id].name, acc, ip);
- else if (strcasecmp (new_email, "a@a.com") == 0)
- login_log
- ("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a default e-mail (account: %d, ip: %s)\n",
+ else if (strcasecmp(new_email, "a@a.com") == 0)
+ login_log("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command) with a default e-mail (account: %d, ip: %s)\n",
server[id].name, acc, ip);
else
{
@@ -1728,18 +1661,16 @@ void parse_fromchar (int fd)
{
if (auth_dat[i].account_id == acc)
{
- if (strcasecmp (auth_dat[i].email, actual_email)
+ if (strcasecmp(auth_dat[i].email, actual_email)
== 0)
{
- memcpy (auth_dat[i].email, new_email, 40);
- login_log
- ("Char-server '%s': Modify an e-mail on an account (@email GM command) (account: %d (%s), new e-mail: %s, ip: %s).\n",
+ memcpy(auth_dat[i].email, new_email, 40);
+ login_log("Char-server '%s': Modify an e-mail on an account (@email GM command) (account: %d (%s), new e-mail: %s, ip: %s).\n",
server[id].name, acc,
auth_dat[i].userid, new_email, ip);
}
else
- login_log
- ("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual e-mail is incorrect (account: %d (%s), actual e-mail: %s, proposed e-mail: %s, ip: %s).\n",
+ login_log("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but actual e-mail is incorrect (account: %d (%s), actual e-mail: %s, proposed e-mail: %s, ip: %s).\n",
server[id].name, acc,
auth_dat[i].userid,
auth_dat[i].email, actual_email, ip);
@@ -1747,40 +1678,38 @@ void parse_fromchar (int fd)
}
}
if (i == auth_num)
- login_log
- ("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but account doesn't exist (account: %d, ip: %s).\n",
+ login_log("Char-server '%s': Attempt to modify an e-mail on an account (@email GM command), but account doesn't exist (account: %d, ip: %s).\n",
server[id].name, acc, ip);
}
}
- RFIFOSKIP (fd, 86);
+ RFIFOSKIP(fd, 86);
break;
// Receiving of map-server via char-server a status change resquest (by Yor)
case 0x2724:
- if (RFIFOREST (fd) < 10)
+ if (RFIFOREST(fd) < 10)
return;
{
- int acc, statut;
- acc = RFIFOL (fd, 2);
- statut = RFIFOL (fd, 6);
+ int acc, statut;
+ acc = RFIFOL(fd, 2);
+ statut = RFIFOL(fd, 6);
for (i = 0; i < auth_num; i++)
{
if (auth_dat[i].account_id == acc)
{
if (auth_dat[i].state != statut)
{
- login_log
- ("Char-server '%s': Status change (account: %d, new status %d, ip: %s).\n",
+ login_log("Char-server '%s': Status change (account: %d, new status %d, ip: %s).\n",
server[id].name, acc, statut,
ip);
if (statut != 0)
{
unsigned char buf[16];
- WBUFW (buf, 0) = 0x2731;
- WBUFL (buf, 2) = acc;
- WBUFB (buf, 6) = 0; // 0: change of statut, 1: ban
- WBUFL (buf, 7) = statut; // status or final date of a banishment
- charif_sendallwos (-1, buf, 11);
+ WBUFW(buf, 0) = 0x2731;
+ WBUFL(buf, 2) = acc;
+ WBUFB(buf, 6) = 0; // 0: change of statut, 1: ban
+ WBUFL(buf, 7) = statut; // status or final date of a banishment
+ charif_sendallwos(-1, buf, 11);
for (j = 0; j < AUTH_FIFO_SIZE; j++)
if (auth_fifo[j].account_id == acc)
auth_fifo[j].login_id1++; // to avoid reconnection error when come back from map-server (char-server will ask again the authentification)
@@ -1788,8 +1717,7 @@ void parse_fromchar (int fd)
auth_dat[i].state = statut;
}
else
- login_log
- ("Char-server '%s': Error of Status change - actual status is already the good status (account: %d, status %d, ip: %s).\n",
+ login_log("Char-server '%s': Error of Status change - actual status is already the good status (account: %d, status %d, ip: %s).\n",
server[id].name, acc, statut,
ip);
break;
@@ -1797,20 +1725,19 @@ void parse_fromchar (int fd)
}
if (i == auth_num)
{
- login_log
- ("Char-server '%s': Error of Status change (account: %d not found, suggested status %d, ip: %s).\n",
+ login_log("Char-server '%s': Error of Status change (account: %d not found, suggested status %d, ip: %s).\n",
server[id].name, acc, statut, ip);
}
- RFIFOSKIP (fd, 10);
+ RFIFOSKIP(fd, 10);
}
return;
case 0x2725: // Receiving of map-server via char-server a ban resquest (by Yor)
- if (RFIFOREST (fd) < 18)
+ if (RFIFOREST(fd) < 18)
return;
{
- int acc;
- acc = RFIFOL (fd, 2);
+ int acc;
+ acc = RFIFOL(fd, 2);
for (i = 0; i < auth_num; i++)
{
if (auth_dat[i].account_id == acc)
@@ -1818,27 +1745,27 @@ void parse_fromchar (int fd)
time_t timestamp;
struct tm *tmtime;
if (auth_dat[i].ban_until_time == 0
- || auth_dat[i].ban_until_time < time (NULL))
- timestamp = time (NULL);
+ || auth_dat[i].ban_until_time < time(NULL))
+ timestamp = time(NULL);
else
timestamp = auth_dat[i].ban_until_time;
- tmtime = gmtime (&timestamp);
+ tmtime = gmtime(&timestamp);
tmtime->tm_year =
- tmtime->tm_year + (short) RFIFOW (fd, 6);
+ tmtime->tm_year + (short) RFIFOW(fd, 6);
tmtime->tm_mon =
- tmtime->tm_mon + (short) RFIFOW (fd, 8);
+ tmtime->tm_mon + (short) RFIFOW(fd, 8);
tmtime->tm_mday =
- tmtime->tm_mday + (short) RFIFOW (fd, 10);
+ tmtime->tm_mday + (short) RFIFOW(fd, 10);
tmtime->tm_hour =
- tmtime->tm_hour + (short) RFIFOW (fd, 12);
+ tmtime->tm_hour + (short) RFIFOW(fd, 12);
tmtime->tm_min =
- tmtime->tm_min + (short) RFIFOW (fd, 14);
+ tmtime->tm_min + (short) RFIFOW(fd, 14);
tmtime->tm_sec =
- tmtime->tm_sec + (short) RFIFOW (fd, 16);
- timestamp = timegm (tmtime);
+ tmtime->tm_sec + (short) RFIFOW(fd, 16);
+ timestamp = timegm(tmtime);
if (timestamp != -1)
{
- if (timestamp <= time (NULL))
+ if (timestamp <= time(NULL))
timestamp = 0;
if (auth_dat[i].ban_until_time != timestamp)
{
@@ -1846,21 +1773,20 @@ void parse_fromchar (int fd)
{
unsigned char buf[16];
char tmpstr[2048];
- strftime (tmpstr, 24, date_format,
- gmtime (&timestamp));
- login_log
- ("Char-server '%s': Ban request (account: %d, new final date of banishment: %ld (%s), ip: %s).\n",
+ strftime(tmpstr, 24, date_format,
+ gmtime(&timestamp));
+ login_log("Char-server '%s': Ban request (account: %d, new final date of banishment: %ld (%s), ip: %s).\n",
server[id].name, acc,
timestamp,
(timestamp ==
0 ? "no banishment" : tmpstr),
ip);
- WBUFW (buf, 0) = 0x2731;
- WBUFL (buf, 2) =
+ WBUFW(buf, 0) = 0x2731;
+ WBUFL(buf, 2) =
auth_dat[i].account_id;
- WBUFB (buf, 6) = 1; // 0: change of statut, 1: ban
- WBUFL (buf, 7) = timestamp; // status or final date of a banishment
- charif_sendallwos (-1, buf, 11);
+ WBUFB(buf, 6) = 1; // 0: change of statut, 1: ban
+ WBUFL(buf, 7) = timestamp; // status or final date of a banishment
+ charif_sendallwos(-1, buf, 11);
for (j = 0; j < AUTH_FIFO_SIZE; j++)
if (auth_fifo[j].account_id ==
acc)
@@ -1868,8 +1794,7 @@ void parse_fromchar (int fd)
}
else
{
- login_log
- ("Char-server '%s': Error of ban request (account: %d, new date unbans the account, ip: %s).\n",
+ login_log("Char-server '%s': Error of ban request (account: %d, new date unbans the account, ip: %s).\n",
server[id].name, acc,
ip);
}
@@ -1877,15 +1802,13 @@ void parse_fromchar (int fd)
}
else
{
- login_log
- ("Char-server '%s': Error of ban request (account: %d, no change for ban date, ip: %s).\n",
+ login_log("Char-server '%s': Error of ban request (account: %d, no change for ban date, ip: %s).\n",
server[id].name, acc, ip);
}
}
else
{
- login_log
- ("Char-server '%s': Error of ban request (account: %d, invalid date, ip: %s).\n",
+ login_log("Char-server '%s': Error of ban request (account: %d, invalid date, ip: %s).\n",
server[id].name, acc, ip);
}
break;
@@ -1893,28 +1816,26 @@ void parse_fromchar (int fd)
}
if (i == auth_num)
{
- login_log
- ("Char-server '%s': Error of ban request (account: %d not found, ip: %s).\n",
+ login_log("Char-server '%s': Error of ban request (account: %d not found, ip: %s).\n",
server[id].name, acc, ip);
}
- RFIFOSKIP (fd, 18);
+ RFIFOSKIP(fd, 18);
}
return;
case 0x2727: // Change of sex (sex is reversed)
- if (RFIFOREST (fd) < 6)
+ if (RFIFOREST(fd) < 6)
return;
{
- int acc, sex;
- acc = RFIFOL (fd, 2);
+ int acc, sex;
+ acc = RFIFOL(fd, 2);
for (i = 0; i < auth_num; i++)
{
// printf("%d,", auth_dat[i].account_id);
if (auth_dat[i].account_id == acc)
{
if (auth_dat[i].sex == 2)
- login_log
- ("Char-server '%s': Error of sex change - Server account (suggested account: %d, actual sex %d (Server), ip: %s).\n",
+ login_log("Char-server '%s': Error of sex change - Server account (suggested account: %d, actual sex %d (Server), ip: %s).\n",
server[id].name, acc,
auth_dat[i].sex, ip);
else
@@ -1924,8 +1845,7 @@ void parse_fromchar (int fd)
sex = 1;
else
sex = 0;
- login_log
- ("Char-server '%s': Sex change (account: %d, new sex %c, ip: %s).\n",
+ login_log("Char-server '%s': Sex change (account: %d, new sex %c, ip: %s).\n",
server[id].name, acc,
(sex == 2) ? 'S' : (sex ? 'M' : 'F'),
ip);
@@ -1933,56 +1853,54 @@ void parse_fromchar (int fd)
if (auth_fifo[j].account_id == acc)
auth_fifo[j].login_id1++; // to avoid reconnection error when come back from map-server (char-server will ask again the authentification)
auth_dat[i].sex = sex;
- WBUFW (buf, 0) = 0x2723;
- WBUFL (buf, 2) = acc;
- WBUFB (buf, 6) = sex;
- charif_sendallwos (-1, buf, 7);
+ WBUFW(buf, 0) = 0x2723;
+ WBUFL(buf, 2) = acc;
+ WBUFB(buf, 6) = sex;
+ charif_sendallwos(-1, buf, 7);
}
break;
}
}
if (i == auth_num)
{
- login_log
- ("Char-server '%s': Error of sex change (account: %d not found, sex would be reversed, ip: %s).\n",
+ login_log("Char-server '%s': Error of sex change (account: %d not found, sex would be reversed, ip: %s).\n",
server[id].name, acc, ip);
}
- RFIFOSKIP (fd, 6);
+ RFIFOSKIP(fd, 6);
}
return;
case 0x2728: // We receive account_reg2 from a char-server, and we send them to other char-servers.
- if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2))
+ if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd, 2))
return;
{
- int acc, p;
- acc = RFIFOL (fd, 4);
+ int acc, p;
+ acc = RFIFOL(fd, 4);
for (i = 0; i < auth_num; i++)
{
if (auth_dat[i].account_id == acc)
{
- unsigned char buf[RFIFOW (fd, 2) + 1];
- login_log
- ("Char-server '%s': receiving (from the char-server) of account_reg2 (account: %d, ip: %s).\n",
+ unsigned char buf[RFIFOW(fd, 2) + 1];
+ login_log("Char-server '%s': receiving (from the char-server) of account_reg2 (account: %d, ip: %s).\n",
server[id].name, acc, ip);
for (p = 8, j = 0;
- p < RFIFOW (fd, 2) && j < ACCOUNT_REG2_NUM;
+ p < RFIFOW(fd, 2) && j < ACCOUNT_REG2_NUM;
p += 36, j++)
{
- memcpy (auth_dat[i].account_reg2[j].str,
- RFIFOP (fd, p), 32);
+ memcpy(auth_dat[i].account_reg2[j].str,
+ RFIFOP(fd, p), 32);
auth_dat[i].account_reg2[j].str[31] = '\0';
- remove_control_chars (auth_dat[i].account_reg2
+ remove_control_chars(auth_dat[i].account_reg2
[j].str);
auth_dat[i].account_reg2[j].value =
- RFIFOL (fd, p + 32);
+ RFIFOL(fd, p + 32);
}
auth_dat[i].account_reg2_num = j;
// Sending information towards the other char-servers.
- memcpy (WBUFP (buf, 0), RFIFOP (fd, 0),
- RFIFOW (fd, 2));
- WBUFW (buf, 0) = 0x2729;
- charif_sendallwos (fd, buf, WBUFW (buf, 2));
+ memcpy(WBUFP(buf, 0), RFIFOP(fd, 0),
+ RFIFOW(fd, 2));
+ WBUFW(buf, 0) = 0x2729;
+ charif_sendallwos(fd, buf, WBUFW(buf, 2));
// printf("parse_fromchar: receiving (from the char-server) of account_reg2 (account id: %d).\n", acc);
break;
}
@@ -1990,20 +1908,19 @@ void parse_fromchar (int fd)
if (i == auth_num)
{
// printf("parse_fromchar: receiving (from the char-server) of account_reg2 (unknwon account id: %d).\n", acc);
- login_log
- ("Char-server '%s': receiving (from the char-server) of account_reg2 (account: %d not found, ip: %s).\n",
+ login_log("Char-server '%s': receiving (from the char-server) of account_reg2 (account: %d not found, ip: %s).\n",
server[id].name, acc, ip);
}
}
- RFIFOSKIP (fd, RFIFOW (fd, 2));
+ RFIFOSKIP(fd, RFIFOW(fd, 2));
break;
case 0x272a: // Receiving of map-server via char-server a unban resquest (by Yor)
- if (RFIFOREST (fd) < 6)
+ if (RFIFOREST(fd) < 6)
return;
{
- int acc;
- acc = RFIFOL (fd, 2);
+ int acc;
+ acc = RFIFOL(fd, 2);
for (i = 0; i < auth_num; i++)
{
if (auth_dat[i].account_id == acc)
@@ -2011,14 +1928,12 @@ void parse_fromchar (int fd)
if (auth_dat[i].ban_until_time != 0)
{
auth_dat[i].ban_until_time = 0;
- login_log
- ("Char-server '%s': UnBan request (account: %d, ip: %s).\n",
+ login_log("Char-server '%s': UnBan request (account: %d, ip: %s).\n",
server[id].name, acc, ip);
}
else
{
- login_log
- ("Char-server '%s': Error of UnBan request (account: %d, no change for unban date, ip: %s).\n",
+ login_log("Char-server '%s': Error of UnBan request (account: %d, no change for unban date, ip: %s).\n",
server[id].name, acc, ip);
}
break;
@@ -2026,45 +1941,43 @@ void parse_fromchar (int fd)
}
if (i == auth_num)
{
- login_log
- ("Char-server '%s': Error of UnBan request (account: %d not found, ip: %s).\n",
+ login_log("Char-server '%s': Error of UnBan request (account: %d not found, ip: %s).\n",
server[id].name, acc, ip);
}
- RFIFOSKIP (fd, 6);
+ RFIFOSKIP(fd, 6);
}
return;
// request from char-server to change account password
case 0x2740: // 0x2740 <account_id>.L <actual_password>.24B <new_password>.24B
- if (RFIFOREST (fd) < 54)
+ if (RFIFOREST(fd) < 54)
return;
{
- int acc;
+ int acc;
char actual_pass[24], new_pass[24];
- acc = RFIFOL (fd, 2);
- memcpy (actual_pass, RFIFOP (fd, 6), 24);
+ acc = RFIFOL(fd, 2);
+ memcpy(actual_pass, RFIFOP(fd, 6), 24);
actual_pass[23] = '\0';
- remove_control_chars (actual_pass);
- memcpy (new_pass, RFIFOP (fd, 30), 24);
+ remove_control_chars(actual_pass);
+ memcpy(new_pass, RFIFOP(fd, 30), 24);
new_pass[23] = '\0';
- remove_control_chars (new_pass);
+ remove_control_chars(new_pass);
- int status = 0;
+ int status = 0;
for (i = 0; i < auth_num; i++)
{
if (auth_dat[i].account_id == acc)
{
- if (pass_ok (actual_pass, auth_dat[i].pass))
+ if (pass_ok(actual_pass, auth_dat[i].pass))
{
- if (strlen (new_pass) < 4)
+ if (strlen(new_pass) < 4)
status = 3;
else
{
status = 1;
- strcpy (auth_dat[i].pass, MD5_saltcrypt(new_pass, make_salt()));
- login_log
- ("Char-server '%s': Change pass success (account: %d (%s), ip: %s.\n",
+ strcpy(auth_dat[i].pass, MD5_saltcrypt(new_pass, make_salt()));
+ login_log("Char-server '%s': Change pass success (account: %d (%s), ip: %s.\n",
server[id].name, acc,
auth_dat[i].userid, ip);
}
@@ -2072,21 +1985,20 @@ void parse_fromchar (int fd)
else
{
status = 2;
- login_log
- ("Char-server '%s': Attempt to modify a pass failed, wrong password. (account: %d (%s), ip: %s).\n",
+ login_log("Char-server '%s': Attempt to modify a pass failed, wrong password. (account: %d (%s), ip: %s).\n",
server[id].name, acc,
auth_dat[i].userid, ip);
}
break;
}
}
- WFIFOW (fd, 0) = 0x2741;
- WFIFOL (fd, 2) = acc;
- WFIFOB (fd, 6) = status; // 0: acc not found, 1: success, 2: password mismatch, 3: pass too short
- WFIFOSET (fd, 7);
+ WFIFOW(fd, 0) = 0x2741;
+ WFIFOL(fd, 2) = acc;
+ WFIFOB(fd, 6) = status; // 0: acc not found, 1: success, 2: password mismatch, 3: pass too short
+ WFIFOSET(fd, 7);
}
- RFIFOSKIP (fd, 54);
+ RFIFOSKIP(fd, 54);
break;
default:
@@ -2094,58 +2006,56 @@ void parse_fromchar (int fd)
FILE *logfp;
char tmpstr[24];
struct timeval tv;
- logfp = fopen_ (login_log_unknown_packets_filename, "a");
+ logfp = fopen_(login_log_unknown_packets_filename, "a");
if (logfp)
{
- gettimeofday (&tv, NULL);
- strftime (tmpstr, 23, date_format, gmtime (&(tv.tv_sec)));
- fprintf (logfp,
+ gettimeofday(&tv, NULL);
+ strftime(tmpstr, 23, date_format, gmtime(&(tv.tv_sec)));
+ fprintf(logfp,
"%s.%03d: receiving of an unknown packet -> disconnection\n",
tmpstr, (int) tv.tv_usec / 1000);
- fprintf (logfp,
+ fprintf(logfp,
"parse_fromchar: connection #%d (ip: %s), packet: 0x%x (with being read: %d).\n",
- fd, ip, RFIFOW (fd, 0), RFIFOREST (fd));
- fprintf (logfp, "Detail (in hex):\n");
- fprintf (logfp,
+ fd, ip, RFIFOW(fd, 0), RFIFOREST(fd));
+ fprintf(logfp, "Detail (in hex):\n");
+ fprintf(logfp,
"---- 00-01-02-03-04-05-06-07 08-09-0A-0B-0C-0D-0E-0F\n");
- memset (tmpstr, '\0', sizeof (tmpstr));
- for (i = 0; i < RFIFOREST (fd); i++)
+ memset(tmpstr, '\0', sizeof(tmpstr));
+ for (i = 0; i < RFIFOREST(fd); i++)
{
if ((i & 15) == 0)
- fprintf (logfp, "%04X ", i);
- fprintf (logfp, "%02x ", RFIFOB (fd, i));
- if (RFIFOB (fd, i) > 0x1f)
- tmpstr[i % 16] = RFIFOB (fd, i);
+ fprintf(logfp, "%04X ", i);
+ fprintf(logfp, "%02x ", RFIFOB(fd, i));
+ if (RFIFOB(fd, i) > 0x1f)
+ tmpstr[i % 16] = RFIFOB(fd, i);
else
tmpstr[i % 16] = '.';
if ((i - 7) % 16 == 0) // -8 + 1
- fprintf (logfp, " ");
+ fprintf(logfp, " ");
else if ((i + 1) % 16 == 0)
{
- fprintf (logfp, " %s\n", tmpstr);
- memset (tmpstr, '\0', sizeof (tmpstr));
+ fprintf(logfp, " %s\n", tmpstr);
+ memset(tmpstr, '\0', sizeof(tmpstr));
}
}
if (i % 16 != 0)
{
for (j = i; j % 16 != 0; j++)
{
- fprintf (logfp, " ");
+ fprintf(logfp, " ");
if ((j - 7) % 16 == 0) // -8 + 1
- fprintf (logfp, " ");
+ fprintf(logfp, " ");
}
- fprintf (logfp, " %s\n", tmpstr);
+ fprintf(logfp, " %s\n", tmpstr);
}
- fprintf (logfp, "\n");
- fclose_ (logfp);
+ fprintf(logfp, "\n");
+ fclose_(logfp);
}
}
- printf
- ("parse_fromchar: Unknown packet 0x%x (from a char-server)! -> disconnection.\n",
- RFIFOW (fd, 0));
+ printf("parse_fromchar: Unknown packet 0x%x (from a char-server)! -> disconnection.\n",
+ RFIFOW(fd, 0));
session[fd]->eof = 1;
- printf
- ("Char-server has been disconnected (unknown packet).\n");
+ printf("Char-server has been disconnected (unknown packet).\n");
return;
}
}
@@ -2156,74 +2066,72 @@ void parse_fromchar (int fd)
// Packet parsing for administation login
//---------------------------------------
static
-void parse_admin (int fd)
+void parse_admin(int fd)
{
- int i, j;
+ int i, j;
char *account_name;
const char *ip = ip2str(session[fd]->client_addr.sin_addr);
if (session[fd]->eof)
{
- close (fd);
- delete_session (fd);
- printf ("Remote administration has disconnected (session #%d).\n",
+ close(fd);
+ delete_session(fd);
+ printf("Remote administration has disconnected (session #%d).\n",
fd);
return;
}
- while (RFIFOREST (fd) >= 2)
+ while (RFIFOREST(fd) >= 2)
{
if (display_parse_admin == 1)
- printf
- ("parse_admin: connection #%d, packet: 0x%x (with being read: %d).\n",
- fd, RFIFOW (fd, 0), RFIFOREST (fd));
+ printf("parse_admin: connection #%d, packet: 0x%x (with being read: %d).\n",
+ fd, RFIFOW(fd, 0), RFIFOREST(fd));
- switch (RFIFOW (fd, 0))
+ switch (RFIFOW(fd, 0))
{
case 0x7530: // Request of the server version
- login_log ("'ladmin': Sending of the server version (ip: %s)\n",
+ login_log("'ladmin': Sending of the server version (ip: %s)\n",
ip);
- 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_LOGIN;
- WFIFOW (fd, 8) = ATHENA_MOD_VERSION;
- WFIFOSET (fd, 10);
- RFIFOSKIP (fd, 2);
+ 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_LOGIN;
+ WFIFOW(fd, 8) = ATHENA_MOD_VERSION;
+ WFIFOSET(fd, 10);
+ RFIFOSKIP(fd, 2);
break;
case 0x7532: // Request of end of connection
- login_log ("'ladmin': End of connection (ip: %s)\n",
+ login_log("'ladmin': End of connection (ip: %s)\n",
ip);
- RFIFOSKIP (fd, 2);
+ RFIFOSKIP(fd, 2);
session[fd]->eof = 1;
break;
case 0x7920: // Request of an accounts list
- if (RFIFOREST (fd) < 10)
+ if (RFIFOREST(fd) < 10)
return;
{
- int st, ed, len;
- int id[auth_num];
- st = RFIFOL (fd, 2);
- ed = RFIFOL (fd, 6);
- RFIFOSKIP (fd, 10);
- WFIFOW (fd, 0) = 0x7921;
+ int st, ed, len;
+ int id[auth_num];
+ st = RFIFOL(fd, 2);
+ ed = RFIFOL(fd, 6);
+ RFIFOSKIP(fd, 10);
+ WFIFOW(fd, 0) = 0x7921;
if (st < 0)
st = 0;
if (ed > END_ACCOUNT_NUM || ed < st || ed <= 0)
ed = END_ACCOUNT_NUM;
- login_log
- ("'ladmin': Sending an accounts list (ask: from %d to %d, ip: %s)\n",
+ login_log("'ladmin': Sending an accounts list (ask: from %d to %d, ip: %s)\n",
st, ed, ip);
// Sort before send
for (i = 0; i < auth_num; i++)
{
- int k;
+ int k;
id[i] = i;
for (j = 0; j < i; j++)
{
@@ -2243,363 +2151,344 @@ void parse_admin (int fd)
len = 4;
for (i = 0; i < auth_num && len < 30000; i++)
{
- int account_id = auth_dat[id[i]].account_id; // use sorted index
+ int account_id = auth_dat[id[i]].account_id; // use sorted index
if (account_id >= st && account_id <= ed)
{
j = id[i];
- WFIFOL (fd, len) = account_id;
- WFIFOB (fd, len + 4) =
- (unsigned char) isGM (account_id);
- memcpy (WFIFOP (fd, len + 5), auth_dat[j].userid,
+ WFIFOL(fd, len) = account_id;
+ WFIFOB(fd, len + 4) =
+ (unsigned char) isGM(account_id);
+ memcpy(WFIFOP(fd, len + 5), auth_dat[j].userid,
24);
- WFIFOB (fd, len + 29) = auth_dat[j].sex;
- WFIFOL (fd, len + 30) = auth_dat[j].logincount;
+ WFIFOB(fd, len + 29) = auth_dat[j].sex;
+ WFIFOL(fd, len + 30) = auth_dat[j].logincount;
if (auth_dat[j].state == 0 && auth_dat[j].ban_until_time != 0) // if no state and banished
- WFIFOL (fd, len + 34) = 7; // 6 = Your are Prohibited to log in until %s
+ WFIFOL(fd, len + 34) = 7; // 6 = Your are Prohibited to log in until %s
else
- WFIFOL (fd, len + 34) = auth_dat[j].state;
+ WFIFOL(fd, len + 34) = auth_dat[j].state;
len += 38;
}
}
- WFIFOW (fd, 2) = len;
- WFIFOSET (fd, len);
+ WFIFOW(fd, 2) = len;
+ WFIFOSET(fd, len);
}
break;
case 0x7924:
{ // [Fate] Itemfrob package: change item IDs
- if (RFIFOREST (fd) < 10)
+ if (RFIFOREST(fd) < 10)
return;
- charif_sendallwos (-1, RFIFOP (fd, 0), 10); // forward package to char servers
- RFIFOSKIP (fd, 10);
- WFIFOW (fd, 0) = 0x7925;
- WFIFOSET (fd, 2);
+ charif_sendallwos(-1, RFIFOP(fd, 0), 10); // forward package to char servers
+ RFIFOSKIP(fd, 10);
+ WFIFOW(fd, 0) = 0x7925;
+ WFIFOSET(fd, 2);
break;
}
case 0x7930: // Request for an account creation
- if (RFIFOREST (fd) < 91)
+ if (RFIFOREST(fd) < 91)
return;
{
struct mmo_account ma;
- ma.userid = (char *)RFIFOP (fd, 2);
- ma.passwd = (char *)RFIFOP (fd, 26);
- memcpy (ma.lastlogin, "-", 2);
- ma.sex = RFIFOB (fd, 50);
- WFIFOW (fd, 0) = 0x7931;
- WFIFOL (fd, 2) = -1;
- memcpy (WFIFOP (fd, 6), RFIFOP (fd, 2), 24);
- if (strlen (ma.userid) > 23 || strlen (ma.passwd) > 23)
+ ma.userid = (char *)RFIFOP(fd, 2);
+ ma.passwd = (char *)RFIFOP(fd, 26);
+ memcpy(ma.lastlogin, "-", 2);
+ ma.sex = RFIFOB(fd, 50);
+ WFIFOW(fd, 0) = 0x7931;
+ WFIFOL(fd, 2) = -1;
+ memcpy(WFIFOP(fd, 6), RFIFOP(fd, 2), 24);
+ if (strlen(ma.userid) > 23 || strlen(ma.passwd) > 23)
{
- login_log
- ("'ladmin': Attempt to create an invalid account (account or pass is too long, ip: %s)\n",
+ login_log("'ladmin': Attempt to create an invalid account (account or pass is too long, ip: %s)\n",
ip);
}
- else if (strlen (ma.userid) < 4 || strlen (ma.passwd) < 4)
+ else if (strlen(ma.userid) < 4 || strlen(ma.passwd) < 4)
{
- login_log
- ("'ladmin': Attempt to create an invalid account (account or pass is too short, ip: %s)\n",
+ login_log("'ladmin': Attempt to create an invalid account (account or pass is too short, ip: %s)\n",
ip);
}
else if (ma.sex != 'F' && ma.sex != 'M')
{
- login_log
- ("'ladmin': Attempt to create an invalid account (account: %s, invalid sex, ip: %s)\n",
+ login_log("'ladmin': Attempt to create an invalid account (account: %s, invalid sex, ip: %s)\n",
ma.userid, ip);
}
else if (account_id_count > END_ACCOUNT_NUM)
{
- login_log
- ("'ladmin': Attempt to create an account, but there is no more available id number (account: %s, sex: %c, ip: %s)\n",
+ login_log("'ladmin': Attempt to create an account, but there is no more available id number (account: %s, sex: %c, ip: %s)\n",
ma.userid, ma.sex, ip);
}
else
{
- remove_control_chars (ma.userid);
- remove_control_chars (ma.passwd);
+ remove_control_chars(ma.userid);
+ remove_control_chars(ma.passwd);
for (i = 0; i < auth_num; i++)
{
- if (strncmp (auth_dat[i].userid, ma.userid, 24) ==
+ if (strncmp(auth_dat[i].userid, ma.userid, 24) ==
0)
{
- login_log
- ("'ladmin': Attempt to create an already existing account (account: %s ip: %s)\n",
+ login_log("'ladmin': Attempt to create an already existing account (account: %s ip: %s)\n",
auth_dat[i].userid, ip);
break;
}
}
if (i == auth_num)
{
- int new_id;
+ int new_id;
char email[40];
- memcpy (email, RFIFOP (fd, 51), 40);
+ memcpy(email, RFIFOP(fd, 51), 40);
email[39] = '\0';
- remove_control_chars (email);
- new_id = mmo_auth_new (&ma, ma.sex, email);
- login_log
- ("'ladmin': Account creation (account: %s (id: %d), sex: %c, email: %s, ip: %s)\n",
+ remove_control_chars(email);
+ new_id = mmo_auth_new(&ma, ma.sex, email);
+ login_log("'ladmin': Account creation (account: %s (id: %d), sex: %c, email: %s, ip: %s)\n",
ma.userid, new_id,
ma.sex, auth_dat[i].email, ip);
- WFIFOL (fd, 2) = new_id;
+ WFIFOL(fd, 2) = new_id;
}
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 91);
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 91);
}
break;
case 0x7932: // Request for an account deletion
- if (RFIFOREST (fd) < 26)
+ if (RFIFOREST(fd) < 26)
return;
- WFIFOW (fd, 0) = 0x7933;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x7933;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- i = search_account_index (account_name);
+ remove_control_chars(account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
{
// Char-server is notified of deletion (for characters deletion).
unsigned char buf[65535];
- WBUFW (buf, 0) = 0x2730;
- WBUFL (buf, 2) = auth_dat[i].account_id;
- charif_sendallwos (-1, buf, 6);
+ WBUFW(buf, 0) = 0x2730;
+ WBUFL(buf, 2) = auth_dat[i].account_id;
+ charif_sendallwos(-1, buf, 6);
// send answer
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- WFIFOL (fd, 2) = auth_dat[i].account_id;
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
// save deleted account in log file
- login_log
- ("'ladmin': Account deletion (account: %s, id: %d, ip: %s) - saved in next line:\n",
+ login_log("'ladmin': Account deletion (account: %s, id: %d, ip: %s) - saved in next line:\n",
auth_dat[i].userid, auth_dat[i].account_id,
ip);
}
{
char buf[65535];
- mmo_auth_tostr (buf, &auth_dat[i]);
- login_log ("%s\n", buf);
+ mmo_auth_tostr(buf, &auth_dat[i]);
+ login_log("%s\n", buf);
}
// delete account
- memset (auth_dat[i].userid, '\0',
- sizeof (auth_dat[i].userid));
+ memset(auth_dat[i].userid, '\0',
+ sizeof(auth_dat[i].userid));
auth_dat[i].account_id = -1;
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': Attempt to delete an unknown account (account: %s, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': Attempt to delete an unknown account (account: %s, ip: %s)\n",
account_name, ip);
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 26);
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 26);
break;
case 0x7934: // Request to change a password
- if (RFIFOREST (fd) < 50)
+ if (RFIFOREST(fd) < 50)
return;
- WFIFOW (fd, 0) = 0x7935;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x7935;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- i = search_account_index (account_name);
+ remove_control_chars(account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- strcpy (auth_dat[i].pass, MD5_saltcrypt((char *)RFIFOP (fd, 26), make_salt()));
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ strcpy(auth_dat[i].pass, MD5_saltcrypt((char *)RFIFOP(fd, 26), make_salt()));
auth_dat[i].pass[39] = '\0';
- WFIFOL (fd, 2) = auth_dat[i].account_id;
- login_log
- ("'ladmin': Modification of a password (account: %s, new password: %s, ip: %s)\n",
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
+ login_log("'ladmin': Modification of a password (account: %s, new password: %s, ip: %s)\n",
auth_dat[i].userid, auth_dat[i].pass, ip);
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': Attempt to modify the password of an unknown account (account: %s, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': Attempt to modify the password of an unknown account (account: %s, ip: %s)\n",
account_name, ip);
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 50);
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 50);
break;
case 0x7936: // Request to modify a state
- if (RFIFOREST (fd) < 50)
+ if (RFIFOREST(fd) < 50)
return;
{
char error_message[20];
- int statut;
- WFIFOW (fd, 0) = 0x7937;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ int statut;
+ WFIFOW(fd, 0) = 0x7937;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- statut = RFIFOL (fd, 26);
- memcpy (error_message, RFIFOP (fd, 30), 20);
+ remove_control_chars(account_name);
+ statut = RFIFOL(fd, 26);
+ memcpy(error_message, RFIFOP(fd, 30), 20);
error_message[19] = '\0';
- remove_control_chars (error_message);
+ remove_control_chars(error_message);
if (statut != 7 || error_message[0] == '\0')
{ // 7: // 6 = Your are Prohibited to log in until %s
- strcpy (error_message, "-");
+ strcpy(error_message, "-");
}
- i = search_account_index (account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- WFIFOL (fd, 2) = auth_dat[i].account_id;
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
if (auth_dat[i].state == statut
- && strcmp (auth_dat[i].error_message,
+ && strcmp(auth_dat[i].error_message,
error_message) == 0)
- login_log
- ("'ladmin': Modification of a state, but the state of the account is already the good state (account: %s, received state: %d, ip: %s)\n",
+ login_log("'ladmin': Modification of a state, but the state of the account is already the good state (account: %s, received state: %d, ip: %s)\n",
account_name, statut, ip);
else
{
if (statut == 7)
- login_log
- ("'ladmin': Modification of a state (account: %s, new state: %d - prohibited to login until '%s', ip: %s)\n",
+ login_log("'ladmin': Modification of a state (account: %s, new state: %d - prohibited to login until '%s', ip: %s)\n",
auth_dat[i].userid, statut,
error_message, ip);
else
- login_log
- ("'ladmin': Modification of a state (account: %s, new state: %d, ip: %s)\n",
+ login_log("'ladmin': Modification of a state (account: %s, new state: %d, ip: %s)\n",
auth_dat[i].userid, statut, ip);
if (auth_dat[i].state == 0)
{
unsigned char buf[16];
- WBUFW (buf, 0) = 0x2731;
- WBUFL (buf, 2) = auth_dat[i].account_id;
- WBUFB (buf, 6) = 0; // 0: change of statut, 1: ban
- WBUFL (buf, 7) = statut; // status or final date of a banishment
- charif_sendallwos (-1, buf, 11);
+ WBUFW(buf, 0) = 0x2731;
+ WBUFL(buf, 2) = auth_dat[i].account_id;
+ WBUFB(buf, 6) = 0; // 0: change of statut, 1: ban
+ WBUFL(buf, 7) = statut; // status or final date of a banishment
+ charif_sendallwos(-1, buf, 11);
for (j = 0; j < AUTH_FIFO_SIZE; j++)
if (auth_fifo[j].account_id ==
auth_dat[i].account_id)
auth_fifo[j].login_id1++; // to avoid reconnection error when come back from map-server (char-server will ask again the authentification)
}
auth_dat[i].state = statut;
- memcpy (auth_dat[i].error_message, error_message,
+ memcpy(auth_dat[i].error_message, error_message,
20);
}
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': Attempt to modify the state of an unknown account (account: %s, received state: %d, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': Attempt to modify the state of an unknown account (account: %s, received state: %d, ip: %s)\n",
account_name, statut, ip);
}
- WFIFOL (fd, 30) = statut;
+ WFIFOL(fd, 30) = statut;
}
- WFIFOSET (fd, 34);
- RFIFOSKIP (fd, 50);
+ WFIFOSET(fd, 34);
+ RFIFOSKIP(fd, 50);
break;
case 0x7938: // Request for servers list and # of online players
- login_log ("'ladmin': Sending of servers list (ip: %s)\n", ip);
+ login_log("'ladmin': Sending of servers list (ip: %s)\n", ip);
server_num = 0;
for (i = 0; i < MAX_SERVERS; i++)
{
if (server_fd[i] >= 0)
{
- WFIFOL (fd, 4 + server_num * 32) = server[i].ip;
- WFIFOW (fd, 4 + server_num * 32 + 4) = server[i].port;
- memcpy (WFIFOP (fd, 4 + server_num * 32 + 6),
+ WFIFOL(fd, 4 + server_num * 32) = server[i].ip;
+ WFIFOW(fd, 4 + server_num * 32 + 4) = server[i].port;
+ memcpy(WFIFOP(fd, 4 + server_num * 32 + 6),
server[i].name, 20);
- WFIFOW (fd, 4 + server_num * 32 + 26) =
+ WFIFOW(fd, 4 + server_num * 32 + 26) =
server[i].users;
- WFIFOW (fd, 4 + server_num * 32 + 28) =
+ WFIFOW(fd, 4 + server_num * 32 + 28) =
server[i].maintenance;
- WFIFOW (fd, 4 + server_num * 32 + 30) = server[i].is_new;
+ WFIFOW(fd, 4 + server_num * 32 + 30) = server[i].is_new;
server_num++;
}
}
- WFIFOW (fd, 0) = 0x7939;
- WFIFOW (fd, 2) = 4 + 32 * server_num;
- WFIFOSET (fd, 4 + 32 * server_num);
- RFIFOSKIP (fd, 2);
+ WFIFOW(fd, 0) = 0x7939;
+ WFIFOW(fd, 2) = 4 + 32 * server_num;
+ WFIFOSET(fd, 4 + 32 * server_num);
+ RFIFOSKIP(fd, 2);
break;
case 0x793a: // Request to password check
- if (RFIFOREST (fd) < 50)
+ if (RFIFOREST(fd) < 50)
return;
- WFIFOW (fd, 0) = 0x793b;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x793b;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- i = search_account_index (account_name);
+ remove_control_chars(account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- if ( pass_ok((char *)RFIFOP (fd, 26), auth_dat[i].pass) )
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ if ( pass_ok((char *)RFIFOP(fd, 26), auth_dat[i].pass) )
{
- WFIFOL (fd, 2) = auth_dat[i].account_id;
- login_log
- ("'ladmin': Check of password OK (account: %s, password: %s, ip: %s)\n",
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
+ login_log("'ladmin': Check of password OK (account: %s, password: %s, ip: %s)\n",
auth_dat[i].userid, auth_dat[i].pass,
ip);
}
else
{
char pass[24];
- memcpy (pass, RFIFOP (fd, 26), 24);
+ memcpy(pass, RFIFOP(fd, 26), 24);
pass[23] = '\0';
- remove_control_chars (pass);
- login_log
- ("'ladmin': Failure of password check (account: %s, proposed pass: %s, ip: %s)\n",
+ remove_control_chars(pass);
+ login_log("'ladmin': Failure of password check (account: %s, proposed pass: %s, ip: %s)\n",
auth_dat[i].userid, pass, ip);
}
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': Attempt to check the password of an unknown account (account: %s, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': Attempt to check the password of an unknown account (account: %s, ip: %s)\n",
account_name, ip);
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 50);
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 50);
break;
case 0x793c: // Request to modify sex
- if (RFIFOREST (fd) < 27)
+ if (RFIFOREST(fd) < 27)
return;
- WFIFOW (fd, 0) = 0x793d;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x793d;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- memcpy (WFIFOP (fd, 6), account_name, 24);
+ remove_control_chars(account_name);
+ memcpy(WFIFOP(fd, 6), account_name, 24);
{
char sex;
- sex = RFIFOB (fd, 26);
+ sex = RFIFOB(fd, 26);
if (sex != 'F' && sex != 'M')
{
if (sex > 31)
- login_log
- ("'ladmin': Attempt to give an invalid sex (account: %s, received sex: %c, ip: %s)\n",
+ login_log("'ladmin': Attempt to give an invalid sex (account: %s, received sex: %c, ip: %s)\n",
account_name, sex, ip);
else
- login_log
- ("'ladmin': Attempt to give an invalid sex (account: %s, received sex: 'control char', ip: %s)\n",
+ login_log("'ladmin': Attempt to give an invalid sex (account: %s, received sex: 'control char', ip: %s)\n",
account_name, ip);
}
else
{
- i = search_account_index (account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
if (auth_dat[i].sex !=
((sex == 'S' || sex == 's') ? 2 : (sex == 'M'
|| sex ==
'm')))
{
unsigned char buf[16];
- WFIFOL (fd, 2) = auth_dat[i].account_id;
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
for (j = 0; j < AUTH_FIFO_SIZE; j++)
if (auth_fifo[j].account_id ==
auth_dat[i].account_id)
@@ -2608,117 +2497,111 @@ void parse_admin (int fd)
|| sex ==
's') ? 2 : (sex == 'M'
|| sex == 'm');
- login_log
- ("'ladmin': Modification of a sex (account: %s, new sex: %c, ip: %s)\n",
+ login_log("'ladmin': Modification of a sex (account: %s, new sex: %c, ip: %s)\n",
auth_dat[i].userid, sex, ip);
// send to all char-server the change
- WBUFW (buf, 0) = 0x2723;
- WBUFL (buf, 2) = auth_dat[i].account_id;
- WBUFB (buf, 6) = auth_dat[i].sex;
- charif_sendallwos (-1, buf, 7);
+ WBUFW(buf, 0) = 0x2723;
+ WBUFL(buf, 2) = auth_dat[i].account_id;
+ WBUFB(buf, 6) = auth_dat[i].sex;
+ charif_sendallwos(-1, buf, 7);
}
else
{
- login_log
- ("'ladmin': Modification of a sex, but the sex is already the good sex (account: %s, sex: %c, ip: %s)\n",
+ login_log("'ladmin': Modification of a sex, but the sex is already the good sex (account: %s, sex: %c, ip: %s)\n",
auth_dat[i].userid, sex, ip);
}
}
else
{
- login_log
- ("'ladmin': Attempt to modify the sex of an unknown account (account: %s, received sex: %c, ip: %s)\n",
+ login_log("'ladmin': Attempt to modify the sex of an unknown account (account: %s, received sex: %c, ip: %s)\n",
account_name, sex, ip);
}
}
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 27);
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 27);
break;
case 0x793e: // Request to modify GM level
- if (RFIFOREST (fd) < 27)
+ if (RFIFOREST(fd) < 27)
return;
- WFIFOW (fd, 0) = 0x793f;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x793f;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- memcpy (WFIFOP (fd, 6), account_name, 24);
+ remove_control_chars(account_name);
+ memcpy(WFIFOP(fd, 6), account_name, 24);
{
char new_gm_level;
- new_gm_level = RFIFOB (fd, 26);
+ new_gm_level = RFIFOB(fd, 26);
if (new_gm_level < 0 || new_gm_level > 99)
{
- login_log
- ("'ladmin': Attempt to give an invalid GM level (account: %s, received GM level: %d, ip: %s)\n",
+ login_log("'ladmin': Attempt to give an invalid GM level (account: %s, received GM level: %d, ip: %s)\n",
account_name, (int) new_gm_level, ip);
}
else
{
- i = search_account_index (account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- int acc = auth_dat[i].account_id;
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- if (isGM (acc) != new_gm_level)
+ int acc = auth_dat[i].account_id;
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ if (isGM(acc) != new_gm_level)
{
// modification of the file
FILE *fp, *fp2;
- int lock;
+ int lock;
char line[512];
- int GM_account, GM_level;
- int modify_flag;
+ int GM_account, GM_level;
+ int modify_flag;
char tmpstr[24];
struct timeval tv;
if ((fp2 =
- lock_fopen (GM_account_filename,
+ lock_fopen(GM_account_filename,
&lock)) != NULL)
{
if ((fp =
- fopen_ (GM_account_filename,
+ fopen_(GM_account_filename,
"r")) != NULL)
{
- gettimeofday (&tv, NULL);
- strftime (tmpstr, 23, date_format,
- gmtime (&(tv.tv_sec)));
+ gettimeofday(&tv, NULL);
+ strftime(tmpstr, 23, date_format,
+ gmtime(&(tv.tv_sec)));
modify_flag = 0;
// read/write GM file
- while (fgets
- (line, sizeof (line) - 1, fp))
+ while (fgets(line, sizeof(line) - 1, fp))
{
while (line[0] != '\0'
- && (line[strlen (line) - 1]
+ && (line[strlen(line) - 1]
== '\n'
- || line[strlen (line) -
+ || line[strlen(line) -
1] == '\r'))
- line[strlen (line) - 1] =
+ line[strlen(line) - 1] =
'\0';
if ((line[0] == '/'
&& line[1] == '/')
|| line[0] == '\0')
- fprintf (fp2, "%s\n",
+ fprintf(fp2, "%s\n",
line);
else
{
- if (sscanf
- (line, "%d %d",
+ if (sscanf(line, "%d %d",
&GM_account,
&GM_level) != 2
- && sscanf (line, "%d: %d",
+ && sscanf(line, "%d: %d",
&GM_account,
&GM_level) !=
2)
- fprintf (fp2,
+ fprintf(fp2,
"%s\n",
line);
else if (GM_account != acc)
- fprintf (fp2,
+ fprintf(fp2,
"%s\n",
line);
else if (new_gm_level < 1)
{
- fprintf (fp2,
+ fprintf(fp2,
"// %s: 'ladmin' GM level removed on account %d '%s' (previous level: %d)\n//%d %d\n",
tmpstr,
acc,
@@ -2730,7 +2613,7 @@ void parse_admin (int fd)
}
else
{
- fprintf (fp2,
+ fprintf(fp2,
"// %s: 'ladmin' GM level on account %d '%s' (previous level: %d)\n%d %d\n",
tmpstr,
acc,
@@ -2743,265 +2626,248 @@ void parse_admin (int fd)
}
}
if (modify_flag == 0)
- fprintf (fp2,
+ fprintf(fp2,
"// %s: 'ladmin' GM level on account %d '%s' (previous level: 0)\n%d %d\n",
tmpstr, acc,
auth_dat[i].userid, acc,
new_gm_level);
- fclose_ (fp);
+ fclose_(fp);
}
else
{
- login_log
- ("'ladmin': Attempt to modify of a GM level - impossible to read GM accounts file (account: %s (%d), received GM level: %d, ip: %s)\n",
+ login_log("'ladmin': Attempt to modify of a GM level - impossible to read GM accounts file (account: %s (%d), received GM level: %d, ip: %s)\n",
auth_dat[i].userid, acc,
(int) new_gm_level, ip);
}
lock_fclose(fp2, GM_account_filename, &lock);
- WFIFOL (fd, 2) = acc;
- login_log
- ("'ladmin': Modification of a GM level (account: %s (%d), new GM level: %d, ip: %s)\n",
+ WFIFOL(fd, 2) = acc;
+ login_log("'ladmin': Modification of a GM level (account: %s (%d), new GM level: %d, ip: %s)\n",
auth_dat[i].userid, acc,
(int) new_gm_level, ip);
// read and send new GM informations
- read_gm_account ();
- send_GM_accounts ();
+ read_gm_account();
+ send_GM_accounts();
}
else
{
- login_log
- ("'ladmin': Attempt to modify of a GM level - impossible to write GM accounts file (account: %s (%d), received GM level: %d, ip: %s)\n",
+ login_log("'ladmin': Attempt to modify of a GM level - impossible to write GM accounts file (account: %s (%d), received GM level: %d, ip: %s)\n",
auth_dat[i].userid, acc,
(int) new_gm_level, ip);
}
}
else
{
- login_log
- ("'ladmin': Attempt to modify of a GM level, but the GM level is already the good GM level (account: %s (%d), GM level: %d, ip: %s)\n",
+ login_log("'ladmin': Attempt to modify of a GM level, but the GM level is already the good GM level (account: %s (%d), GM level: %d, ip: %s)\n",
auth_dat[i].userid, acc,
(int) new_gm_level, ip);
}
}
else
{
- login_log
- ("'ladmin': Attempt to modify the GM level of an unknown account (account: %s, received GM level: %d, ip: %s)\n",
+ login_log("'ladmin': Attempt to modify the GM level of an unknown account (account: %s, received GM level: %d, ip: %s)\n",
account_name, (int) new_gm_level,
ip);
}
}
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 27);
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 27);
break;
case 0x7940: // Request to modify e-mail
- if (RFIFOREST (fd) < 66)
+ if (RFIFOREST(fd) < 66)
return;
- WFIFOW (fd, 0) = 0x7941;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x7941;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- memcpy (WFIFOP (fd, 6), account_name, 24);
+ remove_control_chars(account_name);
+ memcpy(WFIFOP(fd, 6), account_name, 24);
{
char email[40];
- memcpy (email, RFIFOP (fd, 26), 40);
- if (e_mail_check (email) == 0)
+ memcpy(email, RFIFOP(fd, 26), 40);
+ if (e_mail_check(email) == 0)
{
- login_log
- ("'ladmin': Attempt to give an invalid e-mail (account: %s, ip: %s)\n",
+ login_log("'ladmin': Attempt to give an invalid e-mail (account: %s, ip: %s)\n",
account_name, ip);
}
else
{
- remove_control_chars (email);
- i = search_account_index (account_name);
+ remove_control_chars(email);
+ i = search_account_index(account_name);
if (i != -1)
{
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- memcpy (auth_dat[i].email, email, 40);
- WFIFOL (fd, 2) = auth_dat[i].account_id;
- login_log
- ("'ladmin': Modification of an email (account: %s, new e-mail: %s, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ memcpy(auth_dat[i].email, email, 40);
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
+ login_log("'ladmin': Modification of an email (account: %s, new e-mail: %s, ip: %s)\n",
auth_dat[i].userid, email, ip);
}
else
{
- login_log
- ("'ladmin': Attempt to modify the e-mail of an unknown account (account: %s, received e-mail: %s, ip: %s)\n",
+ login_log("'ladmin': Attempt to modify the e-mail of an unknown account (account: %s, received e-mail: %s, ip: %s)\n",
account_name, email, ip);
}
}
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 66);
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 66);
break;
case 0x7942: // Request to modify memo field
- if (RFIFOREST (fd) < 28
- || RFIFOREST (fd) < (28 + RFIFOW (fd, 26)))
+ if (RFIFOREST(fd) < 28
+ || RFIFOREST(fd) < (28 + RFIFOW(fd, 26)))
return;
- WFIFOW (fd, 0) = 0x7943;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x7943;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- i = search_account_index (account_name);
+ remove_control_chars(account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- int size_of_memo = sizeof (auth_dat[i].memo);
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- memset (auth_dat[i].memo, '\0', size_of_memo);
- if (RFIFOW (fd, 26) == 0)
+ int size_of_memo = sizeof(auth_dat[i].memo);
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ memset(auth_dat[i].memo, '\0', size_of_memo);
+ if (RFIFOW(fd, 26) == 0)
{
- strncpy (auth_dat[i].memo, "!", size_of_memo);
+ strncpy(auth_dat[i].memo, "!", size_of_memo);
}
- else if (RFIFOW (fd, 26) > size_of_memo - 1)
+ else if (RFIFOW(fd, 26) > size_of_memo - 1)
{
- memcpy (auth_dat[i].memo, RFIFOP (fd, 28),
+ memcpy(auth_dat[i].memo, RFIFOP(fd, 28),
size_of_memo - 1);
}
else
{
- memcpy (auth_dat[i].memo, RFIFOP (fd, 28),
- RFIFOW (fd, 26));
+ memcpy(auth_dat[i].memo, RFIFOP(fd, 28),
+ RFIFOW(fd, 26));
}
auth_dat[i].memo[size_of_memo - 1] = '\0';
- remove_control_chars (auth_dat[i].memo);
- WFIFOL (fd, 2) = auth_dat[i].account_id;
- login_log
- ("'ladmin': Modification of a memo field (account: %s, new memo: %s, ip: %s)\n",
+ remove_control_chars(auth_dat[i].memo);
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
+ login_log("'ladmin': Modification of a memo field (account: %s, new memo: %s, ip: %s)\n",
auth_dat[i].userid, auth_dat[i].memo, ip);
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': Attempt to modify the memo field of an unknown account (account: %s, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': Attempt to modify the memo field of an unknown account (account: %s, ip: %s)\n",
account_name, ip);
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 28 + RFIFOW (fd, 26));
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 28 + RFIFOW(fd, 26));
break;
case 0x7944: // Request to found an account id
- if (RFIFOREST (fd) < 26)
+ if (RFIFOREST(fd) < 26)
return;
- WFIFOW (fd, 0) = 0x7945;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x7945;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- i = search_account_index (account_name);
+ remove_control_chars(account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- WFIFOL (fd, 2) = auth_dat[i].account_id;
- login_log
- ("'ladmin': Request (by the name) of an account id (account: %s, id: %d, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
+ login_log("'ladmin': Request (by the name) of an account id (account: %s, id: %d, ip: %s)\n",
auth_dat[i].userid, auth_dat[i].account_id,
ip);
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': ID request (by the name) of an unknown account (account: %s, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': ID request (by the name) of an unknown account (account: %s, ip: %s)\n",
account_name, ip);
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 26);
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 26);
break;
case 0x7946: // Request to found an account name
- if (RFIFOREST (fd) < 6)
+ if (RFIFOREST(fd) < 6)
return;
- WFIFOW (fd, 0) = 0x7947;
- WFIFOL (fd, 2) = RFIFOL (fd, 2);
- memset (WFIFOP (fd, 6), '\0', 24);
+ WFIFOW(fd, 0) = 0x7947;
+ WFIFOL(fd, 2) = RFIFOL(fd, 2);
+ memset(WFIFOP(fd, 6), '\0', 24);
for (i = 0; i < auth_num; i++)
{
- if (auth_dat[i].account_id == RFIFOL (fd, 2))
+ if (auth_dat[i].account_id == RFIFOL(fd, 2))
{
- strncpy ((char *)WFIFOP (fd, 6), auth_dat[i].userid, 24);
- login_log
- ("'ladmin': Request (by id) of an account name (account: %s, id: %d, ip: %s)\n",
- auth_dat[i].userid, RFIFOL (fd, 2), ip);
+ strncpy((char *)WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ login_log("'ladmin': Request (by id) of an account name (account: %s, id: %d, ip: %s)\n",
+ auth_dat[i].userid, RFIFOL(fd, 2), ip);
break;
}
}
if (i == auth_num)
{
- login_log
- ("'ladmin': Name request (by id) of an unknown account (id: %d, ip: %s)\n",
- RFIFOL (fd, 2), ip);
- strncpy ((char *)WFIFOP (fd, 6), "", 24);
+ login_log("'ladmin': Name request (by id) of an unknown account (id: %d, ip: %s)\n",
+ RFIFOL(fd, 2), ip);
+ strncpy((char *)WFIFOP(fd, 6), "", 24);
}
- WFIFOSET (fd, 30);
- RFIFOSKIP (fd, 6);
+ WFIFOSET(fd, 30);
+ RFIFOSKIP(fd, 6);
break;
case 0x7948: // Request to change the validity limit (timestamp) (absolute value)
- if (RFIFOREST (fd) < 30)
+ if (RFIFOREST(fd) < 30)
return;
{
time_t timestamp;
char tmpstr[2048];
- WFIFOW (fd, 0) = 0x7949;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x7949;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- timestamp = (time_t) RFIFOL (fd, 26);
- strftime (tmpstr, 24, date_format, gmtime (&timestamp));
- i = search_account_index (account_name);
+ remove_control_chars(account_name);
+ timestamp = (time_t) RFIFOL(fd, 26);
+ strftime(tmpstr, 24, date_format, gmtime(&timestamp));
+ i = search_account_index(account_name);
if (i != -1)
{
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- login_log
- ("'ladmin': Change of a validity limit (account: %s, new validity: %ld (%s), ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ login_log("'ladmin': Change of a validity limit (account: %s, new validity: %ld (%s), ip: %s)\n",
auth_dat[i].userid, timestamp,
(timestamp == 0 ? "unlimited" : tmpstr), ip);
auth_dat[i].connect_until_time = timestamp;
- WFIFOL (fd, 2) = auth_dat[i].account_id;
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': Attempt to change the validity limit of an unknown account (account: %s, received validity: %ld (%s), ip: %s)\n", account_name, timestamp,
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': Attempt to change the validity limit of an unknown account (account: %s, received validity: %ld (%s), ip: %s)\n", account_name, timestamp,
(timestamp == 0 ? "unlimited" : tmpstr), ip);
}
- WFIFOL (fd, 30) = timestamp;
+ WFIFOL(fd, 30) = timestamp;
}
- WFIFOSET (fd, 34);
- RFIFOSKIP (fd, 30);
+ WFIFOSET(fd, 34);
+ RFIFOSKIP(fd, 30);
break;
case 0x794a: // Request to change the final date of a banishment (timestamp) (absolute value)
- if (RFIFOREST (fd) < 30)
+ if (RFIFOREST(fd) < 30)
return;
{
time_t timestamp;
char tmpstr[2048];
- WFIFOW (fd, 0) = 0x794b;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x794b;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- timestamp = (time_t) RFIFOL (fd, 26);
- if (timestamp <= time (NULL))
+ remove_control_chars(account_name);
+ timestamp = (time_t) RFIFOL(fd, 26);
+ if (timestamp <= time(NULL))
timestamp = 0;
- strftime (tmpstr, 24, date_format, gmtime (&timestamp));
- i = search_account_index (account_name);
+ strftime(tmpstr, 24, date_format, gmtime(&timestamp));
+ i = search_account_index(account_name);
if (i != -1)
{
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
- WFIFOL (fd, 2) = auth_dat[i].account_id;
- login_log
- ("'ladmin': Change of the final date of a banishment (account: %s, new final date of banishment: %ld (%s), ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
+ login_log("'ladmin': Change of the final date of a banishment (account: %s, new final date of banishment: %ld (%s), ip: %s)\n",
auth_dat[i].userid, timestamp,
(timestamp == 0 ? "no banishment" : tmpstr), ip);
if (auth_dat[i].ban_until_time != timestamp)
@@ -3009,11 +2875,11 @@ void parse_admin (int fd)
if (timestamp != 0)
{
unsigned char buf[16];
- WBUFW (buf, 0) = 0x2731;
- WBUFL (buf, 2) = auth_dat[i].account_id;
- WBUFB (buf, 6) = 1; // 0: change of statut, 1: ban
- WBUFL (buf, 7) = timestamp; // status or final date of a banishment
- charif_sendallwos (-1, buf, 11);
+ WBUFW(buf, 0) = 0x2731;
+ WBUFL(buf, 2) = auth_dat[i].account_id;
+ WBUFB(buf, 6) = 1; // 0: change of statut, 1: ban
+ WBUFL(buf, 7) = timestamp; // status or final date of a banishment
+ charif_sendallwos(-1, buf, 11);
for (j = 0; j < AUTH_FIFO_SIZE; j++)
if (auth_fifo[j].account_id ==
auth_dat[i].account_id)
@@ -3024,68 +2890,66 @@ void parse_admin (int fd)
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': Attempt to change the final date of a banishment of an unknown account (account: %s, received final date of banishment: %ld (%s), ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': Attempt to change the final date of a banishment of an unknown account (account: %s, received final date of banishment: %ld (%s), ip: %s)\n",
account_name, timestamp,
(timestamp == 0 ? "no banishment" : tmpstr), ip);
}
- WFIFOL (fd, 30) = timestamp;
+ WFIFOL(fd, 30) = timestamp;
}
- WFIFOSET (fd, 34);
- RFIFOSKIP (fd, 30);
+ WFIFOSET(fd, 34);
+ RFIFOSKIP(fd, 30);
break;
case 0x794c: // Request to change the final date of a banishment (timestamp) (relative change)
- if (RFIFOREST (fd) < 38)
+ if (RFIFOREST(fd) < 38)
return;
{
time_t timestamp;
struct tm *tmtime;
char tmpstr[2048];
- WFIFOW (fd, 0) = 0x794d;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x794d;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- i = search_account_index (account_name);
+ remove_control_chars(account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- WFIFOL (fd, 2) = auth_dat[i].account_id;
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
if (auth_dat[i].ban_until_time == 0
- || auth_dat[i].ban_until_time < time (NULL))
- timestamp = time (NULL);
+ || auth_dat[i].ban_until_time < time(NULL))
+ timestamp = time(NULL);
else
timestamp = auth_dat[i].ban_until_time;
- tmtime = gmtime (&timestamp);
+ tmtime = gmtime(&timestamp);
tmtime->tm_year =
- tmtime->tm_year + (short) RFIFOW (fd, 26);
+ tmtime->tm_year + (short) RFIFOW(fd, 26);
tmtime->tm_mon =
- tmtime->tm_mon + (short) RFIFOW (fd, 28);
+ tmtime->tm_mon + (short) RFIFOW(fd, 28);
tmtime->tm_mday =
- tmtime->tm_mday + (short) RFIFOW (fd, 30);
+ tmtime->tm_mday + (short) RFIFOW(fd, 30);
tmtime->tm_hour =
- tmtime->tm_hour + (short) RFIFOW (fd, 32);
+ tmtime->tm_hour + (short) RFIFOW(fd, 32);
tmtime->tm_min =
- tmtime->tm_min + (short) RFIFOW (fd, 34);
+ tmtime->tm_min + (short) RFIFOW(fd, 34);
tmtime->tm_sec =
- tmtime->tm_sec + (short) RFIFOW (fd, 36);
- timestamp = mktime (tmtime);
+ tmtime->tm_sec + (short) RFIFOW(fd, 36);
+ timestamp = mktime(tmtime);
if (timestamp != -1)
{
- if (timestamp <= time (NULL))
+ if (timestamp <= time(NULL))
timestamp = 0;
- strftime (tmpstr, 24, date_format,
- gmtime (&timestamp));
- login_log
- ("'ladmin': Adjustment of a final date of a banishment (account: %s, (%+d y %+d m %+d d %+d h %+d mn %+d s) -> new validity: %ld (%s), ip: %s)\n",
+ strftime(tmpstr, 24, date_format,
+ gmtime(&timestamp));
+ login_log("'ladmin': Adjustment of a final date of a banishment (account: %s, (%+d y %+d m %+d d %+d h %+d mn %+d s) -> new validity: %ld (%s), ip: %s)\n",
auth_dat[i].userid,
- (short) RFIFOW (fd, 26), (short) RFIFOW (fd,
+ (short) RFIFOW(fd, 26), (short) RFIFOW(fd,
28),
- (short) RFIFOW (fd, 30), (short) RFIFOW (fd,
+ (short) RFIFOW(fd, 30), (short) RFIFOW(fd,
32),
- (short) RFIFOW (fd, 34), (short) RFIFOW (fd,
+ (short) RFIFOW(fd, 34), (short) RFIFOW(fd,
36),
timestamp,
(timestamp == 0 ? "no banishment" : tmpstr),
@@ -3095,11 +2959,11 @@ void parse_admin (int fd)
if (timestamp != 0)
{
unsigned char buf[16];
- WBUFW (buf, 0) = 0x2731;
- WBUFL (buf, 2) = auth_dat[i].account_id;
- WBUFB (buf, 6) = 1; // 0: change of statut, 1: ban
- WBUFL (buf, 7) = timestamp; // status or final date of a banishment
- charif_sendallwos (-1, buf, 11);
+ WBUFW(buf, 0) = 0x2731;
+ WBUFL(buf, 2) = auth_dat[i].account_id;
+ WBUFB(buf, 6) = 1; // 0: change of statut, 1: ban
+ WBUFL(buf, 7) = timestamp; // status or final date of a banishment
+ charif_sendallwos(-1, buf, 11);
for (j = 0; j < AUTH_FIFO_SIZE; j++)
if (auth_fifo[j].account_id ==
auth_dat[i].account_id)
@@ -3110,48 +2974,45 @@ void parse_admin (int fd)
}
else
{
- strftime (tmpstr, 24, date_format,
- gmtime (&auth_dat[i].ban_until_time));
- login_log
- ("'ladmin': Impossible to adjust the final date of a banishment (account: %s, %ld (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> ???, ip: %s)\n",
+ strftime(tmpstr, 24, date_format,
+ gmtime(&auth_dat[i].ban_until_time));
+ login_log("'ladmin': Impossible to adjust the final date of a banishment (account: %s, %ld (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> ???, ip: %s)\n",
auth_dat[i].userid,
auth_dat[i].ban_until_time,
(auth_dat[i].ban_until_time ==
0 ? "no banishment" : tmpstr),
- (short) RFIFOW (fd, 26), (short) RFIFOW (fd,
+ (short) RFIFOW(fd, 26), (short) RFIFOW(fd,
28),
- (short) RFIFOW (fd, 30), (short) RFIFOW (fd,
+ (short) RFIFOW(fd, 30), (short) RFIFOW(fd,
32),
- (short) RFIFOW (fd, 34), (short) RFIFOW (fd,
+ (short) RFIFOW(fd, 34), (short) RFIFOW(fd,
36),
ip);
}
- WFIFOL (fd, 30) =
+ WFIFOL(fd, 30) =
(unsigned long) auth_dat[i].ban_until_time;
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': Attempt to adjust the final date of a banishment of an unknown account (account: %s, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': Attempt to adjust the final date of a banishment of an unknown account (account: %s, ip: %s)\n",
account_name, ip);
- WFIFOL (fd, 30) = 0;
+ WFIFOL(fd, 30) = 0;
}
}
- WFIFOSET (fd, 34);
- RFIFOSKIP (fd, 38);
+ WFIFOSET(fd, 34);
+ RFIFOSKIP(fd, 38);
break;
case 0x794e: // Request to send a broadcast message
- if (RFIFOREST (fd) < 8
- || RFIFOREST (fd) < (8 + RFIFOL (fd, 4)))
+ if (RFIFOREST(fd) < 8
+ || RFIFOREST(fd) < (8 + RFIFOL(fd, 4)))
return;
- WFIFOW (fd, 0) = 0x794f;
- WFIFOW (fd, 2) = -1;
- if (RFIFOL (fd, 4) < 1)
+ WFIFOW(fd, 0) = 0x794f;
+ WFIFOW(fd, 2) = -1;
+ if (RFIFOL(fd, 4) < 1)
{
- login_log
- ("'ladmin': Receiving a message for broadcast, but message is void (ip: %s)\n",
+ login_log("'ladmin': Receiving a message for broadcast, but message is void (ip: %s)\n",
ip);
}
else
@@ -3162,250 +3023,238 @@ void parse_admin (int fd)
break;
if (i == MAX_SERVERS)
{
- login_log
- ("'ladmin': Receiving a message for broadcast, but no char-server is online (ip: %s)\n",
+ login_log("'ladmin': Receiving a message for broadcast, but no char-server is online (ip: %s)\n",
ip);
}
else
{
uint8_t buf[32000];
char message[32000];
- WFIFOW (fd, 2) = 0;
- memset (message, '\0', sizeof (message));
- memcpy (message, RFIFOP (fd, 8), RFIFOL (fd, 4));
- message[sizeof (message) - 1] = '\0';
- remove_control_chars (message);
- if (RFIFOW (fd, 2) == 0)
- login_log
- ("'ladmin': Receiving a message for broadcast (message (in yellow): %s, ip: %s)\n",
+ WFIFOW(fd, 2) = 0;
+ memset(message, '\0', sizeof(message));
+ memcpy(message, RFIFOP(fd, 8), RFIFOL(fd, 4));
+ message[sizeof(message) - 1] = '\0';
+ remove_control_chars(message);
+ if (RFIFOW(fd, 2) == 0)
+ login_log("'ladmin': Receiving a message for broadcast (message (in yellow): %s, ip: %s)\n",
message, ip);
else
- login_log
- ("'ladmin': Receiving a message for broadcast (message (in blue): %s, ip: %s)\n",
+ login_log("'ladmin': Receiving a message for broadcast (message (in blue): %s, ip: %s)\n",
message, ip);
// send same message to all char-servers (no answer)
- memcpy (WBUFP (buf, 0), RFIFOP (fd, 0),
- 8 + RFIFOL (fd, 4));
- WBUFW (buf, 0) = 0x2726;
- charif_sendallwos (-1, buf, 8 + RFIFOL (fd, 4));
+ memcpy(WBUFP(buf, 0), RFIFOP(fd, 0),
+ 8 + RFIFOL(fd, 4));
+ WBUFW(buf, 0) = 0x2726;
+ charif_sendallwos(-1, buf, 8 + RFIFOL(fd, 4));
}
}
- WFIFOSET (fd, 4);
- RFIFOSKIP (fd, 8 + RFIFOL (fd, 4));
+ WFIFOSET(fd, 4);
+ RFIFOSKIP(fd, 8 + RFIFOL(fd, 4));
break;
case 0x7950: // Request to change the validity limite (timestamp) (relative change)
- if (RFIFOREST (fd) < 38)
+ if (RFIFOREST(fd) < 38)
return;
{
time_t timestamp;
struct tm *tmtime;
char tmpstr[2048];
char tmpstr2[2048];
- WFIFOW (fd, 0) = 0x7951;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x7951;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- i = search_account_index (account_name);
+ remove_control_chars(account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- WFIFOL (fd, 2) = auth_dat[i].account_id;
- memcpy (WFIFOP (fd, 6), auth_dat[i].userid, 24);
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
+ memcpy(WFIFOP(fd, 6), auth_dat[i].userid, 24);
timestamp = auth_dat[i].connect_until_time;
if (add_to_unlimited_account == 0 && timestamp == 0)
{
- login_log
- ("'ladmin': Attempt to adjust the validity limit of an unlimited account (account: %s, ip: %s)\n",
+ login_log("'ladmin': Attempt to adjust the validity limit of an unlimited account (account: %s, ip: %s)\n",
auth_dat[i].userid, ip);
- WFIFOL (fd, 30) = 0;
+ WFIFOL(fd, 30) = 0;
}
else
{
- if (timestamp == 0 || timestamp < time (NULL))
- timestamp = time (NULL);
- tmtime = gmtime (&timestamp);
+ if (timestamp == 0 || timestamp < time(NULL))
+ timestamp = time(NULL);
+ tmtime = gmtime(&timestamp);
tmtime->tm_year =
- tmtime->tm_year + (short) RFIFOW (fd, 26);
+ tmtime->tm_year + (short) RFIFOW(fd, 26);
tmtime->tm_mon =
- tmtime->tm_mon + (short) RFIFOW (fd, 28);
+ tmtime->tm_mon + (short) RFIFOW(fd, 28);
tmtime->tm_mday =
- tmtime->tm_mday + (short) RFIFOW (fd, 30);
+ tmtime->tm_mday + (short) RFIFOW(fd, 30);
tmtime->tm_hour =
- tmtime->tm_hour + (short) RFIFOW (fd, 32);
+ tmtime->tm_hour + (short) RFIFOW(fd, 32);
tmtime->tm_min =
- tmtime->tm_min + (short) RFIFOW (fd, 34);
+ tmtime->tm_min + (short) RFIFOW(fd, 34);
tmtime->tm_sec =
- tmtime->tm_sec + (short) RFIFOW (fd, 36);
- timestamp = mktime (tmtime);
+ tmtime->tm_sec + (short) RFIFOW(fd, 36);
+ timestamp = mktime(tmtime);
if (timestamp != -1)
{
- strftime (tmpstr, 24, date_format,
- gmtime (&auth_dat
+ strftime(tmpstr, 24, date_format,
+ gmtime(&auth_dat
[i].connect_until_time));
- strftime (tmpstr2, 24, date_format,
- gmtime (&timestamp));
- login_log
- ("'ladmin': Adjustment of a validity limit (account: %s, %ld (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> new validity: %ld (%s), ip: %s)\n",
+ strftime(tmpstr2, 24, date_format,
+ gmtime(&timestamp));
+ login_log("'ladmin': Adjustment of a validity limit (account: %s, %ld (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> new validity: %ld (%s), ip: %s)\n",
auth_dat[i].userid,
auth_dat[i].connect_until_time,
(auth_dat[i].connect_until_time ==
0 ? "unlimited" : tmpstr),
- (short) RFIFOW (fd, 26),
- (short) RFIFOW (fd, 28),
- (short) RFIFOW (fd, 30),
- (short) RFIFOW (fd, 32),
- (short) RFIFOW (fd, 34),
- (short) RFIFOW (fd, 36), timestamp,
+ (short) RFIFOW(fd, 26),
+ (short) RFIFOW(fd, 28),
+ (short) RFIFOW(fd, 30),
+ (short) RFIFOW(fd, 32),
+ (short) RFIFOW(fd, 34),
+ (short) RFIFOW(fd, 36), timestamp,
(timestamp == 0 ? "unlimited" : tmpstr2),
ip);
auth_dat[i].connect_until_time = timestamp;
- WFIFOL (fd, 30) =
+ WFIFOL(fd, 30) =
(unsigned long)
auth_dat[i].connect_until_time;
}
else
{
- strftime (tmpstr, 24, date_format,
- gmtime (&auth_dat
+ strftime(tmpstr, 24, date_format,
+ gmtime(&auth_dat
[i].connect_until_time));
- login_log
- ("'ladmin': Impossible to adjust a validity limit (account: %s, %ld (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> ???, ip: %s)\n",
+ login_log("'ladmin': Impossible to adjust a validity limit (account: %s, %ld (%s) + (%+d y %+d m %+d d %+d h %+d mn %+d s) -> ???, ip: %s)\n",
auth_dat[i].userid,
auth_dat[i].connect_until_time,
(auth_dat[i].connect_until_time ==
0 ? "unlimited" : tmpstr),
- (short) RFIFOW (fd, 26),
- (short) RFIFOW (fd, 28),
- (short) RFIFOW (fd, 30),
- (short) RFIFOW (fd, 32),
- (short) RFIFOW (fd, 34),
- (short) RFIFOW (fd, 36), ip);
- WFIFOL (fd, 30) = 0;
+ (short) RFIFOW(fd, 26),
+ (short) RFIFOW(fd, 28),
+ (short) RFIFOW(fd, 30),
+ (short) RFIFOW(fd, 32),
+ (short) RFIFOW(fd, 34),
+ (short) RFIFOW(fd, 36), ip);
+ WFIFOL(fd, 30) = 0;
}
}
}
else
{
- memcpy (WFIFOP (fd, 6), account_name, 24);
- login_log
- ("'ladmin': Attempt to adjust the validity limit of an unknown account (account: %s, ip: %s)\n",
+ memcpy(WFIFOP(fd, 6), account_name, 24);
+ login_log("'ladmin': Attempt to adjust the validity limit of an unknown account (account: %s, ip: %s)\n",
account_name, ip);
- WFIFOL (fd, 30) = 0;
+ WFIFOL(fd, 30) = 0;
}
}
- WFIFOSET (fd, 34);
- RFIFOSKIP (fd, 38);
+ WFIFOSET(fd, 34);
+ RFIFOSKIP(fd, 38);
break;
case 0x7952: // Request about informations of an account (by account name)
- if (RFIFOREST (fd) < 26)
+ if (RFIFOREST(fd) < 26)
return;
- WFIFOW (fd, 0) = 0x7953;
- WFIFOL (fd, 2) = -1;
- account_name = (char *)RFIFOP (fd, 2);
+ WFIFOW(fd, 0) = 0x7953;
+ WFIFOL(fd, 2) = -1;
+ account_name = (char *)RFIFOP(fd, 2);
account_name[23] = '\0';
- remove_control_chars (account_name);
- i = search_account_index (account_name);
+ remove_control_chars(account_name);
+ i = search_account_index(account_name);
if (i != -1)
{
- WFIFOL (fd, 2) = auth_dat[i].account_id;
- WFIFOB (fd, 6) =
- (unsigned char) isGM (auth_dat[i].account_id);
- memcpy (WFIFOP (fd, 7), auth_dat[i].userid, 24);
- WFIFOB (fd, 31) = auth_dat[i].sex;
- WFIFOL (fd, 32) = auth_dat[i].logincount;
- WFIFOL (fd, 36) = auth_dat[i].state;
- memcpy (WFIFOP (fd, 40), auth_dat[i].error_message, 20);
- memcpy (WFIFOP (fd, 60), auth_dat[i].lastlogin, 24);
- memcpy (WFIFOP (fd, 84), auth_dat[i].last_ip, 16);
- memcpy (WFIFOP (fd, 100), auth_dat[i].email, 40);
- WFIFOL (fd, 140) =
+ WFIFOL(fd, 2) = auth_dat[i].account_id;
+ WFIFOB(fd, 6) =
+ (unsigned char) isGM(auth_dat[i].account_id);
+ memcpy(WFIFOP(fd, 7), auth_dat[i].userid, 24);
+ WFIFOB(fd, 31) = auth_dat[i].sex;
+ WFIFOL(fd, 32) = auth_dat[i].logincount;
+ WFIFOL(fd, 36) = auth_dat[i].state;
+ memcpy(WFIFOP(fd, 40), auth_dat[i].error_message, 20);
+ memcpy(WFIFOP(fd, 60), auth_dat[i].lastlogin, 24);
+ memcpy(WFIFOP(fd, 84), auth_dat[i].last_ip, 16);
+ memcpy(WFIFOP(fd, 100), auth_dat[i].email, 40);
+ WFIFOL(fd, 140) =
(unsigned long) auth_dat[i].connect_until_time;
- WFIFOL (fd, 144) =
+ WFIFOL(fd, 144) =
(unsigned long) auth_dat[i].ban_until_time;
- WFIFOW (fd, 148) = strlen (auth_dat[i].memo);
+ WFIFOW(fd, 148) = strlen(auth_dat[i].memo);
if (auth_dat[i].memo[0])
{
- memcpy (WFIFOP (fd, 150), auth_dat[i].memo,
- strlen (auth_dat[i].memo));
+ memcpy(WFIFOP(fd, 150), auth_dat[i].memo,
+ strlen(auth_dat[i].memo));
}
- login_log
- ("'ladmin': Sending information of an account (request by the name; account: %s, id: %d, ip: %s)\n",
+ login_log("'ladmin': Sending information of an account (request by the name; account: %s, id: %d, ip: %s)\n",
auth_dat[i].userid, auth_dat[i].account_id,
ip);
- WFIFOSET (fd, 150 + strlen (auth_dat[i].memo));
+ WFIFOSET(fd, 150 + strlen(auth_dat[i].memo));
}
else
{
- memcpy (WFIFOP (fd, 7), account_name, 24);
- WFIFOW (fd, 148) = 0;
- login_log
- ("'ladmin': Attempt to obtain information (by the name) of an unknown account (account: %s, ip: %s)\n",
+ memcpy(WFIFOP(fd, 7), account_name, 24);
+ WFIFOW(fd, 148) = 0;
+ login_log("'ladmin': Attempt to obtain information (by the name) of an unknown account (account: %s, ip: %s)\n",
account_name, ip);
- WFIFOSET (fd, 150);
+ WFIFOSET(fd, 150);
}
- RFIFOSKIP (fd, 26);
+ RFIFOSKIP(fd, 26);
break;
case 0x7954: // Request about information of an account (by account id)
- if (RFIFOREST (fd) < 6)
+ if (RFIFOREST(fd) < 6)
return;
- WFIFOW (fd, 0) = 0x7953;
- WFIFOL (fd, 2) = RFIFOL (fd, 2);
- memset (WFIFOP (fd, 7), '\0', 24);
+ WFIFOW(fd, 0) = 0x7953;
+ WFIFOL(fd, 2) = RFIFOL(fd, 2);
+ memset(WFIFOP(fd, 7), '\0', 24);
for (i = 0; i < auth_num; i++)
{
- if (auth_dat[i].account_id == RFIFOL (fd, 2))
+ if (auth_dat[i].account_id == RFIFOL(fd, 2))
{
- login_log
- ("'ladmin': Sending information of an account (request by the id; account: %s, id: %d, ip: %s)\n",
- auth_dat[i].userid, RFIFOL (fd, 2), ip);
- WFIFOB (fd, 6) =
- (unsigned char) isGM (auth_dat[i].account_id);
- memcpy (WFIFOP (fd, 7), auth_dat[i].userid, 24);
- WFIFOB (fd, 31) = auth_dat[i].sex;
- WFIFOL (fd, 32) = auth_dat[i].logincount;
- WFIFOL (fd, 36) = auth_dat[i].state;
- memcpy (WFIFOP (fd, 40), auth_dat[i].error_message,
+ login_log("'ladmin': Sending information of an account (request by the id; account: %s, id: %d, ip: %s)\n",
+ auth_dat[i].userid, RFIFOL(fd, 2), ip);
+ WFIFOB(fd, 6) =
+ (unsigned char) isGM(auth_dat[i].account_id);
+ memcpy(WFIFOP(fd, 7), auth_dat[i].userid, 24);
+ WFIFOB(fd, 31) = auth_dat[i].sex;
+ WFIFOL(fd, 32) = auth_dat[i].logincount;
+ WFIFOL(fd, 36) = auth_dat[i].state;
+ memcpy(WFIFOP(fd, 40), auth_dat[i].error_message,
20);
- memcpy (WFIFOP (fd, 60), auth_dat[i].lastlogin, 24);
- memcpy (WFIFOP (fd, 84), auth_dat[i].last_ip, 16);
- memcpy (WFIFOP (fd, 100), auth_dat[i].email, 40);
- WFIFOL (fd, 140) =
+ memcpy(WFIFOP(fd, 60), auth_dat[i].lastlogin, 24);
+ memcpy(WFIFOP(fd, 84), auth_dat[i].last_ip, 16);
+ memcpy(WFIFOP(fd, 100), auth_dat[i].email, 40);
+ WFIFOL(fd, 140) =
(unsigned long) auth_dat[i].connect_until_time;
- WFIFOL (fd, 144) =
+ WFIFOL(fd, 144) =
(unsigned long) auth_dat[i].ban_until_time;
- WFIFOW (fd, 148) = strlen (auth_dat[i].memo);
+ WFIFOW(fd, 148) = strlen(auth_dat[i].memo);
if (auth_dat[i].memo[0])
{
- memcpy (WFIFOP (fd, 150), auth_dat[i].memo,
- strlen (auth_dat[i].memo));
+ memcpy(WFIFOP(fd, 150), auth_dat[i].memo,
+ strlen(auth_dat[i].memo));
}
- WFIFOSET (fd, 150 + strlen (auth_dat[i].memo));
+ WFIFOSET(fd, 150 + strlen(auth_dat[i].memo));
break;
}
}
if (i == auth_num)
{
- login_log
- ("'ladmin': Attempt to obtain information (by the id) of an unknown account (id: %d, ip: %s)\n",
- RFIFOL (fd, 2), ip);
- strncpy ((char *)WFIFOP (fd, 7), "", 24);
- WFIFOW (fd, 148) = 0;
- WFIFOSET (fd, 150);
+ login_log("'ladmin': Attempt to obtain information (by the id) of an unknown account (id: %d, ip: %s)\n",
+ RFIFOL(fd, 2), ip);
+ strncpy((char *)WFIFOP(fd, 7), "", 24);
+ WFIFOW(fd, 148) = 0;
+ WFIFOSET(fd, 150);
}
- RFIFOSKIP (fd, 6);
+ RFIFOSKIP(fd, 6);
break;
case 0x7955: // Request to reload GM file (no answer)
- login_log
- ("'ladmin': Request to re-load GM configuration file (ip: %s).\n",
+ login_log("'ladmin': Request to re-load GM configuration file (ip: %s).\n",
ip);
- read_gm_account ();
+ read_gm_account();
// send GM accounts to all char-servers
- send_GM_accounts ();
- RFIFOSKIP (fd, 2);
+ send_GM_accounts();
+ RFIFOSKIP(fd, 2);
break;
default:
@@ -3413,58 +3262,56 @@ void parse_admin (int fd)
FILE *logfp;
char tmpstr[24];
struct timeval tv;
- logfp = fopen_ (login_log_unknown_packets_filename, "a");
+ logfp = fopen_(login_log_unknown_packets_filename, "a");
if (logfp)
{
- gettimeofday (&tv, NULL);
- strftime (tmpstr, 23, date_format, gmtime (&(tv.tv_sec)));
- fprintf (logfp,
+ gettimeofday(&tv, NULL);
+ strftime(tmpstr, 23, date_format, gmtime(&(tv.tv_sec)));
+ fprintf(logfp,
"%s.%03d: receiving of an unknown packet -> disconnection\n",
tmpstr, (int) tv.tv_usec / 1000);
- fprintf (logfp,
+ fprintf(logfp,
"parse_admin: connection #%d (ip: %s), packet: 0x%x (with being read: %d).\n",
- fd, ip, RFIFOW (fd, 0), RFIFOREST (fd));
- fprintf (logfp, "Detail (in hex):\n");
- fprintf (logfp,
+ fd, ip, RFIFOW(fd, 0), RFIFOREST(fd));
+ fprintf(logfp, "Detail (in hex):\n");
+ fprintf(logfp,
"---- 00-01-02-03-04-05-06-07 08-09-0A-0B-0C-0D-0E-0F\n");
- memset (tmpstr, '\0', sizeof (tmpstr));
- for (i = 0; i < RFIFOREST (fd); i++)
+ memset(tmpstr, '\0', sizeof(tmpstr));
+ for (i = 0; i < RFIFOREST(fd); i++)
{
if ((i & 15) == 0)
- fprintf (logfp, "%04X ", i);
- fprintf (logfp, "%02x ", RFIFOB (fd, i));
- if (RFIFOB (fd, i) > 0x1f)
- tmpstr[i % 16] = RFIFOB (fd, i);
+ fprintf(logfp, "%04X ", i);
+ fprintf(logfp, "%02x ", RFIFOB (fd, i));
+ if (RFIFOB(fd, i) > 0x1f)
+ tmpstr[i % 16] = RFIFOB(fd, i);
else
tmpstr[i % 16] = '.';
if ((i - 7) % 16 == 0) // -8 + 1
- fprintf (logfp, " ");
+ fprintf(logfp, " ");
else if ((i + 1) % 16 == 0)
{
- fprintf (logfp, " %s\n", tmpstr);
- memset (tmpstr, '\0', sizeof (tmpstr));
+ fprintf(logfp, " %s\n", tmpstr);
+ memset(tmpstr, '\0', sizeof(tmpstr));
}
}
if (i % 16 != 0)
{
for (j = i; j % 16 != 0; j++)
{
- fprintf (logfp, " ");
+ fprintf(logfp, " ");
if ((j - 7) % 16 == 0) // -8 + 1
- fprintf (logfp, " ");
+ fprintf(logfp, " ");
}
- fprintf (logfp, " %s\n", tmpstr);
+ fprintf(logfp, " %s\n", tmpstr);
}
- fprintf (logfp, "\n");
- fclose_ (logfp);
+ fprintf(logfp, "\n");
+ fclose_(logfp);
}
}
- login_log
- ("'ladmin': End of connection, unknown packet (ip: %s)\n",
+ login_log("'ladmin': End of connection, unknown packet (ip: %s)\n",
ip);
session[fd]->eof = 1;
- printf
- ("Remote administration has been disconnected (unknown packet).\n");
+ printf("Remote administration has been disconnected (unknown packet).\n");
return;
}
//WFIFOW(fd,0) = 0x791f;
@@ -3478,10 +3325,10 @@ void parse_admin (int fd)
//--------------------------------------------
// TODO fix to not take a ptr-to-uint8_t
static
-int lan_ip_check (unsigned char *p)
+int lan_ip_check(unsigned char *p)
{
- int i;
- int lancheck = 1;
+ 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],
@@ -3495,7 +3342,7 @@ int lan_ip_check (unsigned char *p)
break;
}
}
- printf ("LAN test (result): %s source\033[0m.\n",
+ printf("LAN test (result): %s source\033[0m.\n",
(lancheck) ? "\033[1;36mLAN" : "\033[1;32mWAN");
return lancheck;
}
@@ -3504,131 +3351,122 @@ int lan_ip_check (unsigned char *p)
// Default packet parsing (normal players or administation/char-server connexion requests)
//----------------------------------------------------------------------------------------
static
-void parse_login (int fd)
+void parse_login(int fd)
{
struct mmo_account account;
- int result, j;
+ int result, j;
unsigned char *p = (unsigned char *) &session[fd]->client_addr.sin_addr;
- int host_len;
+ int host_len;
const char *ip = ip2str(session[fd]->client_addr.sin_addr);
if (session[fd]->eof)
{
- close (fd);
- delete_session (fd);
+ close(fd);
+ delete_session(fd);
return;
}
- while (RFIFOREST (fd) >= 2)
+ while (RFIFOREST(fd) >= 2)
{
if (display_parse_login == 1)
{
- if (RFIFOW (fd, 0) == 0x64 || RFIFOW (fd, 0) == 0x01dd)
+ if (RFIFOW(fd, 0) == 0x64 || RFIFOW(fd, 0) == 0x01dd)
{
- if (RFIFOREST (fd) >= ((RFIFOW (fd, 0) == 0x64) ? 55 : 47))
- printf
- ("parse_login: connection #%d, packet: 0x%x (with being read: %d), account: %s.\n",
- fd, RFIFOW (fd, 0), RFIFOREST (fd), RFIFOP (fd, 6));
+ if (RFIFOREST(fd) >= ((RFIFOW(fd, 0) == 0x64) ? 55 : 47))
+ printf("parse_login: connection #%d, packet: 0x%x (with being read: %d), account: %s.\n",
+ fd, RFIFOW(fd, 0), RFIFOREST(fd), RFIFOP(fd, 6));
}
- else if (RFIFOW (fd, 0) == 0x2710)
+ else if (RFIFOW(fd, 0) == 0x2710)
{
- if (RFIFOREST (fd) >= 86)
- printf
- ("parse_login: connection #%d, packet: 0x%x (with being read: %d), server: %s.\n",
- fd, RFIFOW (fd, 0), RFIFOREST (fd), RFIFOP (fd, 60));
+ if (RFIFOREST(fd) >= 86)
+ printf("parse_login: connection #%d, packet: 0x%x (with being read: %d), server: %s.\n",
+ fd, RFIFOW(fd, 0), RFIFOREST(fd), RFIFOP(fd, 60));
}
else
- printf
- ("parse_login: connection #%d, packet: 0x%x (with being read: %d).\n",
- fd, RFIFOW (fd, 0), RFIFOREST (fd));
+ printf("parse_login: connection #%d, packet: 0x%x (with being read: %d).\n",
+ fd, RFIFOW(fd, 0), RFIFOREST(fd));
}
- switch (RFIFOW (fd, 0))
+ switch (RFIFOW(fd, 0))
{
case 0x200: // New alive packet: structure: 0x200 <account.userid>.24B. used to verify if client is always alive.
- if (RFIFOREST (fd) < 26)
+ if (RFIFOREST(fd) < 26)
return;
- RFIFOSKIP (fd, 26);
+ RFIFOSKIP(fd, 26);
break;
case 0x204: // New alive packet: structure: 0x204 <encrypted.account.userid>.16B. (new ragexe from 22 june 2004)
- if (RFIFOREST (fd) < 18)
+ if (RFIFOREST(fd) < 18)
return;
- RFIFOSKIP (fd, 18);
+ RFIFOSKIP(fd, 18);
break;
case 0x64: // Ask connection of a client
case 0x01dd: // Ask connection of a client (encryption mode)
- if (RFIFOREST (fd) < ((RFIFOW (fd, 0) == 0x64) ? 55 : 47))
+ if (RFIFOREST(fd) < ((RFIFOW(fd, 0) == 0x64) ? 55 : 47))
return;
- account.userid = (char *)RFIFOP (fd, 6);
+ account.userid = (char *)RFIFOP(fd, 6);
account.userid[23] = '\0';
- remove_control_chars (account.userid);
- account.passwd = (char *)RFIFOP (fd, 30);
- if (RFIFOW (fd, 0) == 0x64)
+ remove_control_chars(account.userid);
+ account.passwd = (char *)RFIFOP(fd, 30);
+ if (RFIFOW(fd, 0) == 0x64)
{
account.passwd[23] = '\0';
- remove_control_chars (account.passwd);
+ remove_control_chars(account.passwd);
}
#ifdef PASSWORDENC
account.passwdenc =
- (RFIFOW (fd, 0) == 0x64) ? 0 : PASSWORDENC;
+ (RFIFOW(fd, 0) == 0x64) ? 0 : PASSWORDENC;
#else
account.passwdenc = 0;
#endif
- if (RFIFOW (fd, 0) == 0x64)
+ if (RFIFOW(fd, 0) == 0x64)
{
- login_log
- ("Request for connection (non encryption mode) of %s (ip: %s).\n",
+ login_log("Request for connection (non encryption mode) of %s (ip: %s).\n",
account.userid, ip);
}
else
{
- login_log
- ("Request for connection (encryption mode) of %s (ip: %s).\n",
+ login_log("Request for connection (encryption mode) of %s (ip: %s).\n",
account.userid, ip);
}
- if (!check_ip (session[fd]->client_addr.sin_addr))
+ if (!check_ip(session[fd]->client_addr.sin_addr))
{
- login_log
- ("Connection refused: IP isn't authorised (deny/allow, ip: %s).\n",
+ login_log("Connection refused: IP isn't authorised (deny/allow, ip: %s).\n",
ip);
- WFIFOW (fd, 0) = 0x6a;
- WFIFOB (fd, 2) = 0x03;
- WFIFOSET (fd, 3);
- RFIFOSKIP (fd, (RFIFOW (fd, 0) == 0x64) ? 55 : 47);
+ WFIFOW(fd, 0) = 0x6a;
+ WFIFOB(fd, 2) = 0x03;
+ WFIFOSET(fd, 3);
+ RFIFOSKIP(fd, (RFIFOW(fd, 0) == 0x64) ? 55 : 47);
break;
}
- result = mmo_auth (&account, fd);
+ result = mmo_auth(&account, fd);
if (result == -1)
{
- int gm_level = isGM (account.account_id);
+ int gm_level = isGM(account.account_id);
if (min_level_to_connect > gm_level)
{
- login_log
- ("Connection refused: the minimum GM level for connection is %d (account: %s, GM level: %d, ip: %s).\n",
+ login_log("Connection refused: the minimum GM level for connection is %d (account: %s, GM level: %d, ip: %s).\n",
min_level_to_connect, account.userid,
gm_level, ip);
- WFIFOW (fd, 0) = 0x81;
- WFIFOL (fd, 2) = 1; // 01 = Server closed
- WFIFOSET (fd, 3);
+ WFIFOW(fd, 0) = 0x81;
+ WFIFOL(fd, 2) = 1; // 01 = Server closed
+ WFIFOSET(fd, 3);
}
else
{
- int version_2 = RFIFOB (fd, 54); // version 2
+ int version_2 = RFIFOB(fd, 54); // version 2
if (gm_level)
- printf
- ("Connection of the GM (level:%d) account '%s' accepted.\n",
+ printf("Connection of the GM (level:%d) account '%s' accepted.\n",
gm_level, account.userid);
else
- printf
- ("Connection of the account '%s' accepted.\n",
+ printf("Connection of the account '%s' accepted.\n",
account.userid);
/*
@@ -3640,17 +3478,17 @@ void parse_login (int fd)
* then the client can safely accept the 0x63 packet. The "version 2" value is not
* otherwise used by eAthena.
*/
- if ((RFIFOW (fd, 0) == 0x64)
+ if ((RFIFOW(fd, 0) == 0x64)
&& (version_2 & VERSION_2_UPDATEHOST))
{
- host_len = (int) strlen (update_host);
+ host_len = (int) strlen(update_host);
if (host_len > 0)
{
- WFIFOW (fd, 0) = 0x63;
- WFIFOW (fd, 2) = 4 + host_len;
- memcpy (WFIFOP (fd, 4), update_host,
+ WFIFOW(fd, 0) = 0x63;
+ WFIFOW(fd, 2) = 4 + host_len;
+ memcpy(WFIFOP(fd, 4), update_host,
host_len);
- WFIFOSET (fd, 4 + host_len);
+ WFIFOSET(fd, 4 + host_len);
}
}
@@ -3661,22 +3499,21 @@ void parse_login (int fd)
{
if (server_fd[i] >= 0)
{
- if (lan_ip_check (p))
- WFIFOL (fd, 47 + server_num * 32) =
- inet_addr (lan_char_ip);
+ if (lan_ip_check(p))
+ WFIFOL(fd, 47 + server_num * 32) =
+ inet_addr(lan_char_ip);
else
- WFIFOL (fd, 47 + server_num * 32) =
+ WFIFOL(fd, 47 + server_num * 32) =
server[i].ip;
- WFIFOW (fd, 47 + server_num * 32 + 4) =
+ WFIFOW(fd, 47 + server_num * 32 + 4) =
server[i].port;
- memcpy (WFIFOP
- (fd, 47 + server_num * 32 + 6),
+ memcpy(WFIFOP(fd, 47 + server_num * 32 + 6),
server[i].name, 20);
- WFIFOW (fd, 47 + server_num * 32 + 26) =
+ WFIFOW(fd, 47 + server_num * 32 + 26) =
server[i].users;
- WFIFOW (fd, 47 + server_num * 32 + 28) =
+ WFIFOW(fd, 47 + server_num * 32 + 28) =
server[i].maintenance;
- WFIFOW (fd, 47 + server_num * 32 + 30) =
+ WFIFOW(fd, 47 + server_num * 32 + 30) =
server[i].is_new;
server_num++;
}
@@ -3686,22 +3523,21 @@ void parse_login (int fd)
{
if (server_fd[i] >= 0)
{
- if (lan_ip_check (p))
- WFIFOL (fd, 47 + server_num * 32) =
- inet_addr (lan_char_ip);
+ if (lan_ip_check(p))
+ WFIFOL(fd, 47 + server_num * 32) =
+ inet_addr(lan_char_ip);
else
- WFIFOL (fd, 47 + server_num * 32) =
+ WFIFOL(fd, 47 + server_num * 32) =
server[i].ip;
- WFIFOW (fd, 47 + server_num * 32 + 4) =
+ WFIFOW(fd, 47 + server_num * 32 + 4) =
server[i].port;
- memcpy (WFIFOP
- (fd, 47 + server_num * 32 + 6),
+ memcpy(WFIFOP(fd, 47 + server_num * 32 + 6),
server[i].name, 20);
- WFIFOW (fd, 47 + server_num * 32 + 26) =
+ WFIFOW(fd, 47 + server_num * 32 + 26) =
server[i].users;
- WFIFOW (fd, 47 + server_num * 32 + 28) =
+ WFIFOW(fd, 47 + server_num * 32 + 28) =
server[i].maintenance;
- WFIFOW (fd, 47 + server_num * 32 + 30) =
+ WFIFOW(fd, 47 + server_num * 32 + 30) =
server[i].is_new;
server_num++;
}
@@ -3709,15 +3545,15 @@ void parse_login (int fd)
// if at least 1 char-server
if (server_num > 0)
{
- WFIFOW (fd, 0) = 0x69;
- WFIFOW (fd, 2) = 47 + 32 * server_num;
- WFIFOL (fd, 4) = account.login_id1;
- WFIFOL (fd, 8) = account.account_id;
- WFIFOL (fd, 12) = account.login_id2;
- WFIFOL (fd, 16) = 0; // in old version, that was for ip (not more used)
- memcpy (WFIFOP (fd, 20), account.lastlogin, 24); // in old version, that was for name (not more used)
- WFIFOB (fd, 46) = account.sex;
- WFIFOSET (fd, 47 + 32 * server_num);
+ WFIFOW(fd, 0) = 0x69;
+ WFIFOW(fd, 2) = 47 + 32 * server_num;
+ WFIFOL(fd, 4) = account.login_id1;
+ WFIFOL(fd, 8) = account.account_id;
+ WFIFOL(fd, 12) = account.login_id2;
+ WFIFOL(fd, 16) = 0; // in old version, that was for ip (not more used)
+ memcpy(WFIFOP(fd, 20), account.lastlogin, 24); // in old version, that was for name (not more used)
+ WFIFOB(fd, 46) = account.sex;
+ WFIFOSET(fd, 47 + 32 * server_num);
if (auth_fifo_pos >= AUTH_FIFO_SIZE)
auth_fifo_pos = 0;
auth_fifo[auth_fifo_pos].account_id =
@@ -3735,44 +3571,43 @@ void parse_login (int fd)
}
else
{
- login_log
- ("Connection refused: there is no char-server online (account: %s, ip: %s).\n",
+ login_log("Connection refused: there is no char-server online (account: %s, ip: %s).\n",
account.userid, ip);
- WFIFOW (fd, 0) = 0x81;
- WFIFOL (fd, 2) = 1; // 01 = Server closed
- WFIFOSET (fd, 3);
+ WFIFOW(fd, 0) = 0x81;
+ WFIFOL(fd, 2) = 1; // 01 = Server closed
+ WFIFOSET(fd, 3);
}
}
}
else
{
- memset (WFIFOP (fd, 0), '\0', 23);
- WFIFOW (fd, 0) = 0x6a;
- WFIFOB (fd, 2) = result;
+ memset(WFIFOP(fd, 0), '\0', 23);
+ WFIFOW(fd, 0) = 0x6a;
+ WFIFOB(fd, 2) = result;
if (result == 6)
{ // 6 = Your are Prohibited to log in until %s
- int i = search_account_index (account.userid);
+ int i = search_account_index(account.userid);
if (i != -1)
{
if (auth_dat[i].ban_until_time != 0)
{ // if account is banned, we send ban timestamp
char tmpstr[256];
- strftime (tmpstr, 20, date_format,
- gmtime (&auth_dat
+ strftime(tmpstr, 20, date_format,
+ gmtime(&auth_dat
[i].ban_until_time));
tmpstr[19] = '\0';
- memcpy (WFIFOP (fd, 3), tmpstr, 20);
+ memcpy(WFIFOP(fd, 3), tmpstr, 20);
}
else
{ // we send error message
- memcpy (WFIFOP (fd, 3),
+ memcpy(WFIFOP(fd, 3),
auth_dat[i].error_message, 20);
}
}
}
- WFIFOSET (fd, 23);
+ WFIFOSET(fd, 23);
}
- RFIFOSKIP (fd, (RFIFOW (fd, 0) == 0x64) ? 55 : 47);
+ RFIFOSKIP(fd, (RFIFOW(fd, 0) == 0x64) ? 55 : 47);
break;
case 0x01db: // Sending request of the coding key
@@ -3781,79 +3616,75 @@ void parse_login (int fd)
struct login_session_data *ld;
if (session[fd]->session_data)
{
- printf
- ("login: abnormal request of MD5 key (already opened session).\n");
+ printf("login: abnormal request of MD5 key (already opened session).\n");
session[fd]->eof = 1;
return;
}
- CREATE (ld, struct login_session_data, 1);
+ CREATE(ld, struct login_session_data, 1);
session[fd]->session_data = ld;
if (!ld)
{
- printf
- ("login: Request for md5 key: memory allocation failure (malloc)!\n");
+ printf("login: Request for md5 key: memory allocation failure (malloc)!\n");
session[fd]->eof = 1;
return;
}
- if (RFIFOW (fd, 0) == 0x01db)
+ if (RFIFOW(fd, 0) == 0x01db)
{
- login_log ("Sending request of the coding key (ip: %s)\n",
+ login_log("Sending request of the coding key (ip: %s)\n",
ip);
}
else
{
- login_log
- ("'ladmin': Sending request of the coding key (ip: %s)\n",
+ login_log("'ladmin': Sending request of the coding key (ip: %s)\n",
ip);
}
// Creation of the coding key
- memset (ld->md5key, '\0', sizeof (ld->md5key));
- ld->md5keylen = rand () % 4 + 12;
+ memset(ld->md5key, '\0', sizeof(ld->md5key));
+ ld->md5keylen = rand() % 4 + 12;
for (int i = 0; i < ld->md5keylen; i++)
- ld->md5key[i] = rand () % 255 + 1;
+ ld->md5key[i] = rand() % 255 + 1;
- RFIFOSKIP (fd, 2);
- WFIFOW (fd, 0) = 0x01dc;
- WFIFOW (fd, 2) = 4 + ld->md5keylen;
- memcpy (WFIFOP (fd, 4), ld->md5key, ld->md5keylen);
- WFIFOSET (fd, WFIFOW (fd, 2));
+ RFIFOSKIP(fd, 2);
+ WFIFOW(fd, 0) = 0x01dc;
+ WFIFOW(fd, 2) = 4 + ld->md5keylen;
+ memcpy(WFIFOP(fd, 4), ld->md5key, ld->md5keylen);
+ WFIFOSET(fd, WFIFOW(fd, 2));
}
break;
case 0x2710: // Connection request of a char-server
- if (RFIFOREST (fd) < 86)
+ if (RFIFOREST(fd) < 86)
return;
{
- int GM_value, len;
+ int GM_value, len;
char *server_name;
- account.userid = (char *)RFIFOP (fd, 2);
+ account.userid = (char *)RFIFOP(fd, 2);
account.userid[23] = '\0';
- remove_control_chars (account.userid);
- account.passwd = (char *)RFIFOP (fd, 26);
+ remove_control_chars(account.userid);
+ account.passwd = (char *)RFIFOP(fd, 26);
account.passwd[23] = '\0';
- remove_control_chars (account.passwd);
+ remove_control_chars(account.passwd);
account.passwdenc = 0;
- server_name = (char *)RFIFOP (fd, 60);
+ server_name = (char *)RFIFOP(fd, 60);
server_name[19] = '\0';
- remove_control_chars (server_name);
- login_log
- ("Connection request of the char-server '%s' @ %d.%d.%d.%d:%d (ip: %s)\n",
- server_name, RFIFOB (fd, 54), RFIFOB (fd, 55),
- RFIFOB (fd, 56), RFIFOB (fd, 57), RFIFOW (fd, 58),
+ remove_control_chars(server_name);
+ login_log("Connection request of the char-server '%s' @ %d.%d.%d.%d:%d (ip: %s)\n",
+ server_name, RFIFOB(fd, 54), RFIFOB(fd, 55),
+ RFIFOB(fd, 56), RFIFOB(fd, 57), RFIFOW(fd, 58),
ip);
- result = mmo_auth (&account, fd);
+ result = mmo_auth(&account, fd);
if (result == -1 && account.sex == 2)
{
// If this is the main server, and we don't already have a main server
if (server_fd[0] <= 0
- && strcasecmp (server_name, main_server) == 0)
+ && strcasecmp(server_name, main_server) == 0)
{
account.account_id = 0;
}
else
{
- int i;
+ int i;
for (i = 1; i < MAX_SERVERS; i++)
{
if (server_fd[i] <= 0)
@@ -3869,168 +3700,154 @@ void parse_login (int fd)
&& account.account_id < MAX_SERVERS
&& server_fd[account.account_id] == -1)
{
- login_log
- ("Connection of the char-server '%s' accepted (account: %s, pass: %s, ip: %s)\n",
+ login_log("Connection of the char-server '%s' accepted (account: %s, pass: %s, ip: %s)\n",
server_name, account.userid,
account.passwd, ip);
- printf
- ("Connection of the char-server '%s' accepted.\n",
+ printf("Connection of the char-server '%s' accepted.\n",
server_name);
- memset (&server[account.account_id], 0,
- sizeof (struct mmo_char_server));
- server[account.account_id].ip = RFIFOL (fd, 54);
- server[account.account_id].port = RFIFOW (fd, 58);
- memcpy (server[account.account_id].name, server_name,
+ memset(&server[account.account_id], 0,
+ sizeof(struct mmo_char_server));
+ server[account.account_id].ip = RFIFOL(fd, 54);
+ server[account.account_id].port = RFIFOW(fd, 58);
+ memcpy(server[account.account_id].name, server_name,
20);
server[account.account_id].users = 0;
server[account.account_id].maintenance =
- RFIFOW (fd, 82);
- server[account.account_id].is_new = RFIFOW (fd, 84);
+ RFIFOW(fd, 82);
+ server[account.account_id].is_new = RFIFOW(fd, 84);
server_fd[account.account_id] = fd;
if (anti_freeze_enable)
server_freezeflag[account.account_id] = 5; // Char-server anti-freeze system. Counter. 5 ok, 4...0 freezed
- WFIFOW (fd, 0) = 0x2711;
- WFIFOB (fd, 2) = 0;
- WFIFOSET (fd, 3);
+ WFIFOW(fd, 0) = 0x2711;
+ WFIFOB(fd, 2) = 0;
+ WFIFOSET(fd, 3);
session[fd]->func_parse = parse_fromchar;
- realloc_fifo (fd, FIFOSIZE_SERVERLINK,
+ realloc_fifo(fd, FIFOSIZE_SERVERLINK,
FIFOSIZE_SERVERLINK);
// send GM account to char-server
len = 4;
- WFIFOW (fd, 0) = 0x2732;
+ WFIFOW(fd, 0) = 0x2732;
for (int i = 0; i < auth_num; i++)
// send only existing accounts. We can not create a GM account when server is online.
if ((GM_value =
- isGM (auth_dat[i].account_id)) > 0)
+ isGM(auth_dat[i].account_id)) > 0)
{
- WFIFOL (fd, len) = auth_dat[i].account_id;
- WFIFOB (fd, len + 4) =
+ WFIFOL(fd, len) = auth_dat[i].account_id;
+ WFIFOB(fd, len + 4) =
(unsigned char) GM_value;
len += 5;
}
- WFIFOW (fd, 2) = len;
- WFIFOSET (fd, len);
+ WFIFOW(fd, 2) = len;
+ WFIFOSET(fd, len);
}
else
{
- login_log
- ("Connexion of the char-server '%s' REFUSED (account: %s, pass: %s, ip: %s)\n",
+ login_log("Connexion of the char-server '%s' REFUSED (account: %s, pass: %s, ip: %s)\n",
server_name, account.userid,
account.passwd, ip);
- WFIFOW (fd, 0) = 0x2711;
- WFIFOB (fd, 2) = 3;
- WFIFOSET (fd, 3);
+ WFIFOW(fd, 0) = 0x2711;
+ WFIFOB(fd, 2) = 3;
+ WFIFOSET(fd, 3);
}
}
- RFIFOSKIP (fd, 86);
+ RFIFOSKIP(fd, 86);
return;
case 0x7530: // Request of the server version
- login_log ("Sending of the server version (ip: %s)\n",
+ login_log("Sending of the server version (ip: %s)\n",
ip);
- WFIFOW (fd, 0) = 0x7531;
- WFIFOB (fd, 2) = -1;
- WFIFOB (fd, 3) = 'T';
- WFIFOB (fd, 4) = 'M';
- WFIFOB (fd, 5) = 'W';
- WFIFOL (fd, 6) = new_account_flag ? 1 : 0;
- WFIFOSET (fd, 10);
- RFIFOSKIP (fd, 2);
+ WFIFOW(fd, 0) = 0x7531;
+ WFIFOB(fd, 2) = -1;
+ WFIFOB(fd, 3) = 'T';
+ WFIFOB(fd, 4) = 'M';
+ WFIFOB(fd, 5) = 'W';
+ WFIFOL(fd, 6) = new_account_flag ? 1 : 0;
+ WFIFOSET(fd, 10);
+ RFIFOSKIP(fd, 2);
break;
case 0x7532: // Request to end connection
- login_log ("End of connection (ip: %s)\n", ip);
+ login_log("End of connection (ip: %s)\n", ip);
session[fd]->eof = 1;
return;
case 0x7918: // Request for administation login
- if (RFIFOREST (fd) < 4
- || RFIFOREST (fd) < ((RFIFOW (fd, 2) == 0) ? 28 : 20))
+ if (RFIFOREST(fd) < 4
+ || RFIFOREST(fd) < ((RFIFOW(fd, 2) == 0) ? 28 : 20))
return;
- WFIFOW (fd, 0) = 0x7919;
- WFIFOB (fd, 2) = 1;
- if (!check_ladminip
- (session[fd]->client_addr.sin_addr))
+ WFIFOW(fd, 0) = 0x7919;
+ WFIFOB(fd, 2) = 1;
+ if (!check_ladminip(session[fd]->client_addr.sin_addr))
{
- login_log
- ("'ladmin'-login: Connection in administration mode refused: IP isn't authorised (ladmin_allow, ip: %s).\n",
+ login_log("'ladmin'-login: Connection in administration mode refused: IP isn't authorised (ladmin_allow, ip: %s).\n",
ip);
}
else
{
struct login_session_data *ld = (struct login_session_data *)session[fd]->session_data;
- if (RFIFOW (fd, 2) == 0)
+ if (RFIFOW(fd, 2) == 0)
{ // non encrypted password
char *password;
- password = (char *)RFIFOP (fd, 4);
+ password = (char *)RFIFOP(fd, 4);
password[23] = '\0';
- remove_control_chars (password);
+ remove_control_chars(password);
// If remote administration is enabled and password sent by client matches password read from login server configuration file
if ((admin_state == 1)
- && (strcmp (password, admin_pass) == 0))
+ && (strcmp(password, admin_pass) == 0))
{
- login_log
- ("'ladmin'-login: Connection in administration mode accepted (non encrypted password: %s, ip: %s)\n",
+ login_log("'ladmin'-login: Connection in administration mode accepted (non encrypted password: %s, ip: %s)\n",
password, ip);
- printf
- ("Connection of a remote administration accepted (non encrypted password).\n");
- WFIFOB (fd, 2) = 0;
+ printf("Connection of a remote administration accepted (non encrypted password).\n");
+ WFIFOB(fd, 2) = 0;
session[fd]->func_parse = parse_admin;
}
else if (admin_state != 1)
- login_log
- ("'ladmin'-login: Connection in administration mode REFUSED - remote administration is disabled (non encrypted password: %s, ip: %s)\n",
+ login_log("'ladmin'-login: Connection in administration mode REFUSED - remote administration is disabled (non encrypted password: %s, ip: %s)\n",
password, ip);
else
- login_log
- ("'ladmin'-login: Connection in administration mode REFUSED - invalid password (non encrypted password: %s, ip: %s)\n",
+ login_log("'ladmin'-login: Connection in administration mode REFUSED - invalid password (non encrypted password: %s, ip: %s)\n",
password, ip);
}
else
{ // encrypted password
if (!ld)
- printf
- ("'ladmin'-login: error! MD5 key not created/requested for an administration login.\n");
+ printf("'ladmin'-login: error! MD5 key not created/requested for an administration login.\n");
else
{
char md5str[64] = "";
uint8_t md5bin[32];
- if (RFIFOW (fd, 2) == 1)
+ if (RFIFOW(fd, 2) == 1)
{
- strncpy (md5str, ld->md5key, sizeof (ld->md5key)); // 20
- strcat (md5str, admin_pass); // 24
+ strncpy(md5str, ld->md5key, sizeof(ld->md5key)); // 20
+ strcat(md5str, admin_pass); // 24
}
- else if (RFIFOW (fd, 2) == 2)
+ else if (RFIFOW(fd, 2) == 2)
{
- strncpy (md5str, admin_pass, sizeof (admin_pass)); // 24
- strcat (md5str, ld->md5key); // 20
+ strncpy(md5str, admin_pass, sizeof(admin_pass)); // 24
+ strcat(md5str, ld->md5key); // 20
}
MD5_to_bin(MD5_from_cstring(md5str), md5bin);
// If remote administration is enabled and password hash sent by client matches hash of password read from login server configuration file
if ((admin_state == 1)
- && (memcmp (md5bin, RFIFOP (fd, 4), 16) == 0))
+ && (memcmp(md5bin, RFIFOP(fd, 4), 16) == 0))
{
- login_log
- ("'ladmin'-login: Connection in administration mode accepted (encrypted password, ip: %s)\n",
+ login_log("'ladmin'-login: Connection in administration mode accepted (encrypted password, ip: %s)\n",
ip);
- printf
- ("Connection of a remote administration accepted (encrypted password).\n");
- WFIFOB (fd, 2) = 0;
+ printf("Connection of a remote administration accepted (encrypted password).\n");
+ WFIFOB(fd, 2) = 0;
session[fd]->func_parse = parse_admin;
}
else if (admin_state != 1)
- login_log
- ("'ladmin'-login: Connection in administration mode REFUSED - remote administration is disabled (encrypted password, ip: %s)\n",
+ login_log("'ladmin'-login: Connection in administration mode REFUSED - remote administration is disabled (encrypted password, ip: %s)\n",
ip);
else
- login_log
- ("'ladmin'-login: Connection in administration mode REFUSED - invalid password (encrypted password, ip: %s)\n",
+ login_log("'ladmin'-login: Connection in administration mode REFUSED - invalid password (encrypted password, ip: %s)\n",
ip);
}
}
}
- WFIFOSET (fd, 3);
- RFIFOSKIP (fd, (RFIFOW (fd, 2) == 0) ? 28 : 20);
+ WFIFOSET(fd, 3);
+ RFIFOSKIP(fd, (RFIFOW(fd, 2) == 0) ? 28 : 20);
break;
default:
@@ -4039,57 +3856,57 @@ void parse_login (int fd)
FILE *logfp;
char tmpstr[24];
struct timeval tv;
- logfp = fopen_ (login_log_unknown_packets_filename, "a");
+ logfp = fopen_(login_log_unknown_packets_filename, "a");
if (logfp)
{
- gettimeofday (&tv, NULL);
- strftime (tmpstr, 23, date_format,
- gmtime (&(tv.tv_sec)));
- fprintf (logfp,
+ gettimeofday(&tv, NULL);
+ strftime(tmpstr, 23, date_format,
+ gmtime(&(tv.tv_sec)));
+ fprintf(logfp,
"%s.%03d: receiving of an unknown packet -> disconnection\n",
tmpstr, (int) tv.tv_usec / 1000);
- fprintf (logfp,
+ fprintf(logfp,
"parse_login: connection #%d (ip: %s), packet: 0x%x (with being read: %d).\n",
- fd, ip, RFIFOW (fd, 0),
- RFIFOREST (fd));
- fprintf (logfp, "Detail (in hex):\n");
- fprintf (logfp,
+ fd, ip, RFIFOW(fd, 0),
+ RFIFOREST(fd));
+ fprintf(logfp, "Detail (in hex):\n");
+ fprintf(logfp,
"---- 00-01-02-03-04-05-06-07 08-09-0A-0B-0C-0D-0E-0F\n");
- memset (tmpstr, '\0', sizeof (tmpstr));
+ memset(tmpstr, '\0', sizeof(tmpstr));
int i;
- for (i = 0; i < RFIFOREST (fd); i++)
+ for (i = 0; i < RFIFOREST(fd); i++)
{
if ((i & 15) == 0)
- fprintf (logfp, "%04X ", i);
- fprintf (logfp, "%02x ", RFIFOB (fd, i));
- if (RFIFOB (fd, i) > 0x1f)
- tmpstr[i % 16] = RFIFOB (fd, i);
+ fprintf(logfp, "%04X ", i);
+ fprintf(logfp, "%02x ", RFIFOB(fd, i));
+ if (RFIFOB(fd, i) > 0x1f)
+ tmpstr[i % 16] = RFIFOB(fd, i);
else
tmpstr[i % 16] = '.';
if ((i - 7) % 16 == 0) // -8 + 1
- fprintf (logfp, " ");
+ fprintf(logfp, " ");
else if ((i + 1) % 16 == 0)
{
- fprintf (logfp, " %s\n", tmpstr);
- memset (tmpstr, '\0', sizeof (tmpstr));
+ fprintf(logfp, " %s\n", tmpstr);
+ memset(tmpstr, '\0', sizeof(tmpstr));
}
}
if (i % 16 != 0)
{
for (j = i; j % 16 != 0; j++)
{
- fprintf (logfp, " ");
+ fprintf(logfp, " ");
if ((j - 7) % 16 == 0) // -8 + 1
- fprintf (logfp, " ");
+ fprintf(logfp, " ");
}
- fprintf (logfp, " %s\n", tmpstr);
+ fprintf(logfp, " %s\n", tmpstr);
}
- fprintf (logfp, "\n");
- fclose_ (logfp);
+ fprintf(logfp, "\n");
+ fclose_(logfp);
}
}
- login_log ("End of connection, unknown packet (ip: %s)\n", ip);
+ login_log("End of connection, unknown packet (ip: %s)\n", ip);
session[fd]->eof = 1;
return;
}
@@ -4101,15 +3918,15 @@ void parse_login (int fd)
// Reading Lan Support configuration
//----------------------------------
static
-int login_lan_config_read (const char *lancfgName)
+int login_lan_config_read(const char *lancfgName)
{
- int j;
+ int j;
struct hostent *h = NULL;
char line[1024], w1[1024], w2[1024];
FILE *fp;
// set default configuration
- strncpy (lan_char_ip, "127.0.0.1", sizeof (lan_char_ip));
+ strncpy(lan_char_ip, "127.0.0.1", sizeof(lan_char_ip));
subneti[0] = 127;
subneti[1] = 0;
subneti[2] = 0;
@@ -4117,35 +3934,34 @@ int login_lan_config_read (const char *lancfgName)
for (j = 0; j < 4; j++)
subnetmaski[j] = 255;
- fp = fopen_ (lancfgName, "r");
+ fp = fopen_(lancfgName, "r");
if (fp == NULL)
{
- printf
- ("***WARNING: LAN Support configuration file is not found: %s\n",
+ printf("***WARNING: LAN Support configuration file is not found: %s\n",
lancfgName);
return 1;
}
- printf ("---Start reading Lan Support configuration file\n");
+ printf("---Start reading Lan Support configuration file\n");
- while (fgets (line, sizeof (line) - 1, fp))
+ 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)
+ line[sizeof(line) - 1] = '\0';
+ if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
continue;
- remove_control_chars (w1);
- remove_control_chars (w2);
- if (strcasecmp (w1, "lan_char_ip") == 0)
+ remove_control_chars(w1);
+ remove_control_chars(w2);
+ if (strcasecmp(w1, "lan_char_ip") == 0)
{ // Read Char-Server Lan IP Address
- h = gethostbyname (w2);
+ h = gethostbyname(w2);
if (h != NULL)
{
- sprintf (lan_char_ip, "%d.%d.%d.%d",
+ sprintf(lan_char_ip, "%d.%d.%d.%d",
(unsigned char) h->h_addr[0],
(unsigned char) h->h_addr[1],
(unsigned char) h->h_addr[2],
@@ -4153,16 +3969,16 @@ int login_lan_config_read (const char *lancfgName)
}
else
{
- strncpy (lan_char_ip, w2, sizeof (lan_char_ip));
- lan_char_ip[sizeof (lan_char_ip) - 1] = '\0';
+ strncpy(lan_char_ip, w2, sizeof(lan_char_ip));
+ lan_char_ip[sizeof(lan_char_ip) - 1] = '\0';
}
- printf ("LAN IP of char-server: %s.\n", lan_char_ip);
+ printf("LAN IP of char-server: %s.\n", lan_char_ip);
}
- else if (strcasecmp (w1, "subnet") == 0)
+ else if (strcasecmp(w1, "subnet") == 0)
{ // Read Subnetwork
for (j = 0; j < 4; j++)
subneti[j] = 0;
- h = gethostbyname (w2);
+ h = gethostbyname(w2);
if (h != NULL)
{
for (j = 0; j < 4; j++)
@@ -4170,17 +3986,17 @@ int login_lan_config_read (const char *lancfgName)
}
else
{
- sscanf (w2, "%d.%d.%d.%d", &subneti[0], &subneti[1],
+ sscanf(w2, "%d.%d.%d.%d", &subneti[0], &subneti[1],
&subneti[2], &subneti[3]);
}
- printf ("Sub-network of the char-server: %d.%d.%d.%d.\n",
+ printf("Sub-network of the char-server: %d.%d.%d.%d.\n",
subneti[0], subneti[1], subneti[2], subneti[3]);
}
- else if (strcasecmp (w1, "subnetmask") == 0)
+ else if (strcasecmp(w1, "subnetmask") == 0)
{ // Read Subnetwork Mask
for (j = 0; j < 4; j++)
subnetmaski[j] = 255;
- h = gethostbyname (w2);
+ h = gethostbyname(w2);
if (h != NULL)
{
for (j = 0; j < 4; j++)
@@ -4188,21 +4004,20 @@ int login_lan_config_read (const char *lancfgName)
}
else
{
- sscanf (w2, "%d.%d.%d.%d", &subnetmaski[0], &subnetmaski[1],
+ sscanf(w2, "%d.%d.%d.%d", &subnetmaski[0], &subnetmaski[1],
&subnetmaski[2], &subnetmaski[3]);
}
- printf ("Sub-network mask of the char-server: %d.%d.%d.%d.\n",
+ printf("Sub-network mask of the char-server: %d.%d.%d.%d.\n",
subnetmaski[0], subnetmaski[1], subnetmaski[2],
subnetmaski[3]);
}
}
- fclose_ (fp);
+ fclose_(fp);
// log the LAN configuration
- login_log ("The LAN configuration of the server is set:\n");
- login_log ("- with LAN IP of char-server: %s.\n", lan_char_ip);
- login_log
- ("- with the sub-network of the char-server: %d.%d.%d.%d/%d.%d.%d.%d.\n",
+ login_log("The LAN configuration of the server is set:\n");
+ login_log("- with LAN IP of char-server: %s.\n", lan_char_ip);
+ login_log("- with the sub-network of the char-server: %d.%d.%d.%d/%d.%d.%d.%d.\n",
subneti[0], subneti[1], subneti[2], subneti[3],
subnetmaski[0], subnetmaski[1], subnetmaski[2], subnetmaski[3]);
@@ -4210,22 +4025,20 @@ int login_lan_config_read (const char *lancfgName)
{
unsigned int a0, a1, a2, a3;
unsigned char p[4];
- sscanf (lan_char_ip, "%d.%d.%d.%d", &a0, &a1, &a2, &a3);
+ sscanf(lan_char_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 char-server: ");
- if (lan_ip_check (p) == 0)
+ printf("LAN test of LAN IP of the char-server: ");
+ if (lan_ip_check(p) == 0)
{
- printf
- ("\033[1;31m***ERROR: LAN IP of the char-server doesn't belong to the specified Sub-network\033[0m\n");
- login_log
- ("***ERROR: LAN IP of the char-server doesn't belong to the specified Sub-network.\n");
+ printf("\033[1;31m***ERROR: LAN IP of the char-server doesn't belong to the specified Sub-network\033[0m\n");
+ login_log("***ERROR: LAN IP of the char-server doesn't belong to the specified Sub-network.\n");
}
}
- printf ("---End reading of Lan Support configuration file\n");
+ printf("---End reading of Lan Support configuration file\n");
return 0;
}
@@ -4234,58 +4047,58 @@ int login_lan_config_read (const char *lancfgName)
// Reading general configuration file
//-----------------------------------
static
-int login_config_read (const char *cfgName)
+int login_config_read(const char *cfgName)
{
char line[1024], w1[1024], w2[1024];
FILE *fp;
- fp = fopen_ (cfgName, "r");
+ fp = fopen_(cfgName, "r");
if (fp == NULL)
{
- printf ("Configuration file (%s) not found.\n", cfgName);
+ printf("Configuration file (%s) not found.\n", cfgName);
return 1;
}
- printf ("---Start reading of Login Server configuration file (%s)\n",
+ printf("---Start reading of Login Server configuration file (%s)\n",
cfgName);
- while (fgets (line, sizeof (line) - 1, fp))
+ 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)
+ line[sizeof(line) - 1] = '\0';
+ if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) == 2)
{
- remove_control_chars (w1);
- remove_control_chars (w2);
+ remove_control_chars(w1);
+ remove_control_chars(w2);
- if (strcasecmp (w1, "admin_state") == 0)
+ if (strcasecmp(w1, "admin_state") == 0)
{
admin_state = config_switch (w2);
}
- else if (strcasecmp (w1, "admin_pass") == 0)
+ else if (strcasecmp(w1, "admin_pass") == 0)
{
- strncpy (admin_pass, w2, sizeof (admin_pass));
- admin_pass[sizeof (admin_pass) - 1] = '\0';
+ strncpy(admin_pass, w2, sizeof(admin_pass));
+ admin_pass[sizeof(admin_pass) - 1] = '\0';
}
- else if (strcasecmp (w1, "ladminallowip") == 0)
+ else if (strcasecmp(w1, "ladminallowip") == 0)
{
- if (strcasecmp (w2, "clear") == 0)
+ if (strcasecmp(w2, "clear") == 0)
{
if (access_ladmin_allow)
- free (access_ladmin_allow);
+ free(access_ladmin_allow);
access_ladmin_allow = NULL;
access_ladmin_allownum = 0;
}
else
{
- if (strcasecmp (w2, "all") == 0)
+ if (strcasecmp(w2, "all") == 0)
{
// reset all previous values
if (access_ladmin_allow)
- free (access_ladmin_allow);
+ free(access_ladmin_allow);
// set to all
- CREATE (access_ladmin_allow, char, ACO_STRSIZE);
+ CREATE(access_ladmin_allow, char, ACO_STRSIZE);
access_ladmin_allownum = 1;
}
else if (w2[0]
@@ -4293,10 +4106,10 @@ int login_config_read (const char *cfgName)
&& access_ladmin_allow[0] == '\0'))
{ // don't add IP if already 'all'
if (access_ladmin_allow)
- RECREATE (access_ladmin_allow, char, (access_ladmin_allownum + 1) * ACO_STRSIZE);
+ RECREATE(access_ladmin_allow, char, (access_ladmin_allownum + 1) * ACO_STRSIZE);
else
- CREATE (access_ladmin_allow, char, ACO_STRSIZE);
- strncpy (access_ladmin_allow +
+ CREATE(access_ladmin_allow, char, ACO_STRSIZE);
+ strncpy(access_ladmin_allow +
(access_ladmin_allownum++) * ACO_STRSIZE, w2,
ACO_STRSIZE);
access_ladmin_allow[access_ladmin_allownum *
@@ -4304,132 +4117,131 @@ int login_config_read (const char *cfgName)
}
}
}
- else if (strcasecmp (w1, "gm_pass") == 0)
+ else if (strcasecmp(w1, "gm_pass") == 0)
{
- strncpy (gm_pass, w2, sizeof (gm_pass));
- gm_pass[sizeof (gm_pass) - 1] = '\0';
+ strncpy(gm_pass, w2, sizeof(gm_pass));
+ gm_pass[sizeof(gm_pass) - 1] = '\0';
}
- else if (strcasecmp (w1, "level_new_gm") == 0)
+ else if (strcasecmp(w1, "level_new_gm") == 0)
{
- level_new_gm = atoi (w2);
+ level_new_gm = atoi(w2);
}
- else if (strcasecmp (w1, "new_account") == 0)
+ else if (strcasecmp(w1, "new_account") == 0)
{
new_account_flag = config_switch (w2);
}
- else if (strcasecmp (w1, "login_port") == 0)
+ else if (strcasecmp(w1, "login_port") == 0)
{
- login_port = atoi (w2);
+ login_port = atoi(w2);
}
- else if (strcasecmp (w1, "account_filename") == 0)
+ else if (strcasecmp(w1, "account_filename") == 0)
{
- strncpy (account_filename, w2, sizeof (account_filename));
- account_filename[sizeof (account_filename) - 1] = '\0';
+ strncpy(account_filename, w2, sizeof(account_filename));
+ account_filename[sizeof(account_filename) - 1] = '\0';
}
- else if (strcasecmp (w1, "gm_account_filename") == 0)
+ else if (strcasecmp(w1, "gm_account_filename") == 0)
{
- strncpy (GM_account_filename, w2,
- sizeof (GM_account_filename));
- GM_account_filename[sizeof (GM_account_filename) - 1] = '\0';
+ strncpy(GM_account_filename, w2,
+ sizeof(GM_account_filename));
+ GM_account_filename[sizeof(GM_account_filename) - 1] = '\0';
}
- else if (strcasecmp (w1, "gm_account_filename_check_timer") == 0)
+ else if (strcasecmp(w1, "gm_account_filename_check_timer") == 0)
{
- gm_account_filename_check_timer = atoi (w2);
+ gm_account_filename_check_timer = atoi(w2);
}
- else if (strcasecmp (w1, "login_log_filename") == 0)
+ else if (strcasecmp(w1, "login_log_filename") == 0)
{
- strncpy (login_log_filename, w2, sizeof (login_log_filename));
- login_log_filename[sizeof (login_log_filename) - 1] = '\0';
+ strncpy(login_log_filename, w2, sizeof(login_log_filename));
+ login_log_filename[sizeof(login_log_filename) - 1] = '\0';
}
- else if (strcasecmp (w1, "login_log_unknown_packets_filename") == 0)
+ else if (strcasecmp(w1, "login_log_unknown_packets_filename") == 0)
{
- strncpy (login_log_unknown_packets_filename, w2,
- sizeof (login_log_unknown_packets_filename));
- login_log_unknown_packets_filename[sizeof
- (login_log_unknown_packets_filename)
+ strncpy(login_log_unknown_packets_filename, w2,
+ sizeof(login_log_unknown_packets_filename));
+ login_log_unknown_packets_filename[sizeof(login_log_unknown_packets_filename)
- 1] = '\0';
}
- else if (strcasecmp (w1, "save_unknown_packets") == 0)
+ else if (strcasecmp(w1, "save_unknown_packets") == 0)
{
save_unknown_packets = config_switch (w2);
}
- else if (strcasecmp (w1, "display_parse_login") == 0)
+ else if (strcasecmp(w1, "display_parse_login") == 0)
{
display_parse_login = config_switch (w2); // 0: no, 1: yes
}
- else if (strcasecmp (w1, "display_parse_admin") == 0)
+ else if (strcasecmp(w1, "display_parse_admin") == 0)
{
display_parse_admin = config_switch (w2); // 0: no, 1: yes
}
- else if (strcasecmp (w1, "display_parse_fromchar") == 0)
+ else if (strcasecmp(w1, "display_parse_fromchar") == 0)
{
display_parse_fromchar = config_switch (w2); // 0: no, 1: yes (without packet 0x2714), 2: all packets
}
- else if (strcasecmp (w1, "date_format") == 0)
+ else if (strcasecmp(w1, "date_format") == 0)
{ // note: never have more than 19 char for the date!
- switch (atoi (w2))
+ switch (atoi(w2))
{
case 0:
- strcpy (date_format, "%d-%m-%Y %H:%M:%S"); // 31-12-2004 23:59:59
+ strcpy(date_format, "%d-%m-%Y %H:%M:%S"); // 31-12-2004 23:59:59
break;
case 1:
- strcpy (date_format, "%m-%d-%Y %H:%M:%S"); // 12-31-2004 23:59:59
+ strcpy(date_format, "%m-%d-%Y %H:%M:%S"); // 12-31-2004 23:59:59
break;
case 2:
- strcpy (date_format, "%Y-%d-%m %H:%M:%S"); // 2004-31-12 23:59:59
+ strcpy(date_format, "%Y-%d-%m %H:%M:%S"); // 2004-31-12 23:59:59
break;
case 3:
- strcpy (date_format, "%Y-%m-%d %H:%M:%S"); // 2004-12-31 23:59:59
+ strcpy(date_format, "%Y-%m-%d %H:%M:%S"); // 2004-12-31 23:59:59
break;
}
}
- else if (strcasecmp (w1, "min_level_to_connect") == 0)
+ else if (strcasecmp(w1, "min_level_to_connect") == 0)
{
- min_level_to_connect = atoi (w2);
+ min_level_to_connect = atoi(w2);
}
- else if (strcasecmp (w1, "add_to_unlimited_account") == 0)
+ else if (strcasecmp(w1, "add_to_unlimited_account") == 0)
{
add_to_unlimited_account = config_switch (w2);
}
- else if (strcasecmp (w1, "start_limited_time") == 0)
+ else if (strcasecmp(w1, "start_limited_time") == 0)
{
- start_limited_time = atoi (w2);
+ start_limited_time = atoi(w2);
}
- else if (strcasecmp (w1, "check_ip_flag") == 0)
+ else if (strcasecmp(w1, "check_ip_flag") == 0)
{
check_ip_flag = config_switch (w2);
}
- else if (strcasecmp (w1, "order") == 0)
+ else if (strcasecmp(w1, "order") == 0)
{
- access_order = atoi (w2);
- if (strcasecmp (w2, "deny,allow") == 0 ||
- strcasecmp (w2, "deny, allow") == 0)
+ access_order = atoi(w2);
+ if (strcasecmp(w2, "deny,allow") == 0 ||
+ strcasecmp(w2, "deny, allow") == 0)
access_order = ACO_DENY_ALLOW;
- if (strcasecmp (w2, "allow,deny") == 0 ||
- strcasecmp (w2, "allow, deny") == 0)
+ if (strcasecmp(w2, "allow,deny") == 0 ||
+ strcasecmp(w2, "allow, deny") == 0)
access_order = ACO_ALLOW_DENY;
- if (strcasecmp (w2, "mutual-failture") == 0 ||
- strcasecmp (w2, "mutual-failure") == 0)
+ if (strcasecmp(w2, "mutual-failture") == 0 ||
+ strcasecmp(w2, "mutual-failure") == 0)
access_order = ACO_MUTUAL_FAILTURE;
}
- else if (strcasecmp (w1, "allow") == 0)
+ else if (strcasecmp(w1, "allow") == 0)
{
- if (strcasecmp (w2, "clear") == 0)
+ if (strcasecmp(w2, "clear") == 0)
{
if (access_allow)
- free (access_allow);
+ free(access_allow);
access_allow = NULL;
access_allownum = 0;
}
else
{
- if (strcasecmp (w2, "all") == 0)
+ if (strcasecmp(w2, "all") == 0)
{
// reset all previous values
if (access_allow)
- free (access_allow);
+ free(access_allow);
// set to all
- CREATE (access_allow, char, ACO_STRSIZE);
+ CREATE(access_allow, char, ACO_STRSIZE);
access_allownum = 1;
}
else if (w2[0]
@@ -4437,10 +4249,10 @@ int login_config_read (const char *cfgName)
&& access_allow[0] == '\0'))
{ // don't add IP if already 'all'
if (access_allow)
- RECREATE (access_allow, char, (access_allownum + 1) * ACO_STRSIZE);
+ RECREATE(access_allow, char, (access_allownum + 1) * ACO_STRSIZE);
else
- CREATE (access_allow, char, ACO_STRSIZE);
- strncpy (access_allow +
+ CREATE(access_allow, char, ACO_STRSIZE);
+ strncpy(access_allow +
(access_allownum++) * ACO_STRSIZE, w2,
ACO_STRSIZE);
access_allow[access_allownum * ACO_STRSIZE - 1] =
@@ -4448,24 +4260,24 @@ int login_config_read (const char *cfgName)
}
}
}
- else if (strcasecmp (w1, "deny") == 0)
+ else if (strcasecmp(w1, "deny") == 0)
{
- if (strcasecmp (w2, "clear") == 0)
+ if (strcasecmp(w2, "clear") == 0)
{
if (access_deny)
- free (access_deny);
+ free(access_deny);
access_deny = NULL;
access_denynum = 0;
}
else
{
- if (strcasecmp (w2, "all") == 0)
+ if (strcasecmp(w2, "all") == 0)
{
// reset all previous values
if (access_deny)
- free (access_deny);
+ free(access_deny);
// set to all
- CREATE (access_deny, char, ACO_STRSIZE);
+ CREATE(access_deny, char, ACO_STRSIZE);
access_denynum = 1;
}
else if (w2[0]
@@ -4473,45 +4285,45 @@ int login_config_read (const char *cfgName)
&& access_deny[0] == '\0'))
{ // don't add IP if already 'all'
if (access_deny)
- RECREATE (access_deny, char, (access_denynum + 1) * ACO_STRSIZE);
+ RECREATE(access_deny, char, (access_denynum + 1) * ACO_STRSIZE);
else
- CREATE (access_deny, char, ACO_STRSIZE);
- strncpy (access_deny +
+ CREATE(access_deny, char, ACO_STRSIZE);
+ strncpy(access_deny +
(access_denynum++) * ACO_STRSIZE, w2,
ACO_STRSIZE);
access_deny[access_denynum * ACO_STRSIZE - 1] = '\0';
}
}
}
- else if (strcasecmp (w1, "anti_freeze_enable") == 0)
+ else if (strcasecmp(w1, "anti_freeze_enable") == 0)
{
anti_freeze_enable = config_switch (w2);
}
- else if (strcasecmp (w1, "anti_freeze_interval") == 0)
+ else if (strcasecmp(w1, "anti_freeze_interval") == 0)
{
- ANTI_FREEZE_INTERVAL = atoi (w2);
+ ANTI_FREEZE_INTERVAL = atoi(w2);
if (ANTI_FREEZE_INTERVAL < 5)
ANTI_FREEZE_INTERVAL = 5; // minimum 5 seconds
}
- else if (strcasecmp (w1, "import") == 0)
+ else if (strcasecmp(w1, "import") == 0)
{
- login_config_read (w2);
+ login_config_read(w2);
}
- else if (strcasecmp (w1, "update_host") == 0)
+ else if (strcasecmp(w1, "update_host") == 0)
{
- strncpy (update_host, w2, sizeof (update_host));
- update_host[sizeof (update_host) - 1] = '\0';
+ strncpy(update_host, w2, sizeof(update_host));
+ update_host[sizeof(update_host) - 1] = '\0';
}
- else if (strcasecmp (w1, "main_server") == 0)
+ else if (strcasecmp(w1, "main_server") == 0)
{
- strncpy (main_server, w2, sizeof (main_server));
- main_server[sizeof (main_server) - 1] = '\0';
+ strncpy(main_server, w2, sizeof(main_server));
+ main_server[sizeof(main_server) - 1] = '\0';
}
}
}
- fclose_ (fp);
+ fclose_(fp);
- printf ("---End reading of Login Server configuration file.\n");
+ printf("---End reading of Login Server configuration file.\n");
return 0;
}
@@ -4520,12 +4332,11 @@ int login_config_read (const char *cfgName)
// Displaying of configuration warnings
//-------------------------------------
static
-void display_conf_warnings (void)
+void display_conf_warnings(void)
{
if (admin_state != 0 && admin_state != 1)
{
- printf
- ("***WARNING: Invalid value for admin_state parameter -> set to 0 (no remote admin).\n");
+ printf("***WARNING: Invalid value for admin_state parameter -> set to 0 (no remote admin).\n");
admin_state = 0;
}
@@ -4533,137 +4344,117 @@ void display_conf_warnings (void)
{
if (admin_pass[0] == '\0')
{
- printf
- ("***WARNING: Administrator password is void (admin_pass).\n");
+ printf("***WARNING: Administrator password is void (admin_pass).\n");
}
- else if (strcmp (admin_pass, "admin") == 0)
+ else if (strcmp(admin_pass, "admin") == 0)
{
- printf
- ("***WARNING: You are using the default administrator password (admin_pass).\n");
- printf (" We highly recommend that you change it.\n");
+ printf("***WARNING: You are using the default administrator password (admin_pass).\n");
+ printf(" We highly recommend that you change it.\n");
}
}
if (gm_pass[0] == '\0')
{
- printf ("***WARNING: 'To GM become' password is void (gm_pass).\n");
- printf
- (" We highly recommend that you set one password.\n");
+ printf("***WARNING: 'To GM become' password is void (gm_pass).\n");
+ printf(" We highly recommend that you set one password.\n");
}
- else if (strcmp (gm_pass, "gm") == 0)
+ else if (strcmp(gm_pass, "gm") == 0)
{
- printf
- ("***WARNING: You are using the default GM password (gm_pass).\n");
- printf (" We highly recommend that you change it.\n");
+ printf("***WARNING: You are using the default GM password (gm_pass).\n");
+ printf(" We highly recommend that you change it.\n");
}
if (level_new_gm < 0 || level_new_gm > 99)
{
- printf
- ("***WARNING: Invalid value for level_new_gm parameter -> set to 60 (default).\n");
+ printf("***WARNING: Invalid value for level_new_gm parameter -> set to 60 (default).\n");
level_new_gm = 60;
}
if (new_account_flag != 0 && new_account_flag != 1)
{
- printf
- ("***WARNING: Invalid value for new_account parameter -> set to 0 (no new account).\n");
+ printf("***WARNING: Invalid value for new_account parameter -> set to 0 (no new account).\n");
new_account_flag = 0;
}
if (login_port < 1024 || login_port > 65535)
{
- printf
- ("***WARNING: Invalid value for login_port parameter -> set to 6900 (default).\n");
+ printf("***WARNING: Invalid value for login_port parameter -> set to 6900 (default).\n");
login_port = 6900;
}
if (gm_account_filename_check_timer < 0)
{
- printf
- ("***WARNING: Invalid value for gm_account_filename_check_timer parameter.\n");
- printf (" -> set to 15 sec (default).\n");
+ printf("***WARNING: Invalid value for gm_account_filename_check_timer parameter.\n");
+ printf(" -> set to 15 sec (default).\n");
gm_account_filename_check_timer = 15;
}
else if (gm_account_filename_check_timer == 1)
{
- printf
- ("***WARNING: Invalid value for gm_account_filename_check_timer parameter.\n");
- printf (" -> set to 2 sec (minimum value).\n");
+ printf("***WARNING: Invalid value for gm_account_filename_check_timer parameter.\n");
+ printf(" -> set to 2 sec (minimum value).\n");
gm_account_filename_check_timer = 2;
}
if (save_unknown_packets != 0 && save_unknown_packets != 1)
{
- printf
- ("WARNING: Invalid value for save_unknown_packets parameter -> set to 0-no save.\n");
+ printf("WARNING: Invalid value for save_unknown_packets parameter -> set to 0-no save.\n");
save_unknown_packets = 0;
}
if (display_parse_login != 0 && display_parse_login != 1)
{ // 0: no, 1: yes
- printf
- ("***WARNING: Invalid value for display_parse_login parameter\n");
- printf (" -> set to 0 (no display).\n");
+ printf("***WARNING: Invalid value for display_parse_login parameter\n");
+ printf(" -> set to 0 (no display).\n");
display_parse_login = 0;
}
if (display_parse_admin != 0 && display_parse_admin != 1)
{ // 0: no, 1: yes
- printf
- ("***WARNING: Invalid value for display_parse_admin parameter\n");
- printf (" -> set to 0 (no display).\n");
+ printf("***WARNING: Invalid value for display_parse_admin parameter\n");
+ printf(" -> set to 0 (no display).\n");
display_parse_admin = 0;
}
if (display_parse_fromchar < 0 || display_parse_fromchar > 2)
{ // 0: no, 1: yes (without packet 0x2714), 2: all packets
- printf
- ("***WARNING: Invalid value for display_parse_fromchar parameter\n");
- printf (" -> set to 0 (no display).\n");
+ printf("***WARNING: Invalid value for display_parse_fromchar parameter\n");
+ printf(" -> set to 0 (no display).\n");
display_parse_fromchar = 0;
}
if (min_level_to_connect < 0)
{ // 0: all players, 1-99 at least gm level x
- printf
- ("***WARNING: Invalid value for min_level_to_connect (%d) parameter\n",
+ printf("***WARNING: Invalid value for min_level_to_connect (%d) parameter\n",
min_level_to_connect);
- printf (" -> set to 0 (any player).\n");
+ printf(" -> set to 0 (any player).\n");
min_level_to_connect = 0;
}
else if (min_level_to_connect > 99)
{ // 0: all players, 1-99 at least gm level x
- printf
- ("***WARNING: Invalid value for min_level_to_connect (%d) parameter\n",
+ printf("***WARNING: Invalid value for min_level_to_connect (%d) parameter\n",
min_level_to_connect);
- printf (" -> set to 99 (only GM level 99).\n");
+ printf(" -> set to 99 (only GM level 99).\n");
min_level_to_connect = 99;
}
if (add_to_unlimited_account != 0 && add_to_unlimited_account != 1)
{ // 0: no, 1: yes
- printf
- ("***WARNING: Invalid value for add_to_unlimited_account parameter\n");
- printf
- (" -> set to 0 (impossible to add a time to an unlimited account).\n");
+ printf("***WARNING: Invalid value for add_to_unlimited_account parameter\n");
+ printf(" -> set to 0 (impossible to add a time to an unlimited account).\n");
add_to_unlimited_account = 0;
}
if (start_limited_time < -1)
{ // -1: create unlimited account, 0 or more: additionnal sec from now to create limited time
- printf
- ("***WARNING: Invalid value for start_limited_time parameter\n");
- printf
- (" -> set to -1 (new accounts are created with unlimited time).\n");
+ printf("***WARNING: Invalid value for start_limited_time parameter\n");
+ printf(" -> set to -1 (new accounts are created with unlimited time).\n");
start_limited_time = -1;
}
if (check_ip_flag != 0 && check_ip_flag != 1)
{ // 0: no, 1: yes
- printf ("***WARNING: Invalid value for check_ip_flag parameter\n");
- printf
- (" -> set to 1 (check players ip between login-server & char-server).\n");
+ printf("***WARNING: Invalid value for check_ip_flag parameter\n");
+ printf(" -> set to 1 (check players ip between login-server & char-server).\n");
check_ip_flag = 1;
}
@@ -4671,36 +4462,31 @@ void display_conf_warnings (void)
{
if (access_denynum == 1 && access_deny[0] == '\0')
{
- printf
- ("***WARNING: The IP security order is 'deny,allow' (allow if not deny).\n");
- printf (" And you refuse ALL IP.\n");
+ printf("***WARNING: The IP security order is 'deny,allow' (allow if not deny).\n");
+ printf(" And you refuse ALL IP.\n");
}
}
else if (access_order == ACO_ALLOW_DENY)
{
if (access_allownum == 0)
{
- printf
- ("***WARNING: The IP security order is 'allow,deny' (deny if not allow).\n");
- printf (" But, NO IP IS AUTHORISED!\n");
+ printf("***WARNING: The IP security order is 'allow,deny' (deny if not allow).\n");
+ printf(" But, NO IP IS AUTHORISED!\n");
}
}
else
{ // ACO_MUTUAL_FAILTURE
if (access_allownum == 0)
{
- printf
- ("***WARNING: The IP security order is 'mutual-failture'\n");
- printf
- (" (allow if in the allow list and not in the deny list).\n");
- printf (" But, NO IP IS AUTHORISED!\n");
+ printf("***WARNING: The IP security order is 'mutual-failture'\n");
+ printf(" (allow if in the allow list and not in the deny list).\n");
+ printf(" But, NO IP IS AUTHORISED!\n");
}
else if (access_denynum == 1 && access_deny[0] == '\0')
{
- printf ("***WARNING: The IP security order is mutual-failture\n");
- printf
- (" (allow if in the allow list and not in the deny list).\n");
- printf (" But, you refuse ALL IP!\n");
+ printf("***WARNING: The IP security order is mutual-failture\n");
+ printf(" (allow if in the allow list and not in the deny list).\n");
+ printf(" But, you refuse ALL IP!\n");
}
}
@@ -4711,195 +4497,178 @@ void display_conf_warnings (void)
// Save configuration in log file
//-------------------------------
static
-void save_config_in_log (void)
+void save_config_in_log(void)
{
- int i;
+ int i;
// a newline in the log...
- login_log ("");
- login_log ("The login-server starting...\n");
+ login_log("");
+ login_log("The login-server starting...\n");
// save configuration in log file
- login_log ("The configuration of the server is set:\n");
+ login_log("The configuration of the server is set:\n");
if (admin_state != 1)
- login_log ("- with no remote administration.\n");
+ login_log("- with no remote administration.\n");
else if (admin_pass[0] == '\0')
- login_log ("- with a remote administration with a VOID password.\n");
- else if (strcmp (admin_pass, "admin") == 0)
- login_log ("- with a remote administration with the DEFAULT password.\n");
+ login_log("- with a remote administration with a VOID password.\n");
+ else if (strcmp(admin_pass, "admin") == 0)
+ login_log("- with a remote administration with the DEFAULT password.\n");
else
- login_log
- ("- with a remote administration with the password of %d character(s).\n",
- strlen (admin_pass));
+ login_log("- with a remote administration with the password of %d character(s).\n",
+ strlen(admin_pass));
if (access_ladmin_allownum == 0
|| (access_ladmin_allownum == 1 && access_ladmin_allow[0] == '\0'))
{
- login_log ("- to accept any IP for remote administration\n");
+ login_log("- to accept any IP for remote administration\n");
}
else
{
- login_log ("- to accept following IP for remote administration:\n");
+ login_log("- to accept following IP for remote administration:\n");
for (i = 0; i < access_ladmin_allownum; i++)
- login_log (" %s\n",
- (char *) (access_ladmin_allow + i * ACO_STRSIZE));
+ login_log(" %s\n",
+ (char *)(access_ladmin_allow + i * ACO_STRSIZE));
}
if (gm_pass[0] == '\0')
- login_log ("- with a VOID 'To GM become' password (gm_pass).\n");
- else if (strcmp (gm_pass, "gm") == 0)
- login_log ("- with the DEFAULT 'To GM become' password (gm_pass).\n");
+ login_log("- with a VOID 'To GM become' password (gm_pass).\n");
+ else if (strcmp(gm_pass, "gm") == 0)
+ login_log("- with the DEFAULT 'To GM become' password (gm_pass).\n");
else
- login_log
- ("- with a 'To GM become' password (gm_pass) of %d character(s).\n",
- strlen (gm_pass));
+ login_log("- with a 'To GM become' password (gm_pass) of %d character(s).\n",
+ strlen(gm_pass));
if (level_new_gm == 0)
- login_log ("- to refuse any creation of GM with @gm.\n");
+ login_log("- to refuse any creation of GM with @gm.\n");
else
- login_log ("- to create GM with level '%d' when @gm is used.\n",
+ login_log("- to create GM with level '%d' when @gm is used.\n",
level_new_gm);
if (new_account_flag == 1)
- login_log ("- to ALLOW new users (with _F/_M).\n");
+ login_log("- to ALLOW new users (with _F/_M).\n");
else
- login_log ("- to NOT ALLOW new users (with _F/_M).\n");
- login_log ("- with port: %d.\n", login_port);
- login_log ("- with the accounts file name: '%s'.\n",
+ login_log("- to NOT ALLOW new users (with _F/_M).\n");
+ login_log("- with port: %d.\n", login_port);
+ login_log("- with the accounts file name: '%s'.\n",
account_filename);
- login_log ("- with the GM accounts file name: '%s'.\n",
+ login_log("- with the GM accounts file name: '%s'.\n",
GM_account_filename);
if (gm_account_filename_check_timer == 0)
- login_log ("- to NOT check GM accounts file modifications.\n");
+ login_log("- to NOT check GM accounts file modifications.\n");
else
- login_log
- ("- to check GM accounts file modifications every %d seconds.\n",
+ login_log("- to check GM accounts file modifications every %d seconds.\n",
gm_account_filename_check_timer);
// not necessary to log the 'login_log_filename', we are inside :)
- login_log ("- with the unknown packets file name: '%s'.\n",
+ login_log("- with the unknown packets file name: '%s'.\n",
login_log_unknown_packets_filename);
if (save_unknown_packets)
- login_log ("- to SAVE all unkown packets.\n");
+ login_log("- to SAVE all unkown packets.\n");
else
- login_log
- ("- to SAVE only unkown packets sending by a char-server or a remote administration.\n");
+ login_log("- to SAVE only unkown packets sending by a char-server or a remote administration.\n");
if (display_parse_login)
- login_log ("- to display normal parse packets on console.\n");
+ login_log("- to display normal parse packets on console.\n");
else
- login_log ("- to NOT display normal parse packets on console.\n");
+ login_log("- to NOT display normal parse packets on console.\n");
if (display_parse_admin)
- login_log ("- to display administration parse packets on console.\n");
+ login_log("- to display administration parse packets on console.\n");
else
- login_log ("- to NOT display administration parse packets on console.\n");
+ login_log("- to NOT display administration parse packets on console.\n");
if (display_parse_fromchar)
- login_log ("- to display char-server parse packets on console.\n");
+ login_log("- to display char-server parse packets on console.\n");
else
- login_log ("- to NOT display char-server parse packets on console.\n");
+ login_log("- to NOT display char-server parse packets on console.\n");
if (min_level_to_connect == 0) // 0: all players, 1-99 at least gm level x
- login_log ("- with no minimum level for connection.\n");
+ login_log("- with no minimum level for connection.\n");
else if (min_level_to_connect == 99)
- login_log ("- to accept only GM with level 99.\n");
+ login_log("- to accept only GM with level 99.\n");
else
- login_log ("- to accept only GM with level %d or more.\n",
+ login_log("- to accept only GM with level %d or more.\n",
min_level_to_connect);
if (add_to_unlimited_account)
- login_log
- ("- to authorize adjustment (with timeadd ladmin) on an unlimited account.\n");
+ login_log("- to authorize adjustment (with timeadd ladmin) on an unlimited account.\n");
else
- login_log
- ("- to refuse adjustment (with timeadd ladmin) on an unlimited account. You must use timeset (ladmin command) before.\n");
+ login_log("- to refuse adjustment (with timeadd ladmin) on an unlimited account. You must use timeset (ladmin command) before.\n");
if (start_limited_time < 0)
- login_log ("- to create new accounts with an unlimited time.\n");
+ login_log("- to create new accounts with an unlimited time.\n");
else if (start_limited_time == 0)
- login_log
- ("- to create new accounts with a limited time: time of creation.\n");
+ login_log("- to create new accounts with a limited time: time of creation.\n");
else
- login_log
- ("- to create new accounts with a limited time: time of creation + %d second(s).\n",
+ login_log("- to create new accounts with a limited time: time of creation + %d second(s).\n",
start_limited_time);
if (check_ip_flag)
- login_log
- ("- with control of players IP between login-server and char-server.\n");
+ login_log("- with control of players IP between login-server and char-server.\n");
else
- login_log
- ("- to not check players IP between login-server and char-server.\n");
+ login_log("- to not check players IP between login-server and char-server.\n");
if (access_order == ACO_DENY_ALLOW)
{
if (access_denynum == 0)
{
- login_log
- ("- with the IP security order: 'deny,allow' (allow if not deny). You refuse no IP.\n");
+ login_log("- with the IP security order: 'deny,allow' (allow if not deny). You refuse no IP.\n");
}
else if (access_denynum == 1 && access_deny[0] == '\0')
{
- login_log
- ("- with the IP security order: 'deny,allow' (allow if not deny). You refuse ALL IP.\n");
+ login_log("- with the IP security order: 'deny,allow' (allow if not deny). You refuse ALL IP.\n");
}
else
{
- login_log
- ("- with the IP security order: 'deny,allow' (allow if not deny). Refused IP are:\n");
+ login_log("- with the IP security order: 'deny,allow' (allow if not deny). Refused IP are:\n");
for (i = 0; i < access_denynum; i++)
- login_log (" %s\n",
- (char *) (access_deny + i * ACO_STRSIZE));
+ login_log(" %s\n",
+ (char *)(access_deny + i * ACO_STRSIZE));
}
}
else if (access_order == ACO_ALLOW_DENY)
{
if (access_allownum == 0)
{
- login_log
- ("- with the IP security order: 'allow,deny' (deny if not allow). But, NO IP IS AUTHORISED!\n");
+ login_log("- with the IP security order: 'allow,deny' (deny if not allow). But, NO IP IS AUTHORISED!\n");
}
else if (access_allownum == 1 && access_allow[0] == '\0')
{
- login_log
- ("- with the IP security order: 'allow,deny' (deny if not allow). You authorise ALL IP.\n");
+ login_log("- with the IP security order: 'allow,deny' (deny if not allow). You authorise ALL IP.\n");
}
else
{
- login_log
- ("- with the IP security order: 'allow,deny' (deny if not allow). Authorised IP are:\n");
+ login_log("- with the IP security order: 'allow,deny' (deny if not allow). Authorised IP are:\n");
for (i = 0; i < access_allownum; i++)
- login_log (" %s\n",
- (char *) (access_allow + i * ACO_STRSIZE));
+ login_log(" %s\n",
+ (char *)(access_allow + i * ACO_STRSIZE));
}
}
else
{ // ACO_MUTUAL_FAILTURE
- login_log
- ("- with the IP security order: 'mutual-failture' (allow if in the allow list and not in the deny list).\n");
+ login_log("- with the IP security order: 'mutual-failture' (allow if in the allow list and not in the deny list).\n");
if (access_allownum == 0)
{
- login_log (" But, NO IP IS AUTHORISED!\n");
+ login_log(" But, NO IP IS AUTHORISED!\n");
}
else if (access_denynum == 1 && access_deny[0] == '\0')
{
- login_log (" But, you refuse ALL IP!\n");
+ login_log(" But, you refuse ALL IP!\n");
}
else
{
if (access_allownum == 1 && access_allow[0] == '\0')
{
- login_log (" You authorise ALL IP.\n");
+ login_log(" You authorise ALL IP.\n");
}
else
{
- login_log (" Authorised IP are:\n");
+ login_log(" Authorised IP are:\n");
for (i = 0; i < access_allownum; i++)
- login_log (" %s\n",
- (char *) (access_allow + i * ACO_STRSIZE));
+ login_log(" %s\n",
+ (char *)(access_allow + i * ACO_STRSIZE));
}
- login_log (" Refused IP are:\n");
+ login_log(" Refused IP are:\n");
for (i = 0; i < access_denynum; i++)
- login_log (" %s\n",
- (char *) (access_deny + i * ACO_STRSIZE));
+ login_log(" %s\n",
+ (char *)(access_deny + i * ACO_STRSIZE));
}
}
}
@@ -4907,60 +4676,59 @@ void save_config_in_log (void)
//--------------------------------------
// Function called at exit of the server
//--------------------------------------
-void term_func (void)
+void term_func(void)
{
- int i, fd;
+ int i, fd;
- mmo_auth_sync ();
+ mmo_auth_sync();
- free (auth_dat);
- free (gm_account_db);
+ free(auth_dat);
+ free(gm_account_db);
for (i = 0; i < MAX_SERVERS; i++)
{
if ((fd = server_fd[i]) >= 0)
- delete_session (fd);
+ delete_session(fd);
}
- delete_session (login_fd);
+ delete_session(login_fd);
- login_log
- ("----End of login-server (normal end with closing of all files).\n");
+ login_log("----End of login-server (normal end with closing of all files).\n");
}
//------------------------------
// Main function of login-server
//------------------------------
-int do_init (int argc, char **argv)
+int do_init(int argc, char **argv)
{
- int i, j;
+ int i, j;
// read login-server configuration
- login_config_read ((argc > 1) ? argv[1] : LOGIN_CONF_NAME);
- display_conf_warnings (); // not in login_config_read, because we can use 'import' option, and display same message twice or more
- save_config_in_log (); // not before, because log file name can be changed
- login_lan_config_read ((argc > 1) ? argv[1] : LAN_CONF_NAME);
+ login_config_read((argc > 1) ? argv[1] : LOGIN_CONF_NAME);
+ display_conf_warnings(); // not in login_config_read, because we can use 'import' option, and display same message twice or more
+ save_config_in_log(); // not before, because log file name can be changed
+ login_lan_config_read((argc > 1) ? argv[1] : LAN_CONF_NAME);
for (i = 0; i < AUTH_FIFO_SIZE; i++)
auth_fifo[i].delflag = 1;
for (i = 0; i < MAX_SERVERS; i++)
server_fd[i] = -1;
- gm_account_db = numdb_init ();
+ gm_account_db = numdb_init();
- read_gm_account ();
- mmo_auth_init ();
+ read_gm_account();
+ mmo_auth_init();
// set_termfunc (mmo_auth_sync);
- set_defaultparse (parse_login);
- login_fd = make_listen_port (login_port);
+ set_defaultparse(parse_login);
+ login_fd = make_listen_port(login_port);
// add_timer_func_list (check_auth_sync, "check_auth_sync");
// Trigger auth sync every 5 minutes
- i = add_timer_interval (gettick () + 300000, check_auth_sync, 0, 0, 300000);
+ i = add_timer_interval(gettick() + 300000, check_auth_sync, 0, 0, 300000);
if (anti_freeze_enable > 0)
{
// add_timer_func_list (char_anti_freeze_system, "char_anti_freeze_system");
- i = add_timer_interval (gettick () + 1000, char_anti_freeze_system, 0,
+ i = add_timer_interval(gettick() + 1000, char_anti_freeze_system, 0,
0, ANTI_FREEZE_INTERVAL * 1000);
}
@@ -4969,14 +4737,12 @@ int do_init (int argc, char **argv)
if (j == 0) // if we would not to check, we check every 60 sec, just to have timer (if we change timer, is was not necessary to check if timer already exists)
j = 60;
// add_timer_func_list (check_GM_file, "check_GM_file");
- i = add_timer_interval (gettick () + j * 1000, check_GM_file, 0, 0, j * 1000); // every x sec we check if gm file has been changed
+ i = add_timer_interval(gettick() + j * 1000, check_GM_file, 0, 0, j * 1000); // every x sec we check if gm file has been changed
- login_log
- ("The login-server is ready (Server is listening on the port %d).\n",
+ login_log("The login-server is ready (Server is listening on the port %d).\n",
login_port);
- printf
- ("The login-server is \033[1;32mready\033[0m (Server is listening on the port %d).\n\n",
+ printf("The login-server is \033[1;32mready\033[0m (Server is listening on the port %d).\n\n",
login_port);
return 0;