projects / platform / core / appfw / pkgmgr-server.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
apply retry logic to get an user type using gum api.
[platform/core/appfw/pkgmgr-server.git] / src / request.c
diff --git a/src/request.c b/src/request.c
index ba99bf0..7a5ba92 100644 (file)
--- a/src/request.c
+++ b/src/request.c
@@ -7,10 +7,12 @@
 #include <gum/gum-user.h>
 #include <gum/common/gum-user-types.h>
 
-#include "pm-queue.h"
+#include "queue.h"
 #include "pkgmgr-server.h"
 #include "package-manager.h"
 
+#define RETRY_MAX 5
+#define RETRY_WAIT_USEC (1000000 / 2) /* 0.5 sec */
 #define PKGMGR_DBUS_SERVICE "org.tizen.pkgmgr"
 #define PKGMGR_DBUS_OBJECT_PATH "/org/tizen/pkgmgr"
 
@@ -53,18 +55,21 @@ static const char instropection_xml[] =
        "      <arg type='s' name='pkgid' direction='in'/>"
        "      <arg type='i' name='movetype' direction='in'/>"
        "      <arg type='i' name='ret' direction='out'/>"
+       "      <arg type='s' name='reqkey' direction='out'/>"
        "    </method>"
-       "    <method name='enable_pkg'>"
+       "    <method name='enable_pkgs'>"
        "      <arg type='u' name='uid' direction='in'/>"
        "      <arg type='s' name='pkgtype' direction='in'/>"
-       "      <arg type='s' name='pkgid' direction='in'/>"
+       "      <arg type='as' name='pkgids' direction='in'/>"
        "      <arg type='i' name='ret' direction='out'/>"
+       "      <arg type='s' name='reqkey' direction='out'/>"
        "    </method>"
-       "    <method name='disable_pkg'>"
+       "    <method name='disable_pkgs'>"
        "      <arg type='u' name='uid' direction='in'/>"
        "      <arg type='s' name='pkgtype' direction='in'/>"
-       "      <arg type='s' name='pkgid' direction='in'/>"
+       "      <arg type='as' name='pkgids' direction='in'/>"
        "      <arg type='i' name='ret' direction='out'/>"
+       "      <arg type='s' name='reqkey' direction='out'/>"
        "    </method>"
        "    <method name='enable_app'>"
        "      <arg type='u' name='uid' direction='in'/>"
@@ -112,11 +117,13 @@ static const char instropection_xml[] =
        "      <arg type='u' name='uid' direction='in'/>"
        "      <arg type='s' name='pkgid' direction='in'/>"
        "      <arg type='i' name='ret' direction='out'/>"
+       "      <arg type='i' name='pid' direction='out'/>"
        "    </method>"
        "    <method name='check'>"
        "      <arg type='u' name='uid' direction='in'/>"
        "      <arg type='s' name='pkgid' direction='in'/>"
        "      <arg type='i' name='ret' direction='out'/>"
+       "      <arg type='i' name='pid' direction='out'/>"
        "    </method>"
        "    <method name='generate_license_request'>"
        "      <arg type='s' name='resp_data' direction='in'/>"
@@ -195,10 +202,21 @@ static int __is_admin_user(uid_t uid)
 {
        GumUser *guser;
        GumUserType ut = GUM_USERTYPE_NONE;
+       int retry_cnt = 0;
+
+       do {
+               guser = gum_user_get_sync(uid, FALSE);
+               if (guser == NULL) {
+                       ERR("cannot get user information from gumd, retry");
+                       retry_cnt++;
+                       usleep(RETRY_WAIT_USEC);
+                       continue;
+               }
+               break;
+       } while (retry_cnt <= RETRY_MAX);
 
-       guser = gum_user_get_sync(uid, FALSE);
        if (guser == NULL) {
-               ERR("cannot get user information from gumd");
+               ERR("cannot get user information from gumd, failed");
                return -1;
        }
 
@@ -217,6 +235,7 @@ static int __is_admin_user(uid_t uid)
        return 1;
 }
 
