Rewritten dbus to dbus-c++

Added possibility to call daemon methods via dbus

3 files changed, 29 insertions, 10 deletions

diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index e6802a3f..1474b2f6 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -55,9 +55,14 @@ gboolean CCrashWatcher::handle_event_cb(GIOChannel *gio, GIOCondition condition,
 #ifdef DEBUG
         std::cout << "Created file: " << name << std::endl;
 #endif /*DEBUG*/
-        /* send message to dbus */
+     
         CCrashWatcher *cc = (CCrashWatcher*)daemon;
-        cc->m_nDbus_manager.SendMessage("Crash", name);
+        CMiddleWare::crash_info_t crashinfo;
+        if(cc->m_pMW->SaveDebugDump(std::string(DEBUG_DUMPS_DIR) + "/" + name, crashinfo))
+        {
+            /* send message to dbus */
+            cc->m_pDbusServer->Crash(crashinfo.m_sPackage);
+        }
     }
     return TRUE;
 }
@@ -66,9 +71,18 @@ CCrashWatcher::CCrashWatcher(const std::string& pPath)
 {
     int watch = 0;
     m_sTarget = pPath;
+    // middleware object
+    m_pMW = new CMiddleWare(PLUGINS_CONF_DIR,PLUGINS_LIB_DIR, std::string(CONF_DIR) + "/CrashCatcher.conf");
     m_nMainloop = g_main_loop_new(NULL,FALSE);
     /* register on dbus */
-    m_nDbus_manager.RegisterService();
+    DBus::Glib::BusDispatcher *dispatcher;
+    dispatcher = new DBus::Glib::BusDispatcher();
+    dispatcher->attach(NULL);
+    DBus::default_dispatcher = dispatcher;
+	DBus::Connection conn = DBus::Connection::SystemBus();
+    
+    m_pDbusServer = new CDBusServer(conn,CC_DBUS_PATH);
+    conn.request_name(CC_DBUS_NAME);
     if((m_nFd = inotify_init()) == -1){
         throw std::string("Init Failed");
         //std::cerr << "Init Failed" << std::endl;
@@ -76,23 +90,22 @@ CCrashWatcher::CCrashWatcher(const std::string& pPath)
     }
     if((watch = inotify_add_watch(m_nFd, pPath.c_str(), IN_CREATE)) == -1){
         throw std::string("Add watch failed");
-        //std::cerr << "Add watch failed: " << pPath << std::endl;
-        exit(-1);
     }
     m_nGio = g_io_channel_unix_new(m_nFd);
 }
 
 CCrashWatcher::~CCrashWatcher()
 {
+     //delete dispatcher, connection, etc..
 }
 
 void CCrashWatcher::Lock()
 {
     int lfp = open("crashcatcher.lock",O_RDWR|O_CREAT,0640);
 	if (lfp < 0) 
-        throw "CCrashWatcher.cpp:can not open lock file";
+        throw std::string("CCrashWatcher.cpp:can not open lock file");
 	if (lockf(lfp,F_TLOCK,0) < 0)
-        throw "CCrashWatcher.cpp:Lock:cannot create lock on lockfile";
+        throw std::string("CCrashWatcher.cpp:Lock:cannot create lock on lockfile");
 	/* only first instance continues */
 	//sprintf(str,"%d\n",getpid());
 	//write(lfp,str,strlen(str)); /* record pid to lockfile */
diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h
index 1d092cb2..92ef27f9 100644
--- a/src/Daemon/CrashWatcher.h
+++ b/src/Daemon/CrashWatcher.h
@@ -24,7 +24,8 @@
 #include <sys/inotify.h>
 #include <sys/inotify.h>
 #include <glib.h>
-#include "DBusManager.h"
+//#include "DBusManager.h"
+#include "DBusServer.h"
 #include "MiddleWare.h"
 
 // 1024 simultaneous actions
@@ -40,11 +41,13 @@ class CCrashWatcher
         void GStartWatch();
         void Lock();
 
-        CDBusManager m_nDbus_manager;
+        //CDBusManager m_nDbus_manager;
+        CDBusServer *m_pDbusServer;
         int m_nFd;
         GIOChannel* m_nGio;
         GMainLoop *m_nMainloop;
         std::string m_sTarget;
+        CMiddleWare *m_pMW;
 	public:
         CCrashWatcher(const std::string& pPath);
         //CCrashWatcher();
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index 32dbab0b..c562bb09 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -2,5 +2,8 @@ bin_PROGRAMS = CrashCatcher
 CrashCatcher_SOURCES = CrashWatcher.cpp CrashWatcher.h Daemon.cpp
 CrashCatcher_CPPFLAGS = -I../../lib/MiddleWare\
                         -I../../lib/DBus \
-                        -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(DBUS_GLIB_CFLAGS)
+                        -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(DBUS_GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \
+                        -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+                        -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+                        -DCONF_DIR=\"$(CONF_DIR)\"
 CrashCatcher_LDADD = ../../lib/MiddleWare/libMiddleWare.la ../../lib/DBus/libDBus.la $(DL_LIBS)