#include "ban.h"
#include <fstream>
-#include <jmutexautolock.h>
+#include "jthread/jmutexautolock.h"
#include <sstream>
#include <set>
#include "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();
}
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;
}
{
JMutexAutoLock lock(m_mutex);
infostream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
- std::ofstream os(m_banfilepath.c_str(), std::ios::binary);
-
- if(os.good() == false)
- {
- infostream<<"BanManager: failed saving to "<<m_banfilepath<<std::endl;
- throw SerializationError("BanManager::load(): Couldn't open file");
- }
+ 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";
+ 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;
}
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++)
+ i != m_ips.end();)
{
- m_ips.erase(*i);
+ if((i->first == ip_or_name) || (i->second == ip_or_name)) {
+ m_ips.erase(i++);
+ } else {
+ ++i;
+ }
}
m_modified = true;
}