+#define REGULAR_USER 5000
 static int __check_caller_permission(uid_t uid,
                GDBusMethodInvocation *invocation, GVariant *parameters)
 {
@@ -224,6 +243,9 @@ static int __check_caller_permission(uid_t uid,
        uid_t target_uid;
        int is_admin;
 
+       if (uid < REGULAR_USER)
+               return 0;
+
        v = g_variant_get_child_value(parameters, 0);
        if (v == NULL) {
                g_dbus_method_invocation_return_error_literal(invocation,
@@ -269,7 +291,8 @@ static int __handle_request_install(uid_t uid,
        int i = 0;
        int len = 0;
 
-       g_variant_get(parameters, "(u&s&s@as)", &target_uid, &pkgtype, &pkgpath, &value);
+       g_variant_get(parameters, "(u&s&s@as)", &target_uid, &pkgtype, &pkgpath,
+                       &value);
        tmp_args = (gchar **)g_variant_get_strv(value, &args_count);
 
        for (i = 0; i < args_count; i++)
@@ -278,7 +301,9 @@ static int __handle_request_install(uid_t uid,
        args = (char *)calloc(len, sizeof(char));
        if (args == NULL) {
                ERR("calloc failed");
-               ret =  -1;
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
+               ret = -1;
                goto catch;
        }
 
@@ -304,11 +329,13 @@ static int __handle_request_install(uid_t uid,
 
        reqkey = __generate_reqkey(pkgpath);
        if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                ret = -1;
                goto catch;
        }
 
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_INSTALL, pkgtype,
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_INSTALL, pkgtype,
                                pkgpath, args)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
@@ -328,6 +355,9 @@ catch:
        if (args)
                free(args);
 
+       if (tmp_args)
+               g_free(tmp_args);
+
        return ret;
 }
 
@@ -346,7 +376,8 @@ static int __handle_request_mount_install(uid_t uid,
        int i = 0;
        int len = 0;
 
-       g_variant_get(parameters, "(u&s&s@as)", &target_uid, &pkgtype, &pkgpath, &value);
+       g_variant_get(parameters, "(u&s&s@as)", &target_uid, &pkgtype, &pkgpath,
+                       &value);
        tmp_args = (gchar **)g_variant_get_strv(value, &args_count);
 
        for (i = 0; i < args_count; i++)
@@ -355,7 +386,9 @@ static int __handle_request_mount_install(uid_t uid,
        args = (char *)calloc(len, sizeof(char));
        if (args == NULL) {
                ERR("calloc failed");
-               ret =  -1;
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
+               ret = -1;
                goto catch;
        }
 
@@ -367,48 +400,48 @@ static int __handle_request_mount_install(uid_t uid,
 
        if (target_uid == (uid_t)-1 || pkgtype == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                                                     g_variant_new("(is)",
-                                                                   PKGMGR_R_ECOMM, ""));
+                               g_variant_new("(is)", PKGMGR_R_ECOMM, ""));
                ret = -1;
                goto catch;
        }
 
        if (pkgpath == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                                                     g_variant_new("(is)",
-                                                                   PKGMGR_R_ECOMM, ""));
+                               g_variant_new("(is)", PKGMGR_R_ECOMM, ""));
                ret = -1;
                goto catch;
        }
 
        reqkey = __generate_reqkey(pkgpath);
        if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                ret = -1;
                goto catch;
        }
 
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_MOUNT_INSTALL,
-                       pkgtype, pkgpath, args)) {
-       g_dbus_method_invocation_return_value(invocation,
-                                             g_variant_new("(is)",
-                                                           PKGMGR_R_ESYSTEM, ""));
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_MOUNT_INSTALL,
+                               pkgtype, pkgpath, args)) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
                ret = -1;
                goto catch;
        }
 
        g_dbus_method_invocation_return_value(invocation,
-                                             g_variant_new("(is)",
-                                                           PKGMGR_R_OK,
-                                                           reqkey));
+                       g_variant_new("(is)", PKGMGR_R_OK, reqkey));
        ret = 0;
 
-       catch:
+catch:
        if (reqkey)
                free(reqkey);
 
        if (args)
                free(args);
 
+       if (tmp_args)
+               g_free(tmp_args);
+
        return ret;
 }
 
@@ -428,10 +461,13 @@ static int __handle_request_reinstall(uid_t uid,
        }
 
        reqkey = __generate_reqkey(pkgid);
-       if (reqkey == NULL)
+       if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                return -1;
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_REINSTALL, pkgtype,
-                               pkgid, "")) {
+       }
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_REINSTALL, pkgtype,
+                               pkgid, NULL)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
                free(reqkey);
@@ -461,10 +497,13 @@ static int __handle_request_uninstall(uid_t uid,
        }
 
        reqkey = __generate_reqkey(pkgid);
