/*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <fstream>
#include <jmutexautolock.h>
#include <sstream>
+#include <set>
#include "strfnd.h"
-#include "debug.h"
+#include "util/string.h"
+#include "log.h"
+#include "filesys.h"
BanManager::BanManager(const std::string &banfilepath):
m_banfilepath(banfilepath),
}
catch(SerializationError &e)
{
- dstream<<"WARNING: BanManager: creating "
+ infostream<<"WARNING: BanManager: creating "
<<m_banfilepath<<std::endl;
}
}
void BanManager::load()
{
JMutexAutoLock lock(m_mutex);
- dstream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
+ infostream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
std::ifstream is(m_banfilepath.c_str(), std::ios::binary);
if(is.good() == false)
{
- dstream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
+ infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
throw SerializationError("BanManager::load(): Couldn't open file");
}
{
if(is.eof() || is.good() == false)
break;
- std::string ip;
- std::getline(is, ip, '\n');
- m_ips.insert(ip);
+ std::string line;
+ std::getline(is, line, '\n');
+ Strfnd f(line);
+ std::string ip = trim(f.next("|"));
+ std::string name = trim(f.next("|"));
+ if(ip.empty())
+ continue;
+ m_ips[ip] = name;
}
m_modified = false;
}
void BanManager::save()
{
JMutexAutoLock lock(m_mutex);
- dstream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
- std::ofstream os(m_banfilepath.c_str(), std::ios::binary);
-
- if(os.good() == false)
- {
- dstream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
- throw SerializationError("BanManager::load(): Couldn't open file");
- }
+ infostream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
+ std::ostringstream ss(std::ios_base::binary);
- for(std::set<std::string>::iterator
+ for(std::map<std::string, std::string>::iterator
i = m_ips.begin();
i != m_ips.end(); i++)
{
- if(*i == "")
- continue;
- os<<*i<<"\n";
+ ss << i->first << "|" << i->second << "\n";
}
+
+ if(!fs::safeWriteToFile(m_banfilepath, ss.str())) {
+ infostream<<"BanManager: failed saving to "<<m_banfilepath<<std::endl;
+ throw SerializationError("BanManager::save(): Couldn't write file");
+ }
+
m_modified = false;
}
-bool BanManager::isIpBanned(std::string ip)
+bool BanManager::isIpBanned(const std::string &ip)
{
JMutexAutoLock lock(m_mutex);
return m_ips.find(ip) != m_ips.end();
}
-void BanManager::add(std::string ip)
+std::string BanManager::getBanDescription(const std::string &ip_or_name)
{
JMutexAutoLock lock(m_mutex);
- m_ips.insert(ip);
+ std::string s = "";
+ for(std::map<std::string, std::string>::iterator
+ i = m_ips.begin();
+ i != m_ips.end(); i++)
+ {
+ if(i->first == ip_or_name || i->second == ip_or_name
+ || ip_or_name == "")
+ s += i->first + "|" + i->second + ", ";
+ }
+ s = s.substr(0, s.size()-2);
+ return s;
+}
+
+std::string BanManager::getBanName(const std::string &ip)
+{
+ JMutexAutoLock lock(m_mutex);
+ std::map<std::string, std::string>::iterator i = m_ips.find(ip);
+ if(i == m_ips.end())
+ return "";
+ return i->second;
+}
+
+void BanManager::add(const std::string &ip, const std::string &name)
+{
+ JMutexAutoLock lock(m_mutex);
+ m_ips[ip] = name;
m_modified = true;
}
-void BanManager::remove(std::string ip)
+void BanManager::remove(const std::string &ip_or_name)
{
JMutexAutoLock lock(m_mutex);
- m_ips.erase(m_ips.find(ip));
+ //m_ips.erase(m_ips.find(ip));
+ // Find out all ip-name pairs that match the ip or name
+ std::set<std::string> ips_to_delete;
+ for(std::map<std::string, std::string>::iterator
+ i = m_ips.begin();
+ i != m_ips.end(); i++)
+ {
+ if(i->first == ip_or_name || i->second == ip_or_name)
+ ips_to_delete.insert(i->first);
+ }
+ // Erase them
+ for(std::set<std::string>::iterator
+ i = ips_to_delete.begin();
+ i != ips_to_delete.end(); i++)
+ {
+ m_ips.erase(*i);
+ }
m_modified = true;
}
projects / dragonfireclient.git / blobdiff