Changeset 3001

Timestamp:

06/04/06 09:11:45 (3 years ago)

Author:

madcat

Message:

Reacts to IPFilter config value changes on runtime, allowing reloading IPFilter on runtime (ticket #277)

Files:

• hydranode/hncore/hydranode.cpp (modified) (4 diffs)
• hydranode/hncore/hydranode.h (modified) (4 diffs)
• hydranode/hncore/ipfilter.cpp (modified) (1 diff)
• hydranode/hncore/ipfilter.h (modified) (1 diff)

hydranode/hncore/hydranode.cpp

@@ -259 +259 @@
-                boost::format("Incoming files directory:  %s") % incDir.string()
-        );
+
+        Prefs::instance().valueChanged.connect(
+                boost::bind(&Hydranode::configChanged, this, _1, _2)
+        );
-}
-
@@ -296 +300 @@
-        (void)SchedBase::instance().init();
-        (void)DNS::ResolverThread::instance();
+        SchedBase::instance().isAllowed.connect(
+                boost::bind(&IpFilter::isAllowed, &m_ipFilter, _1)
+        );
-
-        std::string fName= Prefs::instance().read<std::string>("/IPFilter", "");
@@ -304 +311 @@
-        }
-
+        // this triggers Config::valueChanged signal, which is handled by
+        // Hydranode::configChanged and (re)loads the filter.
-        Prefs::instance().write<std::string>("/IPFilter", fName);
-
-        IpFilter *flt = new IpFilter; // Note: this isn't deleted anywhere atm
-
-        if (!boost::filesystem::path(fName).is_complete()) {
-                fName = (getConfigDir()/fName).native_file_string();
-        }
-        if (fName.size()) try {
-                flt->load(fName);
-                SchedBase::instance().isAllowed.connect(
-                        boost::bind(&IpFilter::isAllowed, flt, _1)
-                );
-        } catch (std::exception &e) {
-                logError(
-                        boost::format("Failed to load IPFilter: %s") % e.what()
-                );
-                delete flt;
-        }
-}
-
@@ -718 +710 @@
-        return m_lastTotalDown + SchedBase::instance().getTotalDownstream();
-}
+
+void Hydranode::configChanged(const std::string &key, const std::string &val) {
+        if (key == "IPFilter") {
+                if (!val.size()) {
+                        m_ipFilter.clear();
+                        return;
+                }
+                std::string fName = val;
+                if (!boost::filesystem::path(fName).is_complete()) {
+                        fName = (getConfigDir()/fName).native_file_string();
+                }
+                if (fName.size()) try {
+                        m_ipFilter.clear();
+                        m_ipFilter.load(fName);
+                } catch (std::exception &e) {
+                        logError(
+                                boost::format("Failed to load IPFilter: %s")
+                                % e.what()
+                        );
+                }
+        }
+}

hydranode/hncore/hydranode.h

@@ -100 +100 @@
-#include <hnbase/object.h>                       // Object
-#include <hnbase/config.h>                       // Config
+#include <hncore/ipfilter.h>                     // IpFilter
-#include <boost/filesystem/path.hpp>             // getConfigDir() return val
-
@@ -250 +251 @@
-         * @returns Application runtime (session), in milliseconds.
-         */
- 
- 
+
+
-        }
-
@@ -283 +284 @@
-        );
-
+        /**
+         * Signal handler for configuration changes on runtime
+         */
+        void configChanged(const std::string &key, const std::string &val);
+
-        //! Keeps track if we are running.
-        bool m_running;
@@ -297 +303 @@
-        //! configuration file that stores statistics data
-        Config m_stats;
+
+        //! IP filter blacklist
+        IpFilter m_ipFilter;
-
-        //! Modules to auto-load on startup (filled from commandline)

hydranode/hncore/ipfilter.cpp

@@ -185 +185 @@
-        return !m_list->contains(Range32(SWAP32_ON_LE(ip)));
-}
+
+void IpFilter::clear() {
+        m_list->clear();
+        logMsg("Ip filter cleared.");
+}

hydranode/hncore/ipfilter.h

@@ -55 +55 @@
-        virtual bool isAllowed(uint32_t ip);
-        void load(const std::string &file);
+        void clear();
-private:
-        typedef std::runtime_error ParseError;