-       if (reqkey == NULL)
+       if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                return -1;
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_UNINSTALL, pkgtype,
-                               pkgid, "")) {
+       }
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_UNINSTALL, pkgtype,
+                               pkgid, NULL)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
                free(reqkey);
@@ -488,83 +527,115 @@ static int __handle_request_move(uid_t uid,
        int move_type = -1;
        char buf[4] = { '\0' };
 
-       g_variant_get(parameters, "(u&s&si)", &target_uid, &pkgtype, &pkgid, &move_type);
+       g_variant_get(parameters, "(u&s&si)", &target_uid, &pkgtype, &pkgid,
+                       &move_type);
        if (target_uid == (uid_t)-1 || pkgtype == NULL || pkgid == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ECOMM));
+                               g_variant_new("(is)", PKGMGR_R_ECOMM, ""));
                return -1;
        }
 
        reqkey = __generate_reqkey(pkgid);
-       if (reqkey == NULL)
+       if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                return -1;
+       }
 
        snprintf(buf, sizeof(buf), "%d", move_type);
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_MOVE, pkgtype,
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_MOVE, pkgtype,
                                pkgid, buf)) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ESYSTEM));
+                               g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
                free(reqkey);
                return -1;
        }
 
        g_dbus_method_invocation_return_value(invocation,
-                       g_variant_new("(i)", PKGMGR_R_OK));
+                       g_variant_new("(is)", PKGMGR_R_OK, reqkey));
        free(reqkey);
 
        return 0;
 }
 
-static int __handle_request_enable_pkg(uid_t uid,
+static int __handle_request_enable_pkgs(uid_t uid,
                GDBusMethodInvocation *invocation, GVariant *parameters)
 {
        uid_t target_uid = (uid_t)-1;
        char *pkgtype = NULL;
-       char *pkgid = NULL;
+       char *pkgid;
+       char *reqkey;
+       GVariantIter *iter;
 
-       g_variant_get(parameters, "(u&s&s)", &target_uid, &pkgtype, &pkgid);
-       if (target_uid == (uid_t)-1 || pkgid == NULL) {
+       g_variant_get(parameters, "(u&sas)", &target_uid, &pkgtype, &iter);
+       if (target_uid == (uid_t)-1 || pkgtype == NULL || iter == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ECOMM));
+                               g_variant_new("(is)", PKGMGR_R_ECOMM, ""));
                return -1;
        }
 
-       if (_pm_queue_push(target_uid, "", PKGMGR_REQUEST_TYPE_ENABLE_PKG, pkgtype,
-                               pkgid, "")) {
+       reqkey = __generate_reqkey("enable_pkgs");
+       if (reqkey == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ESYSTEM));
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                return -1;
        }
 
+       while (g_variant_iter_next(iter, "&s", &pkgid)) {
+               if (_push_queue(target_uid, reqkey, REQUEST_TYPE_ENABLE_PKG,
+                                       pkgtype, pkgid, NULL)) {
+                       g_dbus_method_invocation_return_value(invocation,
+                                       g_variant_new("(is)",
+                                               PKGMGR_R_ESYSTEM, ""));
+                       free(reqkey);
+                       return -1;
+               }
+       }
+
        g_dbus_method_invocation_return_value(invocation,
-                       g_variant_new("(i)", PKGMGR_R_OK));
+                       g_variant_new("(is)", PKGMGR_R_OK, reqkey));
+       free(reqkey);
 
        return 0;
 }
 
-static int __handle_request_disable_pkg(uid_t uid,
+static int __handle_request_disable_pkgs(uid_t uid,
                GDBusMethodInvocation *invocation, GVariant *parameters)
 {
        uid_t target_uid = (uid_t)-1;
        char *pkgtype = NULL;
-       char *pkgid = NULL;
+       char *pkgid;
+       char *reqkey;
+       GVariantIter *iter;
 
-       g_variant_get(parameters, "(u&s&s)", &target_uid, &pkgtype, &pkgid);
-       if (target_uid == (uid_t)-1 || pkgid == NULL) {
+       g_variant_get(parameters, "(u&sas)", &target_uid, &pkgtype, &iter);
+       if (target_uid == (uid_t)-1 || pkgtype == NULL || iter == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ECOMM));
+                               g_variant_new("(is)", PKGMGR_R_ECOMM, ""));
                return -1;
        }
 
