From 55152d7e642eac14f8ca848a593a17bbf1b57334 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Jan 2018 01:39:37 +0300 Subject: Add loginlog_ prefix to all functions in loginlog.c --- src/login/lclif.c | 2 +- src/login/login.c | 12 ++++++------ src/login/loginlog.c | 2 +- src/login/loginlog.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/login/lclif.c b/src/login/lclif.c index 1870f9bc9..d03f2fbe7 100644 --- a/src/login/lclif.c +++ b/src/login/lclif.c @@ -375,7 +375,7 @@ int lclif_parse(int fd) // Perform ip-ban check if (login->config->ipban && !sockt->trusted_ip_check(ipl) && ipban_check(ipl)) { ShowStatus("Connection refused: IP isn't authorized (deny/allow, ip: %s).\n", ip); - login_log(ipl, "unknown", -3, "ip banned"); + loginlog_log(ipl, "unknown", -3, "ip banned"); lclif->login_error(fd, 3); // 3 = Rejected from Server sockt->eof(fd); return 0; diff --git a/src/login/login.c b/src/login/login.c index 0b540d95a..7cbb14db2 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -725,7 +725,7 @@ bool login_fromchar_parse_wrong_pincode(int fd) return true; } - login_log(sockt->host2ip(acc.last_ip), acc.userid, 100, "PIN Code check failed"); // FIXME: Do we really want to log this with the same code as successful logins? + loginlog_log(sockt->host2ip(acc.last_ip), acc.userid, 100, "PIN Code check failed"); // FIXME: Do we really want to log this with the same code as successful logins? } login->remove_online_user(acc.account_id); @@ -1258,7 +1258,7 @@ void login_auth_ok(struct login_session_data* sd) return; } - login_log(ip, sd->userid, 100, "login ok"); + loginlog_log(ip, sd->userid, 100, "login ok"); ShowStatus("Connection of the account '%s' accepted.\n", sd->userid); // create temporary auth entry @@ -1322,7 +1322,7 @@ void login_auth_failed(struct login_session_data *sd, int result) default : error = "Unknown Error."; break; } - login_log(ip, sd->userid, result, error); // FIXME: result can be 100, conflicting with the value 100 we use for successful login... + loginlog_log(ip, sd->userid, result, error); // FIXME: result can be 100, conflicting with the value 100 we use for successful login... } if (result == 1 && login->config->dynamic_pass_failure_ban && !sockt->trusted_ip_check(ip)) @@ -1430,7 +1430,7 @@ void login_parse_request_connection(int fd, struct login_session_data* sd, const ShowInfo("Connection request of the char-server '%s' @ %u.%u.%u.%u:%u (account: '%s', pass: '%s', ip: '%s')\n", server_name, CONVIP(server_ip), server_port, sd->userid, sd->passwd, ip); sprintf(message, "charserver - %s@%u.%u.%u.%u:%u", server_name, CONVIP(server_ip), server_port); - login_log(sockt->session[fd]->client_addr, sd->userid, 100, message); + loginlog_log(sockt->session[fd]->client_addr, sd->userid, 100, message); result = login->mmo_auth(sd, true); if (core->runflag == LOGINSERVER_ST_RUNNING && @@ -1973,7 +1973,7 @@ int do_final(void) login->clear_client_hash_nodes(); login->clear_dnsbl_servers(); - login_log(0, "login server", 100, "login server shutdown"); + loginlog_log(0, "login server", 100, "login server shutdown"); if (login->config->log_login) loginlog_final(); @@ -2196,7 +2196,7 @@ int do_init(int argc, char** argv) #endif // CONSOLE_INPUT ShowStatus("The login-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %u).\n\n", login->config->login_port); - login_log(0, "login server", 100, "login server started"); + loginlog_log(0, "login server", 100, "login server started"); HPM->event(HPET_READY); diff --git a/src/login/loginlog.c b/src/login/loginlog.c index 7dff14990..90dc3fde8 100644 --- a/src/login/loginlog.c +++ b/src/login/loginlog.c @@ -73,7 +73,7 @@ unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes) * Records an event in the login log *---------------------------------------------*/ // TODO: add an enum of rcode values -void login_log(uint32 ip, const char* username, int rcode, const char* message) +void loginlog_log(uint32 ip, const char* username, int rcode, const char* message) { char esc_username[NAME_LENGTH*2+1]; char esc_message[255*2+1]; diff --git a/src/login/loginlog.h b/src/login/loginlog.h index 589bc4fa1..8153dd769 100644 --- a/src/login/loginlog.h +++ b/src/login/loginlog.h @@ -26,7 +26,7 @@ #ifdef HERCULES_CORE // TODO: Interface unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes); -void login_log(uint32 ip, const char* username, int rcode, const char* message); +void loginlog_log(uint32 ip, const char* username, int rcode, const char* message); bool loginlog_init(void); bool loginlog_final(void); bool loginlog_config_read(const char *filename, bool imported); -- cgit v1.2.3-60-g2f50