diff options
| -rw-r--r-- | server/server/config.cpp | 21 | ||||
| -rw-r--r-- | server/server/config.h | 8 | ||||
| -rw-r--r-- | server/server/main.cpp | 11 | ||||
| -rw-r--r-- | server/server/main.h | 3 |
4 files changed, 5 insertions, 38 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp index e145b4a..967d9fe 100644 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -4,7 +4,7 @@ config::config(const char *pth) { std::ifstream config; if(!pth) - config.open("/etc/aion_otp", std::fstream::out); + config.open("./server.cfg", std::fstream::out); else config.open(pth, std::fstream::in); std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>()); @@ -14,14 +14,11 @@ config::config(const char *pth) vars.conn_count = get_int(cfg_str, "ConnectionCount=", 30); vars.conn_time = get_int(cfg_str, "ConnectionTimeOut=", 60); vars.dos_conn_count = get_int(cfg_str, "DosConnectionCount=", 200); - vars.invalid_ml_count = get_int(cfg_str, "MainAccountInvalidLoginCount=", 10); - vars.invalid_sub_count = get_int(cfg_str, "SubAccountInvalidLoginCount=", 3); - vars.ls_port = get_int(cfg_str, "LSServerPort=", 80); vars.debug = get_int(cfg_str, "Debug=", 0); vars.bind_ip = get_string(cfg_str, "BindAddress=", "0.0.0.0"); vars.ls_host = get_string(cfg_str, "LSServerHost=", "ls.aionlegend.ru"); - vars.log_path = get_string(cfg_str, "LogPath=", "/var/log/aion_otp"); - vars.dos_log_path = get_string(cfg_str, "DosLogPath=", "/var/log/aion_otp_dos"); + vars.log_path = get_string(cfg_str, "LogPath=", "./server.log"); + vars.dos_log_path = get_string(cfg_str, "DosLogPath=", "./server_dos.log"); } const int config::get_int(const std::string& data, const char* var, int default_) { @@ -55,10 +52,6 @@ const int config::ban_time() { return vars.ban_time; } -const int config::invalid_ml_count() -{ - return vars.invalid_ml_count; -} const int config::conn_count() { return vars.conn_count; @@ -71,14 +64,6 @@ const int config::check_interval() { return vars.check_interval; } -const int config::invalid_sub_count() -{ - return vars.invalid_sub_count; -} -const int config::ls_port() -{ - return vars.ls_port; -} const int config::debug() { return vars.debug; diff --git a/server/server/config.h b/server/server/config.h index 0c8450c..7554857 100644 --- a/server/server/config.h +++ b/server/server/config.h @@ -8,12 +8,9 @@ class config public: config(const char *path); const int ban_time(); - const int invalid_ml_count(); const int conn_count(); const int conn_time(); const int check_interval(); - const int invalid_sub_count(); - const int ls_port(); const int debug(); const int dos_conn_count(); const std::string& ls_host(); @@ -23,16 +20,13 @@ public: private: struct cfg_data { - int ban_time, invalid_ml_count, conn_count, check_interval, invalid_sub_count, ls_port, debug, dos_conn_count, conn_time; + int ban_time, conn_count, check_interval, debug, dos_conn_count, conn_time; std::string ls_host, log_path, bind_ip, dos_log_path; cfg_data() { ban_time = conn_time = 60; - invalid_ml_count = 10; conn_count = 30; check_interval = 30; - invalid_sub_count = 3; - ls_port = 80; debug = 0; dos_conn_count = 200; } diff --git a/server/server/main.cpp b/server/server/main.cpp index 98cec09..c7e69f7 100644 --- a/server/server/main.cpp +++ b/server/server/main.cpp @@ -14,7 +14,6 @@ session::session(boost::asio::io_service& io_service, boost::asio::ssl::context& this_sid = get_random(8); recv_data_[0] = 0; snd_data_[0] = 0; - fail_count = 0; server_ = serv; blacklisted = canceled = false; } @@ -76,14 +75,6 @@ void session::start() server_->connections_increment(remote_ip, this_sid); socket_.async_handshake(boost::asio::ssl::stream_base::server, boost::bind(&session::handle_handshake, this, boost::asio::placeholders::error)); } -const int session::get_fail_count() -{ - return fail_count; -} -void session::fail_count_increment() -{ - fail_count++; -} const std::string& session::get_ip() { return remote_ip; @@ -430,7 +421,7 @@ void server::flood_check_thread(std::list<conn_count> *list, std::list<std::stri std::list<conn_count>::iterator end = list->end(); for(std::list<conn_count>::iterator i = list->begin(); i != end; ++i) { - if((i->connections > cfg->conn_count()) || (i->fail_count > cfg->invalid_ml_count())) + if(i->connections > cfg->conn_count()) { blacklist->push_back(i->ip); if(cfg->debug()) diff --git a/server/server/main.h b/server/server/main.h index 6ecc9d4..655aeff 100644 --- a/server/server/main.h +++ b/server/server/main.h @@ -44,13 +44,11 @@ public: void write_wo_response(std::vector<byte>& data); static void cancel_thread(session *s, int minutes); void set_cancel(); - const int get_fail_count(); const std::string& get_ip(); const std::string& get_this_sid() { return this_sid; } - void fail_count_increment(); void handle_operation(const boost::system::error_code& error, size_t bytes_transferred); void handle_read(const boost::system::error_code& error, size_t bytes_transferred); private: @@ -62,7 +60,6 @@ private: std::string sid, remote_ip, this_sid; server *server_; bool blacklisted, canceled; - int fail_count; boost::thread *killer; }; struct conn_count |