-       if (_pm_queue_push(target_uid, "", PKGMGR_REQUEST_TYPE_DISABLE_PKG, pkgtype,
-                               pkgid, "")) {
+       reqkey = __generate_reqkey("disable_pkgs");
+       if (reqkey == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ESYSTEM));
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                return -1;
        }
 
+       while (g_variant_iter_next(iter, "&s", &pkgid)) {
+               if (_push_queue(target_uid, reqkey, REQUEST_TYPE_DISABLE_PKG,
+                                       pkgtype, pkgid, NULL)) {
+                       g_dbus_method_invocation_return_value(invocation,
+                                       g_variant_new("(is)",
+                                               PKGMGR_R_ESYSTEM, ""));
+                       free(reqkey);
+                       return -1;
+               }
+       }
+
        g_dbus_method_invocation_return_value(invocation,
-                       g_variant_new("(i)", PKGMGR_R_OK));
+                       g_variant_new("(is)", PKGMGR_R_OK, reqkey));
+       free(reqkey);
 
        return 0;
 }
@@ -586,12 +657,14 @@ static int __handle_request_enable_app(uid_t uid,
 
        reqkey = __generate_reqkey(appid);
        if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                ret = -1;
                goto catch;
        }
 
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_ENABLE_APP, "default",
-                               appid, "")) {
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_ENABLE_APP, "default",
+                               appid, NULL)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
                ret = -1;
@@ -604,7 +677,7 @@ static int __handle_request_enable_app(uid_t uid,
        ret = 0;
 
 catch:
-       if(reqkey)
+       if (reqkey)
                free(reqkey);
 
        return ret;
@@ -627,12 +700,14 @@ static int __handle_request_disable_app(uid_t uid,
 
        reqkey = __generate_reqkey(appid);
        if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                ret = -1;
                goto catch;
        }
 
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_DISABLE_APP, "default",
-                               appid, "")) {
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_DISABLE_APP, "default",
+                               appid, NULL)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
                ret = -1;
@@ -668,12 +743,15 @@ static int __handle_request_enable_global_app_for_uid(uid_t uid,
 
        reqkey = __generate_reqkey(appid);
        if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                ret = -1;
                goto catch;
        }
 
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_ENABLE_GLOBAL_APP_FOR_UID, "default",
-                               appid, "")) {
+       if (_push_queue(target_uid, reqkey,
+                               REQUEST_TYPE_ENABLE_GLOBAL_APP_FOR_UID,
+                               "default", appid, NULL)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
                ret = -1;
@@ -709,12 +787,15 @@ static int __handle_request_disable_global_app_for_uid(uid_t uid,
 
        reqkey = __generate_reqkey(appid);
        if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                ret = -1;
                goto catch;
        }
 
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_DISABLE_GLOBAL_APP_FOR_UID, "default",
-                               appid, "")) {
+       if (_push_queue(target_uid, reqkey,
+                               REQUEST_TYPE_DISABLE_GLOBAL_APP_FOR_UID,
+                               "default", appid, NULL)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
                ret = -1;
@@ -750,11 +831,14 @@ static int __handle_request_getsize(uid_t uid,
        }
 
        reqkey = __generate_reqkey(pkgid);
-       if (reqkey == NULL)
+       if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(is)", PKGMGR_R_ENOMEM, ""));
                return -1;
+       }
 
        snprintf(buf, sizeof(buf), "%d", get_type);
-       if (_pm_queue_push(target_uid, reqkey, PKGMGR_REQUEST_TYPE_GETSIZE, "pkgtool",
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_GETSIZE, "pkgtool",
                                pkgid, buf)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(is)", PKGMGR_R_ESYSTEM, ""));
@@ -775,6 +859,7 @@ static int __handle_request_cleardata(uid_t uid,
        uid_t target_uid = (uid_t)-1;
        char *pkgtype = NULL;
        char *pkgid = NULL;
+       char *reqkey = NULL;
 
        g_variant_get(parameters, "(u&s&s)", &target_uid, &pkgtype, &pkgid);
        if (target_uid == (uid_t)-1 || pkgtype == NULL || pkgid == NULL) {
@@ -783,16 +868,26 @@ static int __handle_request_cleardata(uid_t uid,
                return -1;
        }
 
-       if (_pm_queue_push(target_uid, "", PKGMGR_REQUEST_TYPE_CLEARDATA, "pkgtool",
-                               pkgid, "")) {
+       reqkey = __generate_reqkey(pkgid);
+       if (reqkey == NULL) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(i)", PKGMGR_R_ENOMEM));
+               return -1;
+       }
+
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_CLEARDATA, pkgtype,
+                               pkgid, NULL)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(i)", PKGMGR_R_ESYSTEM));
+               free(reqkey);
                return -1;
        }
 
        g_dbus_method_invocation_return_value(invocation,
                        g_variant_new("(i)", PKGMGR_R_OK));
 
+       free(reqkey);
+
        return 0;
 }
 
@@ -809,8 +904,8 @@ static int __handle_request_clearcache(uid_t uid,
                return -1;
        }
 
-       if (_pm_queue_push(target_uid, "", PKGMGR_REQUEST_TYPE_CLEARCACHE,
-                               "pkgtool",  pkgid, "")) {
+       if (_push_queue(target_uid, NULL, REQUEST_TYPE_CLEARCACHE,
+                               "pkgtool",  pkgid, NULL)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(i)", PKGMGR_R_ESYSTEM));
                return -1;
@@ -827,23 +922,33 @@ static int __handle_request_kill(uid_t uid,
 {
        uid_t target_uid = (uid_t)-1;
        char *pkgid = NULL;
+       char *reqkey = NULL;
 
        g_variant_get(parameters, "(u&s)", &target_uid, &pkgid);
        if (target_uid == (uid_t)-1 || pkgid == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ECOMM));
+                               g_variant_new("(ii)", PKGMGR_R_ECOMM, 0));
                return -1;
        }
 
-       if (_pm_queue_push(target_uid, "", PKGMGR_REQUEST_TYPE_KILL, "default",
-                               pkgid, "")) {
+       reqkey = __generate_reqkey(pkgid);
+       if (reqkey == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ESYSTEM));
+                               g_variant_new("(ii)", PKGMGR_R_ENOMEM, 0));
                return -1;
        }
 
