From b11bf6e1604097711291265f927e79e8f2af5c54 Mon Sep 17 00:00:00 2001 From: greenboxal2 Date: Sun, 25 Nov 2012 21:20:43 +0000 Subject: Applied AStyle code formating as discussed on tid:74602. Removed /SAFESEH option from MSVC11 projects. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16968 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/login/ipban_sql.c | 340 +++++++++++++++++++++++--------------------------- 1 file changed, 159 insertions(+), 181 deletions(-) (limited to 'src/login/ipban_sql.c') diff --git a/src/login/ipban_sql.c b/src/login/ipban_sql.c index c75a1f956..eec9a98be 100644 --- a/src/login/ipban_sql.c +++ b/src/login/ipban_sql.c @@ -31,7 +31,7 @@ static char ipban_codepage[32] = ""; static char ipban_table[32] = "ipbanlist"; // globals -static Sql* sql_handle = NULL; +static Sql *sql_handle = NULL; static int cleanup_timer_id = INVALID_TIMER; static bool ipban_inited = false; @@ -41,218 +41,196 @@ int ipban_cleanup(int tid, unsigned int tick, int id, intptr_t data); // initialize void ipban_init(void) { - const char* username; - const char* password; - const char* hostname; - uint16 port; - const char* database; - const char* codepage; - - ipban_inited = true; - - if( !login_config.ipban ) - return;// ipban disabled - - if( ipban_db_hostname[0] != '\0' ) - {// local settings - username = ipban_db_username; - password = ipban_db_password; - hostname = ipban_db_hostname; - port = ipban_db_port; - database = ipban_db_database; - codepage = ipban_codepage; - } - else - {// global settings - username = global_db_username; - password = global_db_password; - hostname = global_db_hostname; - port = global_db_port; - database = global_db_database; - codepage = global_codepage; - } - - // establish connections - sql_handle = Sql_Malloc(); - if( SQL_ERROR == Sql_Connect(sql_handle, username, password, hostname, port, database) ) - { - Sql_ShowDebug(sql_handle); - Sql_Free(sql_handle); - exit(EXIT_FAILURE); - } - if( codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(sql_handle, codepage) ) - Sql_ShowDebug(sql_handle); - - if( login_config.ipban_cleanup_interval > 0 ) - { // set up periodic cleanup of connection history and active bans - add_timer_func_list(ipban_cleanup, "ipban_cleanup"); - cleanup_timer_id = add_timer_interval(gettick()+10, ipban_cleanup, 0, 0, login_config.ipban_cleanup_interval*1000); - } else // make sure it gets cleaned up on login-server start regardless of interval-based cleanups - ipban_cleanup(0,0,0,0); + const char *username; + const char *password; + const char *hostname; + uint16 port; + const char *database; + const char *codepage; + + ipban_inited = true; + + if (!login_config.ipban) + return;// ipban disabled + + if (ipban_db_hostname[0] != '\0') { + // local settings + username = ipban_db_username; + password = ipban_db_password; + hostname = ipban_db_hostname; + port = ipban_db_port; + database = ipban_db_database; + codepage = ipban_codepage; + } else { + // global settings + username = global_db_username; + password = global_db_password; + hostname = global_db_hostname; + port = global_db_port; + database = global_db_database; + codepage = global_codepage; + } + + // establish connections + sql_handle = Sql_Malloc(); + if (SQL_ERROR == Sql_Connect(sql_handle, username, password, hostname, port, database)) { + Sql_ShowDebug(sql_handle); + Sql_Free(sql_handle); + exit(EXIT_FAILURE); + } + if (codepage[0] != '\0' && SQL_ERROR == Sql_SetEncoding(sql_handle, codepage)) + Sql_ShowDebug(sql_handle); + + if (login_config.ipban_cleanup_interval > 0) { + // set up periodic cleanup of connection history and active bans + add_timer_func_list(ipban_cleanup, "ipban_cleanup"); + cleanup_timer_id = add_timer_interval(gettick()+10, ipban_cleanup, 0, 0, login_config.ipban_cleanup_interval*1000); + } else // make sure it gets cleaned up on login-server start regardless of interval-based cleanups + ipban_cleanup(0,0,0,0); } // finalize void ipban_final(void) { - if( !login_config.ipban ) - return;// ipban disabled - - if( login_config.ipban_cleanup_interval > 0 ) - // release data - delete_timer(cleanup_timer_id, ipban_cleanup); - - ipban_cleanup(0,0,0,0); // always clean up on login-server stop - - // close connections - Sql_Free(sql_handle); - sql_handle = NULL; + if (!login_config.ipban) + return;// ipban disabled + + if (login_config.ipban_cleanup_interval > 0) + // release data + delete_timer(cleanup_timer_id, ipban_cleanup); + + ipban_cleanup(0,0,0,0); // always clean up on login-server stop + + // close connections + Sql_Free(sql_handle); + sql_handle = NULL; } // load configuration options -bool ipban_config_read(const char* key, const char* value) +bool ipban_config_read(const char *key, const char *value) { - const char* signature; - - if( ipban_inited ) - return false;// settings can only be changed before init - - signature = "sql."; - if( strncmpi(key, signature, strlen(signature)) == 0 ) - { - key += strlen(signature); - if( strcmpi(key, "db_hostname") == 0 ) - safestrncpy(global_db_hostname, value, sizeof(global_db_hostname)); - else - if( strcmpi(key, "db_port") == 0 ) - global_db_port = (uint16)strtoul(value, NULL, 10); - else - if( strcmpi(key, "db_username") == 0 ) - safestrncpy(global_db_username, value, sizeof(global_db_username)); - else - if( strcmpi(key, "db_password") == 0 ) - safestrncpy(global_db_password, value, sizeof(global_db_password)); - else - if( strcmpi(key, "db_database") == 0 ) - safestrncpy(global_db_database, value, sizeof(global_db_database)); - else - if( strcmpi(key, "codepage") == 0 ) - safestrncpy(global_codepage, value, sizeof(global_codepage)); - else - return false;// not found - return true; - } - - signature = "ipban.sql."; - if( strncmpi(key, signature, strlen(signature)) == 0 ) - { - key += strlen(signature); - if( strcmpi(key, "db_hostname") == 0 ) - safestrncpy(ipban_db_hostname, value, sizeof(ipban_db_hostname)); - else - if( strcmpi(key, "db_port") == 0 ) - ipban_db_port = (uint16)strtoul(value, NULL, 10); - else - if( strcmpi(key, "db_username") == 0 ) - safestrncpy(ipban_db_username, value, sizeof(ipban_db_username)); - else - if( strcmpi(key, "db_password") == 0 ) - safestrncpy(ipban_db_password, value, sizeof(ipban_db_password)); - else - if( strcmpi(key, "db_database") == 0 ) - safestrncpy(ipban_db_database, value, sizeof(ipban_db_database)); - else - if( strcmpi(key, "codepage") == 0 ) - safestrncpy(ipban_codepage, value, sizeof(ipban_codepage)); - else - if( strcmpi(key, "ipban_table") == 0 ) - safestrncpy(ipban_table, value, sizeof(ipban_table)); - else - return false;// not found - return true; - } - - signature = "ipban."; - if( strncmpi(key, signature, strlen(signature)) == 0 ) - { - key += strlen(signature); - if( strcmpi(key, "enable") == 0 ) - login_config.ipban = (bool)config_switch(value); - else - if( strcmpi(key, "dynamic_pass_failure_ban") == 0 ) - login_config.dynamic_pass_failure_ban = (bool)config_switch(value); - else - if( strcmpi(key, "dynamic_pass_failure_ban_interval") == 0 ) - login_config.dynamic_pass_failure_ban_interval = atoi(value); - else - if( strcmpi(key, "dynamic_pass_failure_ban_limit") == 0 ) - login_config.dynamic_pass_failure_ban_limit = atoi(value); - else - if( strcmpi(key, "dynamic_pass_failure_ban_duration") == 0 ) - login_config.dynamic_pass_failure_ban_duration = atoi(value); - else - return false;// not found - return true; - } - - return false;// not found + const char *signature; + + if (ipban_inited) + return false;// settings can only be changed before init + + signature = "sql."; + if (strncmpi(key, signature, strlen(signature)) == 0) { + key += strlen(signature); + if (strcmpi(key, "db_hostname") == 0) + safestrncpy(global_db_hostname, value, sizeof(global_db_hostname)); + else if (strcmpi(key, "db_port") == 0) + global_db_port = (uint16)strtoul(value, NULL, 10); + else if (strcmpi(key, "db_username") == 0) + safestrncpy(global_db_username, value, sizeof(global_db_username)); + else if (strcmpi(key, "db_password") == 0) + safestrncpy(global_db_password, value, sizeof(global_db_password)); + else if (strcmpi(key, "db_database") == 0) + safestrncpy(global_db_database, value, sizeof(global_db_database)); + else if (strcmpi(key, "codepage") == 0) + safestrncpy(global_codepage, value, sizeof(global_codepage)); + else + return false;// not found + return true; + } + + signature = "ipban.sql."; + if (strncmpi(key, signature, strlen(signature)) == 0) { + key += strlen(signature); + if (strcmpi(key, "db_hostname") == 0) + safestrncpy(ipban_db_hostname, value, sizeof(ipban_db_hostname)); + else if (strcmpi(key, "db_port") == 0) + ipban_db_port = (uint16)strtoul(value, NULL, 10); + else if (strcmpi(key, "db_username") == 0) + safestrncpy(ipban_db_username, value, sizeof(ipban_db_username)); + else if (strcmpi(key, "db_password") == 0) + safestrncpy(ipban_db_password, value, sizeof(ipban_db_password)); + else if (strcmpi(key, "db_database") == 0) + safestrncpy(ipban_db_database, value, sizeof(ipban_db_database)); + else if (strcmpi(key, "codepage") == 0) + safestrncpy(ipban_codepage, value, sizeof(ipban_codepage)); + else if (strcmpi(key, "ipban_table") == 0) + safestrncpy(ipban_table, value, sizeof(ipban_table)); + else + return false;// not found + return true; + } + + signature = "ipban."; + if (strncmpi(key, signature, strlen(signature)) == 0) { + key += strlen(signature); + if (strcmpi(key, "enable") == 0) + login_config.ipban = (bool)config_switch(value); + else if (strcmpi(key, "dynamic_pass_failure_ban") == 0) + login_config.dynamic_pass_failure_ban = (bool)config_switch(value); + else if (strcmpi(key, "dynamic_pass_failure_ban_interval") == 0) + login_config.dynamic_pass_failure_ban_interval = atoi(value); + else if (strcmpi(key, "dynamic_pass_failure_ban_limit") == 0) + login_config.dynamic_pass_failure_ban_limit = atoi(value); + else if (strcmpi(key, "dynamic_pass_failure_ban_duration") == 0) + login_config.dynamic_pass_failure_ban_duration = atoi(value); + else + return false;// not found + return true; + } + + return false;// not found } // check ip against active bans list bool ipban_check(uint32 ip) { - uint8* p = (uint8*)&ip; - char* data = NULL; - int matches; + uint8 *p = (uint8 *)&ip; + char *data = NULL; + int matches; - if( !login_config.ipban ) - return false;// ipban disabled + if (!login_config.ipban) + return false;// ipban disabled - if( SQL_ERROR == Sql_Query(sql_handle, "SELECT count(*) FROM `%s` WHERE `rtime` > NOW() AND (`list` = '%u.*.*.*' OR `list` = '%u.%u.*.*' OR `list` = '%u.%u.%u.*' OR `list` = '%u.%u.%u.%u')", - ipban_table, p[3], p[3], p[2], p[3], p[2], p[1], p[3], p[2], p[1], p[0]) ) - { - Sql_ShowDebug(sql_handle); - // close connection because we can't verify their connectivity. - return true; - } + if (SQL_ERROR == Sql_Query(sql_handle, "SELECT count(*) FROM `%s` WHERE `rtime` > NOW() AND (`list` = '%u.*.*.*' OR `list` = '%u.%u.*.*' OR `list` = '%u.%u.%u.*' OR `list` = '%u.%u.%u.%u')", + ipban_table, p[3], p[3], p[2], p[3], p[2], p[1], p[3], p[2], p[1], p[0])) { + Sql_ShowDebug(sql_handle); + // close connection because we can't verify their connectivity. + return true; + } - if( SQL_ERROR == Sql_NextRow(sql_handle) ) - return true;// Shouldn't happen, but just in case... + if (SQL_ERROR == Sql_NextRow(sql_handle)) + return true;// Shouldn't happen, but just in case... - Sql_GetData(sql_handle, 0, &data, NULL); - matches = atoi(data); - Sql_FreeResult(sql_handle); + Sql_GetData(sql_handle, 0, &data, NULL); + matches = atoi(data); + Sql_FreeResult(sql_handle); - return( matches > 0 ); + return(matches > 0); } // log failed attempt void ipban_log(uint32 ip) { - unsigned long failures; + unsigned long failures; - if( !login_config.ipban ) - return;// ipban disabled + if (!login_config.ipban) + return;// ipban disabled - failures = loginlog_failedattempts(ip, login_config.dynamic_pass_failure_ban_interval);// how many times failed account? in one ip. + failures = loginlog_failedattempts(ip, login_config.dynamic_pass_failure_ban_interval);// how many times failed account? in one ip. - // if over the limit, add a temporary ban entry - if( failures >= login_config.dynamic_pass_failure_ban_limit ) - { - uint8* p = (uint8*)&ip; - if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`list`,`btime`,`rtime`,`reason`) VALUES ('%u.%u.%u.*', NOW() , NOW() + INTERVAL %d MINUTE ,'Password error ban')", - ipban_table, p[3], p[2], p[1], login_config.dynamic_pass_failure_ban_duration) ) - Sql_ShowDebug(sql_handle); - } + // if over the limit, add a temporary ban entry + if (failures >= login_config.dynamic_pass_failure_ban_limit) { + uint8 *p = (uint8 *)&ip; + if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`list`,`btime`,`rtime`,`reason`) VALUES ('%u.%u.%u.*', NOW() , NOW() + INTERVAL %d MINUTE ,'Password error ban')", + ipban_table, p[3], p[2], p[1], login_config.dynamic_pass_failure_ban_duration)) + Sql_ShowDebug(sql_handle); + } } // remove expired bans int ipban_cleanup(int tid, unsigned int tick, int id, intptr_t data) { - if( !login_config.ipban ) - return 0;// ipban disabled + if (!login_config.ipban) + return 0;// ipban disabled - if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `ipbanlist` WHERE `rtime` <= NOW()") ) - Sql_ShowDebug(sql_handle); + if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `ipbanlist` WHERE `rtime` <= NOW()")) + Sql_ShowDebug(sql_handle); - return 0; + return 0; } -- cgit v1.2.3-60-g2f50