Drop luaentity_common.h which is not included anywhere

[dragonfireclient.git] / src / ban.cpp

diff --git a/src/ban.cpp b/src/ban.cpp
index 50ba0dba1a41b9d4eff4e39023b7586ac90b62b3..57b9f49a57aba6f02e33a940cd384d2bbe72fa98 100644 (file)
--- a/src/ban.cpp
+++ b/src/ban.cpp
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "ban.h"
 #include <fstream>
-#include "jthread/jmutexautolock.h"
+#include "threading/mutex_auto_lock.h"
 #include <sstream>
 #include <set>
 #include "strfnd.h"
@@ -31,13 +31,12 @@ BanManager::BanManager(const std::string &banfilepath):
                m_banfilepath(banfilepath),
                m_modified(false)
 {
-       m_mutex.Init();
        try{
                load();
        }
        catch(SerializationError &e)
        {
-               infostream<<"WARNING: BanManager: creating "
+               warningstream<<"BanManager: creating "
                                <<m_banfilepath<<std::endl;
        }
 }
@@ -49,7 +48,7 @@ BanManager::~BanManager()
 
 void BanManager::load()
 {
-       JMutexAutoLock lock(m_mutex);
+       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)
@@ -57,38 +56,32 @@ void BanManager::load()
                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);
-       infostream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
+       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++)
-       {
-               ss << 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;
+       if (!fs::safeWriteToFile(m_banfilepath, ss.str())) {
+               infostream << "BanManager: failed saving to " << m_banfilepath << std::endl;
                throw SerializationError("BanManager::save(): Couldn't write file");
        }
 
@@ -97,69 +90,57 @@ void BanManager::save()
 
 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;
 }