-       g_dbus_method_invocation_return_value(invocation,
-                       g_variant_new("(i)", PKGMGR_R_OK));
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_KILL,
+                               "default", pkgid, NULL)) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(ii)", PKGMGR_R_ESYSTEM, 0));
+               free(reqkey);
+               return -1;
+       }
+
+       if (!g_hash_table_insert(req_table, (gpointer)reqkey,
+                               (gpointer)invocation))
+               ERR("reqkey already exists");
 
        return 0;
 }
@@ -853,23 +958,33 @@ static int __handle_request_check(uid_t uid,
 {
        uid_t target_uid = (uid_t)-1;
        char *pkgid = NULL;
+       char *reqkey = NULL;
 
        g_variant_get(parameters, "(u&s)", &target_uid, &pkgid);
        if (target_uid == (uid_t)-1 || pkgid == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ECOMM));
+                               g_variant_new("(ii)", PKGMGR_R_ECOMM, 0));
                return -1;
        }
 
-       if (_pm_queue_push(target_uid, "", PKGMGR_REQUEST_TYPE_CHECK, "default",
-                               pkgid, "")) {
+       reqkey = __generate_reqkey(pkgid);
+       if (reqkey == NULL) {
                g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", PKGMGR_R_ESYSTEM));
+                               g_variant_new("(ii)", PKGMGR_R_ENOMEM, 0));
                return -1;
        }
 
-       g_dbus_method_invocation_return_value(invocation,
-                       g_variant_new("(i)", PKGMGR_R_OK));
+       if (_push_queue(target_uid, reqkey, REQUEST_TYPE_CHECK,
+                               "default", pkgid, NULL)) {
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(ii)", PKGMGR_R_ESYSTEM, 0));
+               free(reqkey);
+               return -1;
+       }
+
+       if (!g_hash_table_insert(req_table, (gpointer)reqkey,
+                               (gpointer)invocation))
+               ERR("reqkey already exists");
 
        return 0;
 }
@@ -895,9 +1010,9 @@ static int __handle_request_generate_license_request(uid_t uid,
                return -1;
        }
 
-       if (_pm_queue_push(uid, reqkey,
-                               PKGMGR_REQUEST_TYPE_GENERATE_LICENSE_REQUEST,
-                               "default", "", resp_data)) {
+       if (_push_queue(uid, reqkey,
+                               REQUEST_TYPE_GENERATE_LICENSE_REQUEST,
+                               "default", NULL, resp_data)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(iss)", PKGMGR_R_ESYSTEM, "",
                                        ""));
