0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

display the ban reason on connect

Browse source
This commit is contained in:
Gunter Labes 2009-02-11 18:55:09 +00:00
parent 0185699fc2
commit 781043f211
3 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/server/ban.cpp
View file

@ -598,7 +598,7 @@ namespace wesnothd {
}
bool ban_manager::is_ip_banned(std::string ip) const
std::string ban_manager::is_ip_banned(const std::string& ip) const
{
subnet_compare_setter setter;
ban_set::const_iterator ban;
@ -608,7 +608,8 @@ namespace wesnothd {
ERR_SERVER << e.message << " in is_ip_banned\n";
return false;
}
return ban != bans_.end();
if (ban == bans_.end()) return "";
return (*ban)->get_reason();
}
void ban_manager::init_ban_help()

2
src/server/ban.hpp
View file

@ -162,7 +162,7 @@ namespace wesnothd {
void list_deleted_bans(std::ostringstream& out) const;
void list_bans(std::ostringstream& out) const;
bool is_ip_banned(std::string ip) const;
std::string is_ip_banned(const std::string& ip) const;
const std::string& get_ban_help() const
{ return ban_help_; }

30
src/server/server.cpp
View file

@ -328,7 +328,7 @@ private:
void load_config();
bool ip_exceeds_connection_limit(const std::string& ip) const;
bool is_ip_banned(const std::string& ip) const;
std::string is_ip_banned(const std::string& ip) const;
simple_wml::document version_query_response_;
simple_wml::document login_response_;
@ -600,7 +600,7 @@ bool server::ip_exceeds_connection_limit(const std::string& ip) const {
return connections >= concurrent_connections_;
}
bool server::is_ip_banned(const std::string& ip) const {
std::string server::is_ip_banned(const std::string& ip) const {
return ban_manager_.is_ip_banned(ip);
}
@ -714,10 +714,11 @@ void server::run() {
network::connection sock = network::accept_connection();
if (sock) {
const std::string& ip = network::ip_address(sock);
if (is_ip_banned(ip)) {
const std::string ip = network::ip_address(sock);
const std::string reason = is_ip_banned(ip);
if (!reason.empty()) {
LOG_SERVER << ip << "\trejected banned user.\n";
send_error(sock, "You are banned.");
send_error(sock, ("You are banned. Reason: " + reason).c_str());
network::disconnect(sock);
} else if (ip_exceeds_connection_limit(ip)) {
LOG_SERVER << ip << "\trejected ip due to excessive connections\n";
@ -1400,15 +1401,15 @@ std::string server::process_command(const std::string& query, const std::string&
if (std::count(target.begin(), target.end(), '.') >= 1) {
banned = true;
std::string err = ban_manager_.ban(target, parsed_time, reason, issuer_name, group);
out << err;
out << ban_manager_.ban(target, parsed_time, reason, issuer_name, group);
if (kick) {
for (wesnothd::player_map::const_iterator pl = players_.begin();
pl != players_.end(); ++pl)
{
if (utils::wildcard_string_match(network::ip_address(pl->first), target)) {
out << "\nKicked " << pl->second.name() << ".";
out << "\nKicked " << pl->second.name() << " ("
<< network::ip_address(pl->first) << ").";
send_error(pl->first, ("You have been banned. Reason: " + reason).c_str());
network::queue_disconnect(pl->first);
}
@ -1421,15 +1422,12 @@ std::string server::process_command(const std::string& query, const std::string&
{
if (utils::wildcard_string_match(pl->second.name(), target)) {
banned = true;
const std::string& ip = network::ip_address(pl->first);
if (!is_ip_banned(ip)) {
std::string err = ban_manager_.ban(ip, parsed_time, reason, issuer_name, group, target);
out << err;
}
const std::string ip = network::ip_address(pl->first);
out << ban_manager_.ban(ip, parsed_time, reason, issuer_name, group, target);
if (kick) {
if (kicked) out << "\n";
else kicked = true;
out << "\nKicked " << pl->second.name() << ".";
out << "\nKicked " << pl->second.name() << " (" << ip << ").";
send_error(pl->first, ("You have been banned. Reason: " + reason).c_str());
network::queue_disconnect(pl->first);
}
@ -1443,9 +1441,7 @@ std::string server::process_command(const std::string& query, const std::string&
i != ip_log_.end(); i++) {
if (i->first == target) {
banned = true;
if (!is_ip_banned(i->second)) {
out << ban_manager_.ban(i->second, parsed_time, reason, issuer_name, group, target);
}
out << ban_manager_.ban(i->second, parsed_time, reason, issuer_name, group, target);
}
}
}