#include <stdio.h>
#include <time.h>
#include <getopt.h>
+#include <string.h>
#include <json.h>
#include "verbose.h"
#include "utils-jbus.h"
+#include "utils-json.h"
#include "afm.h"
#include "afm-db.h"
+#include "afm-launch-mode.h"
#include "afm-run.h"
static const char appname[] = "afm-user-daemon";
const char error_bad_request[] = "\"bad request\"";
const char error_not_found[] = "\"not found\"";
const char error_cant_start[] = "\"can't start\"";
+const char error_system[] = "\"system error\"";
static const char *getappid(struct json_object *obj)
{
static void on_runnables(struct jreq *jreq, struct json_object *obj)
{
- struct json_object *resp = afm_db_application_list(afdb);
+ struct json_object *resp;
+ INFO("method runnables called");
+ resp = afm_db_application_list(afdb);
jbus_reply_j(jreq, resp);
json_object_put(resp);
}
static void on_detail(struct jreq *jreq, struct json_object *obj)
{
- const char *appid = getappid(obj);
- struct json_object *resp = afm_db_get_application_public(afdb, appid);
+ const char *appid;
+ struct json_object *resp;
+ appid = getappid(obj);
+ INFO("method detail called for %s", appid);
+ resp = afm_db_get_application_public(afdb, appid);
reply(jreq, resp, error_not_found);
json_object_put(resp);
}
static void on_start(struct jreq *jreq, struct json_object *obj)
{
- const char *appid;
- struct json_object *appli;
+ const char *appid, *modestr;
+ char *uri;
+ struct json_object *appli, *resp;
int runid;
char runidstr[20];
-
- appid = getappid(obj);
- if (appid == NULL)
+ enum afm_launch_mode mode;
+
+ /* get the parameters */
+ mode = invalid_launch_mode;
+ if (j_read_string(obj, &appid)) {
+ mode = default_launch_mode;
+ } else if (j_read_string_at(obj, "id", &appid)) {
+ if (j_read_string_at(obj, "mode", &modestr)) {
+ mode = launch_mode_of_string(modestr);
+ } else {
+ mode = default_launch_mode;
+ }
+ }
+ if (!launch_mode_is_valid(mode)) {
jbus_reply_error_s(jreq, error_bad_request);
+ return;
+ }
+
+ /* get the application */
+ INFO("method start called for %s mode=%s", appid, name_of_launch_mode(mode));
+ appli = afm_db_get_application(afdb, appid);
+ if (appli == NULL) {
+ jbus_reply_error_s(jreq, error_not_found);
+ return;
+ }
+
+ /* launch the application */
+ uri = NULL;
+ runid = afm_run_start(appli, mode, &uri);
+ if (runid <= 0) {
+ jbus_reply_error_s(jreq, error_cant_start);
+ free(uri);
+ return;
+ }
+
+ if (uri == NULL) {
+ /* returns only the runid */
+ snprintf(runidstr, sizeof runidstr, "%d", runid);
+ runidstr[sizeof runidstr - 1] = 0;
+ jbus_reply_s(jreq, runidstr);
+ return;
+ }
+
+ /* returns the runid and its uri */
+ resp = json_object_new_object();
+ if (resp != NULL && j_add_integer(resp, "runid", runid) && j_add_string(resp, "uri", uri))
+ jbus_reply_j(jreq, resp);
else {
- appli = afm_db_get_application(afdb, appid);
- if (appli == NULL)
- jbus_reply_error_s(jreq, error_not_found);
- else {
- runid = afm_run_start(appli);
- if (runid <= 0)
- jbus_reply_error_s(jreq, error_cant_start);
- else {
- snprintf(runidstr, sizeof runidstr, "%d", runid);
- runidstr[sizeof runidstr - 1] = 0;
- jbus_reply_s(jreq, runidstr);
- }
- }
+ afm_run_stop(runid);
+ jbus_reply_error_s(jreq, error_cant_start);
}
+ json_object_put(resp);
+ free(uri);
}
static void on_stop(struct jreq *jreq, struct json_object *obj)
{
- int runid = getrunid(obj);
- int status = afm_run_stop(runid);
+ int runid, status;
+ runid = getrunid(obj);
+ INFO("method stop called for %d", runid);
+ status = afm_run_stop(runid);
reply_status(jreq, status);
}
static void on_continue(struct jreq *jreq, struct json_object *obj)
{
- int runid = getrunid(obj);
- int status = afm_run_continue(runid);
+ int runid, status;
+ runid = getrunid(obj);
+ INFO("method continue called for %d", runid);
+ status = afm_run_continue(runid);
reply_status(jreq, status);
}
static void on_terminate(struct jreq *jreq, struct json_object *obj)
{
- int runid = getrunid(obj);
- int status = afm_run_terminate(runid);
+ int runid, status;
+ runid = getrunid(obj);
+ INFO("method terminate called for %d", runid);
+ status = afm_run_terminate(runid);
reply_status(jreq, status);
}
static void on_runners(struct jreq *jreq, struct json_object *obj)
{
- struct json_object *resp = afm_run_list();
+ struct json_object *resp;
+ INFO("method runners called");
+ resp = afm_run_list();
jbus_reply_j(jreq, resp);
json_object_put(resp);
}
static void on_state(struct jreq *jreq, struct json_object *obj)
{
- int runid = getrunid(obj);
- struct json_object *resp = afm_run_state(runid);
+ int runid;
+ struct json_object *resp;
+ runid = getrunid(obj);
+ INFO("method state called for %d", runid);
+ resp = afm_run_state(runid);
reply(jreq, resp, error_not_found);
json_object_put(resp);
}
+static void propagate(struct jreq *jreq, const char *msg, const char *method)
+{
+ char *reply;
+ INFO("method %s propagated with %s", method, msg);
+ reply = jbus_call_ss_sync(jbuses[0], method, msg);
+ if (reply) {
+ jbus_reply_s(jreq, reply);
+ free(reply);
+ }
+ else
+ jbus_reply_error_s(jreq, error_system);
+}
+
+static void on_install(struct jreq *jreq, const char *msg)
+{
+ return propagate(jreq, msg, "install");
+}
+
+static void on_uninstall(struct jreq *jreq, const char *msg)
+{
+ return propagate(jreq, msg, "uninstall");
+}
+
static void on_signal_changed(struct json_object *obj)
{
/* update the database */
afm_db_update_applications(afdb);
- /* propagate now */
+ /* re-propagate now */
jbus_send_signal_j(jbuses[1], "changed", obj);
}
}
/* init observers */
- jbuses[0] = create_jbus(0, AFM_SYSTEM_DBUS_PATH);
+ jbuses[0] = create_jbus_system(AFM_SYSTEM_DBUS_PATH);
if (!jbuses[0]) {
ERROR("create_jbus failed for system");
return 1;
}
/* init service */
- jbuses[1] = create_jbus(1, AFM_USER_DBUS_PATH);
+ jbuses[1] = create_jbus_session(AFM_USER_DBUS_PATH);
if (!jbuses[1]) {
ERROR("create_jbus failed");
return 1;
|| jbus_add_service_j(jbuses[1], "stop", on_stop)
|| jbus_add_service_j(jbuses[1], "continue", on_continue)
|| jbus_add_service_j(jbuses[1], "runners", on_runners)
- || jbus_add_service_j(jbuses[1], "state", on_state)) {
+ || jbus_add_service_j(jbuses[1], "state", on_state)
+ || jbus_add_service_s(jbuses[1], "install", on_install)
+ || jbus_add_service_s(jbuses[1], "uninstall", on_uninstall)) {
ERROR("adding services failed");
return 1;
}
Code Review / src / app-framework-main.git / blobdiff