Fix merge mistake when rebasing for PR #1169

[minetest.git] / src / ban.h

diff --git a/src/ban.h b/src/ban.h
index 38b08b6045e4155543b5e8506f59a3402eeacc50..02a472f51c825bab81fd9536a317d98459b88f7a 100644 (file)
--- a/src/ban.h
+++ b/src/ban.h
@@ -1,18 +1,18 @@
 /*
-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.
 */
@@ -20,11 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef BAN_HEADER
 #define BAN_HEADER
 
-#include <set>
+#include <map>
 #include <string>
-#include <jthread.h>
-#include <jmutex.h>
-#include "common_irrlicht.h"
+#include "jthread/jthread.h"
+#include "jthread/jmutex.h"
 #include "exceptions.h"
 
 class BanManager
@@ -34,14 +33,17 @@ class BanManager
        ~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;
+       std::map<std::string, std::string> m_ips;
        bool m_modified;
 
 };