Repository :
http://git.fedorahosted.org/cgit/firewalld-recode.git
On branch : master
---------------------------------------------------------------
commit 5e09642617a713543e1d2e5f0c17459478b0365b
Author: Daniel Kopecek <dkopecek(a)redhat.com>
Date: Tue Oct 7 13:23:46 2014 +0200
Finalize the main DBus interface
---------------------------------------------------------------
src/Daemon/DBus/completeReload.cpp | 2 +-
src/Daemon/DBus/methods.decl | 3 +--
src/Daemon/DBus/reload.cpp | 7 ++++++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/Daemon/DBus/completeReload.cpp b/src/Daemon/DBus/completeReload.cpp
index 52de214..6a719cf 100644
--- a/src/Daemon/DBus/completeReload.cpp
+++ b/src/Daemon/DBus/completeReload.cpp
@@ -24,7 +24,7 @@ namespace firewalld
{
FIREWALLD_DBUS_METHOD(completeReload)
{
- result.setTypeSignature("()");
+ // TODO: Make sure kernel modules are reloaded
// Shutdown DBus and stop the Glib main loop
// This will result in terminating the .run() method
// in the main loop (main.cpp) and a complete reload
diff --git a/src/Daemon/DBus/methods.decl b/src/Daemon/DBus/methods.decl
index 0643775..8a82557 100644
--- a/src/Daemon/DBus/methods.decl
+++ b/src/Daemon/DBus/methods.decl
@@ -1,3 +1,4 @@
+FIREWALLD_DBUS_METHOD(reload);
FIREWALLD_DBUS_METHOD(completeReload);
FIREWALLD_DBUS_METHOD(disablePanicMode);
FIREWALLD_DBUS_METHOD(enablePanicMode);
@@ -6,8 +7,6 @@ FIREWALLD_DBUS_METHOD(listIcmpTypes);
FIREWALLD_DBUS_METHOD(listServices);
FIREWALLD_DBUS_METHOD(queryPanicMode);
FIREWALLD_DBUS_METHOD(setDefaultZone);
-
-FIREWALLD_DBUS_METHOD(reload);
FIREWALLD_DBUS_METHOD(getIcmpTypeSettings);
FIREWALLD_DBUS_METHOD(getServiceSettings);
FIREWALLD_DBUS_METHOD(getZoneSettings);
diff --git a/src/Daemon/DBus/reload.cpp b/src/Daemon/DBus/reload.cpp
index e6fa6d5..eb2d080 100644
--- a/src/Daemon/DBus/reload.cpp
+++ b/src/Daemon/DBus/reload.cpp
@@ -24,6 +24,11 @@ namespace firewalld
{
FIREWALLD_DBUS_METHOD(reload)
{
- result = DBusError("NotImplemented", "The reload method is currently
not implemented");
+ // Shutdown DBus and stop the Glib main loop
+ // This will result in terminating the .run() method
+ // in the main loop (main.cpp) and a complete reload
+ // of the FirewallD instance.
+ quit();
+ return;
}
} /* namespace firewalld */