Fix synchronization issue at thread start

[dragonfireclient.git] / src / ban.h

diff --git a/src/ban.h b/src/ban.h
index 38b08b6045e4155543b5e8506f59a3402eeacc50..3e2ab7a877ec989882f5d5e0ec4099b530f45dbb 100644 (file)
--- a/src/ban.h
+++ b/src/ban.h
@@ -1,49 +1,49 @@
 /*
-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.
 */
 
-#ifndef BAN_HEADER
-#define BAN_HEADER
+#pragma once
 
-#include <set>
-#include <string>
-#include <jthread.h>
-#include <jmutex.h>
-#include "common_irrlicht.h"
+#include "util/string.h"
+#include "threading/thread.h"
 #include "exceptions.h"
+#include <map>
+#include <string>
+#include <mutex>
 
 class BanManager
 {
 public:
-       BanManager(const std::string &bannfilepath);
+       BanManager(const std::string &banfilepath);
        ~BanManager();
        void load();
        void save();
-       void add(std::string ip);
-       void remove(std::string ip);
-       bool isIpBanned(std::string ip);
+       bool isIpBanned(const std::string &ip);
+       // Supplying ip_or_name = "" lists all bans.
+       std::string getBanDescription(const std::string &ip_or_name);
+       std::string getBanName(const std::string &ip);
+       void add(const std::string &ip, const std::string &name);
+       void remove(const std::string &ip_or_name);
        bool isModified();
-private:
-       JMutex m_mutex;
-       std::string m_banfilepath;
-       std::set<std::string> m_ips;
-       bool m_modified;
 
+private:
+       std::mutex m_mutex;
+       std::string m_banfilepath = "";
+       StringMap m_ips;
+       bool m_modified = false;
 };
-
-#endif