Adds 2017 to copyrights

[src/app-framework-main.git] / src / afm-system-daemon.c

diff --git a/src/afm-system-daemon.c b/src/afm-system-daemon.c
index f02ff3d..969bfaa 100644 (file)
--- a/src/afm-system-daemon.c
+++ b/src/afm-system-daemon.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright 2015, 2016, 2017 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -22,7 +22,9 @@
 #include <getopt.h>
 #include <errno.h>
 
-#include <json.h>
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
+#include <json-c/json.h>
 
 #include "verbose.h"
 #include "utils-jbus.h"
@@ -31,6 +33,7 @@
 #include "afm-db.h"
 #include "wgt-info.h"
 #include "wgtpkg-install.h"
+#include "wgtpkg-uninstall.h"
 
 static const char appname[] = "afm-system-daemon";
 static const char *rootdir = NULL;
@@ -65,7 +68,7 @@ const char error_bad_request[] = "\"bad request\"";
 const char error_not_found[] = "\"not found\"";
 const char error_cant_start[] = "\"can't start\"";
 
-static void on_install(struct jreq *jreq, struct json_object *req)
+static void on_install(struct sd_bus_message *smsg, struct json_object *req, void *unused)
 {
        const char *wgtfile;
        const char *root;
@@ -81,43 +84,68 @@ static void on_install(struct jreq *jreq, struct json_object *req)
                force = 0;
                break;
        case json_type_object:
-               wgtfile = j_get_string(req, "wgt", NULL);
+               wgtfile = j_string_at(req, "wgt", NULL);
                if (wgtfile != NULL) {
-                       root = j_get_string(req, "root", rootdir);
-                       force = j_get_boolean(req, "force", 0);
+                       root = j_string_at(req, "root", rootdir);
+                       force = j_boolean_at(req, "force", 0);
                        break;
                }
        default:
-               jbus_reply_error_s(jreq, error_bad_request);
+               jbus_reply_error_s(smsg, error_bad_request);
                return;
        }
 
        /* install the widget */
        ifo = install_widget(wgtfile, root, force);
-       if (ifo == NULL) {
-               jbus_reply_error_s(jreq, "\"installation failed\"");
-               return;
-       }
+       if (ifo == NULL)
+               jbus_reply_error_s(smsg, "\"installation failed\"");
+       else {
+               /* build the response */
+               resp = json_object_new_object();
+               if(!resp || !j_add_string(resp, "added", wgt_info_desc(ifo)->idaver))
+                       jbus_reply_error_s(smsg, "\"out of memory but installed!\"");
+               else {
+                       jbus_send_signal_s(jbus, "changed", "true");
+                       jbus_reply_j(smsg, resp);
+               }
 
-       /* build the response */
-       resp = json_object_new_object();
-       if(!resp || !j_add_string(resp, "added", wgt_info_desc(ifo)->idaver)) {
-               json_object_put(resp);
+               /* clean-up */
                wgt_info_unref(ifo);
-               jbus_reply_error_s(jreq, "\"out of memory but installed!\"");
-               return;
+               json_object_put(resp);
        }
-       wgt_info_unref(ifo);
-
-       /* reply and propagate event */
-       jbus_reply_j(jreq, resp);
-       jbus_send_signal_j(jbus, "changed", resp);
-       json_object_put(resp);
 }
 
-static void on_uninstall(struct jreq *jreq, struct json_object *req)
+static void on_uninstall(struct sd_bus_message *smsg, struct json_object *req, void *unused)
 {
-       jbus_reply_error_s(jreq, "\"not yet implemented\"");
+       const char *idaver;
+       const char *root;
+       int rc;
+
+       /* scan the request */
+       switch (json_object_get_type(req)) {
+       case json_type_string:
+               idaver = json_object_get_string(req);
+               root = rootdir;
+               break;
+       case json_type_object:
+               idaver = j_string_at(req, "id", NULL);
+               if (idaver != NULL) {
+                       root = j_string_at(req, "root", rootdir);
+                       break;
+               }
+       default:
+               jbus_reply_error_s(smsg, error_bad_request);
+               return;
+       }
+
+       /* install the widget */
+       rc = uninstall_widget(idaver, root);
+       if (rc)
+               jbus_reply_error_s(smsg, "\"uninstallation had error\"");
+       else {
+               jbus_send_signal_s(jbus, "changed", "true");
+               jbus_reply_s(smsg, "true");
+       }
 }
 
 static int daemonize()
@@ -132,7 +160,9 @@ static int daemonize()
 
 int main(int ac, char **av)
 {
-       int i, daemon = 0;
+       int i, daemon = 0, rc;
+       struct sd_event *evloop;
+       struct sd_bus *sysbus;
 
        LOGAUTH(appname);
 
@@ -190,24 +220,41 @@ int main(int ac, char **av)
                return 1;
        }
 
+       /* get systemd objects */
+       rc = sd_event_new(&evloop);
+       if (rc < 0) {
+               ERROR("can't create event loop");
+               return 1;
+       }
+       rc = sd_bus_open_system(&sysbus);
+       if (rc < 0) {
+               ERROR("can't create system bus");
+               return 1;
+       }
+       rc = sd_bus_attach_event(sysbus, evloop, 0);
+       if (rc < 0) {
+               ERROR("can't attach system bus to event loop");
+               return 1;
+       }
+
        /* init service */
-       jbus = create_jbus(0, AFM_SYSTEM_DBUS_PATH);
+       jbus = create_jbus(sysbus, AFM_SYSTEM_DBUS_PATH);
        if (!jbus) {
                ERROR("create_jbus failed");
                return 1;
        }
-       if(jbus_add_service_j(jbus, "install", on_install)
-       || jbus_add_service_j(jbus, "uninstall", on_uninstall)) {
+       if(jbus_add_service_j(jbus, "install", on_install, NULL)
+       || jbus_add_service_j(jbus, "uninstall", on_uninstall, NULL)) {
                ERROR("adding services failed");
                return 1;
        }
 
        /* start and run */
-       if (jbus_start_serving(jbus)) {
+       if (jbus_start_serving(jbus) < 0) {
                ERROR("can't start server");
                return 1;
        }
-       while (!jbus_read_write_dispatch(jbus, -1));
+       for(;;)
+               sd_event_run(evloop, (uint64_t)-1);
        return 0;
 }
-