X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fban.cpp;h=5fa430702724feee2b94fa205559be5759ea50e8;hb=9762650f978cc7bae78861b70a051b26cc5e2dc6;hp=398976260cc3d33eab1632285836abce023970dc;hpb=e40da2341cfcd6580075571d325105b9a9fe783a;p=minetest.git

diff --git a/src/ban.cpp b/src/ban.cpp
index 398976260..5fa430702 100644
--- a/src/ban.cpp
+++ b/src/ban.cpp
@@ -1,41 +1,42 @@
 /*
-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 "ban.h"
 #include <fstream>
-#include <jmutexautolock.h>
+#include "threading/mutex_auto_lock.h"
 #include <sstream>
 #include <set>
-#include "strfnd.h"
-#include "debug.h"
+#include "util/strfnd.h"
+#include "util/string.h"
+#include "log.h"
+#include "filesys.h"
 
 BanManager::BanManager(const std::string &banfilepath):
 		m_banfilepath(banfilepath),
 		m_modified(false)
 {
-	m_mutex.Init();
 	try{
 		load();
 	}
 	catch(SerializationError &e)
 	{
-		dstream<<"WARNING: BanManager: creating "
+		warningstream<<"BanManager: creating "
 				<<m_banfilepath<<std::endl;
 	}
 }
@@ -47,117 +48,99 @@ BanManager::~BanManager()
 
 void BanManager::load()
 {
-	JMutexAutoLock lock(m_mutex);
-	dstream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
+	MutexAutoLock lock(m_mutex);
+	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");
 	}
-	
-	for(;;)
+
+	while(!is.eof() && is.good())
 	{
-		if(is.eof() || is.good() == false)
-			break;
 		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;
+		if(!ip.empty()) {
+			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");
-	}
+	MutexAutoLock lock(m_mutex);
+	infostream << "BanManager: saving to " << m_banfilepath << std::endl;
+	std::ostringstream ss(std::ios_base::binary);
 
-	for(std::map<std::string, std::string>::iterator
-			i = m_ips.begin();
-			i != m_ips.end(); i++)
-	{
-		os<<i->first<<"|"<<i->second<<"\n";
+	for (StringMap::iterator it = m_ips.begin(); it != m_ips.end(); ++it)
+		ss << it->first << "|" << it->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(const std::string &ip)
 {
-	JMutexAutoLock lock(m_mutex);
+	MutexAutoLock lock(m_mutex);
 	return m_ips.find(ip) != m_ips.end();
 }
 
 std::string BanManager::getBanDescription(const std::string &ip_or_name)
 {
-	JMutexAutoLock lock(m_mutex);
+	MutexAutoLock lock(m_mutex);
 	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 + ", ";
+	for (StringMap::iterator it = m_ips.begin(); it != m_ips.end(); ++it) {
+		if (it->first  == ip_or_name || it->second == ip_or_name
+				|| ip_or_name == "") {
+			s += it->first + "|" + it->second + ", ";
+		}
 	}
-	s = s.substr(0, s.size()-2);
+	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())
+	MutexAutoLock lock(m_mutex);
+	StringMap::iterator it = m_ips.find(ip);
+	if (it == m_ips.end())
 		return "";
-	return i->second;
+	return it->second;
 }
 
 void BanManager::add(const std::string &ip, const std::string &name)
 {
-	JMutexAutoLock lock(m_mutex);
+	MutexAutoLock lock(m_mutex);
 	m_ips[ip] = name;
 	m_modified = true;
 }
 
 void BanManager::remove(const std::string &ip_or_name)
 {
-	JMutexAutoLock lock(m_mutex);
-	//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);
+	MutexAutoLock lock(m_mutex);
+	for (StringMap::iterator it = m_ips.begin(); it != m_ips.end();) {
+		if ((it->first == ip_or_name) || (it->second == ip_or_name)) {
+			m_ips.erase(it++);
+		} else {
+			++it;
+		}
 	}
 	m_modified = true;
 }
-	
+
 
 bool BanManager::isModified()
 {
-	JMutexAutoLock lock(m_mutex);
+	MutexAutoLock lock(m_mutex);
 	return m_modified;
 }