@@ -932,8 +1047,8 @@ static int __handle_request_register_license(uid_t uid,
                return -1;
        }
 
-       if (_pm_queue_push(uid, reqkey, PKGMGR_REQUEST_TYPE_REGISTER_LICENSE,
-                               "default", "", resp_data)) {
+       if (_push_queue(uid, reqkey, REQUEST_TYPE_REGISTER_LICENSE,
+                               "default", NULL, resp_data)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(i)", PKGMGR_R_ESYSTEM));
                free(reqkey);
@@ -969,8 +1084,9 @@ static int __handle_request_decrypt_package(uid_t uid,
                return -1;
        }
 
-       if (_pm_queue_push(uid, reqkey, PKGMGR_REQUEST_TYPE_DECRYPT_PACKAGE,
-                               "default", drm_file_path, decrypted_file_path)) {
+       if (_push_queue(uid, reqkey, REQUEST_TYPE_DECRYPT_PACKAGE,
+                               "default", drm_file_path,
+                               decrypted_file_path)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(i)", PKGMGR_R_ESYSTEM));
                free(reqkey);
@@ -1003,11 +1119,13 @@ static int __update_app_splash_screen(uid_t uid,
        reqkey = __generate_reqkey(appid);
        if (reqkey == NULL) {
                ERR("Failed to generate request key");
+               g_dbus_method_invocation_return_value(invocation,
+                               g_variant_new("(i)", PKGMGR_R_ENOMEM));
                return -1;
        }
 
-       if (_pm_queue_push(target_uid, reqkey, req_type, "default",
-                               appid, "")) {
+       if (_push_queue(target_uid, reqkey, req_type, "default",
+                               appid, NULL)) {
                ERR("Failed to push request");
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(i)", PKGMGR_R_ESYSTEM));
@@ -1028,14 +1146,14 @@ static int __handle_request_enable_app_splash_screen(uid_t uid,
                GDBusMethodInvocation *invocation, GVariant *parameters)
 {
        return __update_app_splash_screen(uid, invocation, parameters,
-                       PKGMGR_REQUEST_TYPE_ENABLE_APP_SPLASH_SCREEN);
+                       REQUEST_TYPE_ENABLE_APP_SPLASH_SCREEN);
 }
 
 static int __handle_request_disable_app_splash_screen(uid_t uid,
                GDBusMethodInvocation *invocation, GVariant *parameters)
 {
        return __update_app_splash_screen(uid, invocation, parameters,
-                       PKGMGR_REQUEST_TYPE_DISABLE_APP_SPLASH_SCREEN);
+                       REQUEST_TYPE_DISABLE_APP_SPLASH_SCREEN);
 }
 
 static int __handle_request_set_restriction_mode(uid_t uid,
@@ -1062,8 +1180,8 @@ static int __handle_request_set_restriction_mode(uid_t uid,
        }
 
        snprintf(buf, sizeof(buf), "%d", mode);
-       if (_pm_queue_push(target_uid, reqkey,
-                               PKGMGR_REQUEST_TYPE_SET_RESTRICTION_MODE,
+       if (_push_queue(target_uid, reqkey,
+                               REQUEST_TYPE_SET_RESTRICTION_MODE,
                                "default", pkgid, buf)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(i)", PKGMGR_R_ESYSTEM));
@@ -1102,8 +1220,8 @@ static int __handle_request_unset_restriction_mode(uid_t uid,
        }
 
        snprintf(buf, sizeof(buf), "%d", mode);
-       if (_pm_queue_push(target_uid, reqkey,
-                               PKGMGR_REQUEST_TYPE_UNSET_RESTRICTION_MODE,
+       if (_push_queue(target_uid, reqkey,
+                               REQUEST_TYPE_UNSET_RESTRICTION_MODE,
                                "default", pkgid, buf)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(i)", PKGMGR_R_ESYSTEM));
@@ -1139,9 +1257,9 @@ static int __handle_request_get_restriction_mode(uid_t uid,
                return -1;
        }
 
-       if (_pm_queue_push(target_uid, reqkey,
-                               PKGMGR_REQUEST_TYPE_GET_RESTRICTION_MODE,
-                               "default", pkgid, "")) {
+       if (_push_queue(target_uid, reqkey,
+                               REQUEST_TYPE_GET_RESTRICTION_MODE,
+                               "default", pkgid, NULL)) {
                g_dbus_method_invocation_return_value(invocation,
                                g_variant_new("(ii)", -1, PKGMGR_R_ESYSTEM));
                free(reqkey);
@@ -1197,7 +1315,8 @@ static void __handle_method_call(GDBusConnection *connection,
        if (g_strcmp0(method_name, "install") == 0)
                ret = __handle_request_install(uid, invocation, parameters);
        else if (g_strcmp0(method_name, "mount_install") == 0)
-               ret = __handle_request_mount_install(uid, invocation, parameters);
+               ret = __handle_request_mount_install(uid, invocation,
+                               parameters);
        else if (g_strcmp0(method_name, "reinstall") == 0)
                ret = __handle_request_reinstall(uid, invocation, parameters);
        else if (g_strcmp0(method_name, "uninstall") == 0)
@@ -1206,10 +1325,10 @@ static void __handle_method_call(GDBusConnection *connection,
                ret = __handle_request_cleardata(uid, invocation, parameters);
        else if (g_strcmp0(method_name, "move") == 0)
                ret = __handle_request_move(uid, invocation, parameters);
-       else if (g_strcmp0(method_name, "enable") == 0)
-               ret = __handle_request_enable_pkg(uid, invocation, parameters);
-       else if (g_strcmp0(method_name, "disable") == 0)
-               ret = __handle_request_disable_pkg(uid, invocation, parameters);
+       else if (g_strcmp0(method_name, "enable_pkgs") == 0)
+               ret = __handle_request_enable_pkgs(uid, invocation, parameters);
+       else if (g_strcmp0(method_name, "disable_pkgs") == 0)
+               ret = __handle_request_disable_pkgs(uid, invocation, parameters);
        else if (g_strcmp0(method_name, "getsize") == 0)
                ret = __handle_request_getsize(uid, invocation, parameters);
        else if (g_strcmp0(method_name, "clearcache") == 0)
@@ -1219,9 +1338,11 @@ static void __handle_method_call(GDBusConnection *connection,
        else if (g_strcmp0(method_name, "disable_app") == 0)
                ret = __handle_request_disable_app(uid, invocation, parameters);
        else if (g_strcmp0(method_name, "enable_global_app_for_uid") == 0)
-               ret = __handle_request_enable_global_app_for_uid(uid, invocation, parameters);
+               ret = __handle_request_enable_global_app_for_uid(uid,
+                               invocation, parameters);
        else if (g_strcmp0(method_name, "disable_global_app_for_uid") == 0)
-               ret = __handle_request_disable_global_app_for_uid(uid, invocation, parameters);
+               ret = __handle_request_disable_global_app_for_uid(uid,
+                               invocation, parameters);
        else if (g_strcmp0(method_name, "kill") == 0)
                ret = __handle_request_kill(uid, invocation, parameters);
        else if (g_strcmp0(method_name, "check") == 0)
@@ -1257,7 +1378,7 @@ static void __handle_method_call(GDBusConnection *connection,
                g_idle_add(queue_job, NULL);
 }
 
-int __return_value_to_caller(const char *req_key, GVariant *result)
+int _return_value_to_caller(const char *req_key, GVariant *result)
 {
        GDBusMethodInvocation *invocation;
 
@@ -1274,8 +1395,7 @@ int __return_value_to_caller(const char *req_key, GVariant *result)
        return 0;
 }
 
-static const GDBusInterfaceVTable interface_vtable =
-{
+static const GDBusInterfaceVTable interface_vtable = {
        __handle_method_call,
        NULL,
        NULL,
@@ -1311,9 +1431,10 @@ static void __on_name_lost(GDBusConnection *connection, const gchar *name,
        DBG("on name lost: %s", name);
 }
 
-int __init_request_handler(void)
+int _init_request_handler(void)
 {
-       instropection_data = g_dbus_node_info_new_for_xml(instropection_xml, NULL);
+       instropection_data = g_dbus_node_info_new_for_xml(instropection_xml,
+                       NULL);
 
        owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM, PKGMGR_DBUS_SERVICE,
                        G_BUS_NAME_OWNER_FLAGS_NONE, __on_bus_acquired,
@@ -1327,7 +1448,7 @@ int __init_request_handler(void)
        return 0;
 }
 
-void __fini_request_handler(void)
+void _fini_request_handler(void)
 {
        g_hash_table_destroy(req_table);
        g_bus_unown_name(owner_id);
Domain: App Framework / Application Installer;