struct inst_info *inst;
};
+/**
+ * Returns DBox Id from provider Id
+ */
+static char *is_valid_slave(pid_t pid, struct slave_node *slave, const char *provider_pkgname)
+{
+ char pid_pkgname[pathconf("/", _PC_PATH_MAX)];
+ const char *abi;
+ const char *abi_pkgname;
+ dynamicbox_pkglist_h list_handle;
+ char *pkgid;
+ char *dbox_id;
+ char *converted_provider_pkgname = NULL;
+ int verified;
+
+ if (aul_app_get_pkgname_bypid(pid, pid_pkgname, sizeof(pid_pkgname)) != AUL_R_OK) {
+ ErrPrint("pid[%d] is not authroized provider package, try to find it using its name[%s]\n", pid, slave_name(slave));
+ return NULL;
+ }
+
+ abi = slave_abi(slave);
+ if (!abi) {
+ ErrPrint("Slave doesn't have valid abi\n");
+ return NULL;
+ }
+
+ abi_pkgname = abi_find_slave(abi);
+ if (!abi_pkgname) {
+ ErrPrint("ABI has no valid entry[%s]\n", abi);
+ return NULL;
+ }
+
+ if (!strcmp(abi_pkgname, pid_pkgname)) {
+ /*!
+ * This request is comes from predefined service provider.
+ * In this case, we should believe its request.
+ */
+ return strdup(provider_pkgname);
+ }
+
+ /*!
+ * This request is comes from standalone dbox provider (not the predefined service provider)
+ */
+ pkgid = package_get_pkgid(provider_pkgname);
+ list_handle = dynamicbox_service_pkglist_create(pkgid, NULL);
+ DbgFree(pkgid);
+
+ verified = 0;
+ dbox_id = NULL;
+ while (dynamicbox_service_get_pkglist_item(list_handle, NULL, &dbox_id, NULL) == DBOX_STATUS_ERROR_NONE) {
+ if (!dbox_id) {
+ ErrPrint("Invalid dbox_id\n");
+ continue;
+ }
+
+ // tmp == /APPID/.provider <<- PROVIDER UI-APP
+ // dbox_id == com.samsung.watch-hello <<-- DBOX ID
+ // provider_pkgname == com.samsung.watch-hello.provider
+ converted_provider_pkgname = util_replace_string(abi_pkgname, DYNAMICBOX_CONF_REPLACE_TAG_APPID, dbox_id);
+ if (!converted_provider_pkgname) {
+ DbgFree(dbox_id);
+ dbox_id = NULL;
+ continue;
+ }
+
+ /* Verify the Package Name */
+ verified = !strcmp(converted_provider_pkgname, provider_pkgname);
+ DbgFree(converted_provider_pkgname);
+
+ if (verified) {
+ break;
+ }
+
+ DbgFree(dbox_id);
+ dbox_id = NULL;
+ }
+
+ dynamicbox_service_pkglist_destroy(list_handle);
+ return dbox_id;
+}
+
static Eina_Bool lazy_key_status_cb(void *data)
{
struct event_cbdata *cbdata = data;
return result;
}
-static int validate_request(const char *pkgname, const char *id, struct inst_info **out_inst, const struct pkg_info **out_pkg)
+static int validate_request(pid_t pid, struct slave_node *slave, const char *pkgname, const char *id, struct inst_info **out_inst, const struct pkg_info **out_pkg)
{
struct inst_info *inst;
const struct pkg_info *pkg;
- inst = package_find_instance_by_id(pkgname, id);
+ if (slave) {
+ char *dbox_id;
+ /*!
+ * \note
+ * This call can decrease the performance of event handling.
+ * We should consider this to keep or find other way.
+ *
+ * However, we have to conver the provider_pkgname to dbox_id anyway.
+ * Because, the service providers will use the dbox_id
+ * But the standalone providers will use its package id (ui-app, provider id)
+ * For later case, we should convert the provider pkgname to dbox id
+ */
+ dbox_id = is_valid_slave(pid, slave, pkgname);
+ if (!dbox_id) {
+ return DBOX_STATUS_ERROR_INVALID_PARAMETER;
+ }
+
+ inst = package_find_instance_by_id(dbox_id, id);
+ DbgFree(dbox_id);
+ } else {
+ inst = package_find_instance_by_id(pkgname, id);
+ }
+
if (!inst) {
ErrPrint("Instance is not exists (%s)\n", id);
return DBOX_STATUS_ERROR_NOT_EXIST;
}
if (package_is_fault(pkg)) {
- ErrPrint("Faulted package: %s\n", pkgname);
+ ErrPrint("Faulted package: %s\n", package_name(pkg));
return DBOX_STATUS_ERROR_FAULT;
}
* Trust the package name which are sent by the client.
* The package has to be a dynamicbox package name.
*/
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
(void)instance_clicked(inst, event, timestamp, x, y);
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
/*!
* \note
* Trust the package name which are sent by the client.
* The package has to be a dynamicbox package name.
*/
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
ret = instance_text_signal_emit(inst, emission, source, sx, sy, ex, ey);
}
* Trust the package name which are sent by the client.
* The package has to be a dynamicbox package name.
*/
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
DbgPrint("Failed to find by id(%s), try to find it using timestamp(%lf)\n", id, timestamp);
inst = package_find_instance_by_timestamp(pkgname, timestamp);
* Trust the package name which are sent by the client.
* The package has to be a dynamicbox package name.
*/
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
* Trust the package name which are sent by the client.
* The package has to be a dynamicbox package name.
*/
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
* Trust the package name which are sent by the client.
* The package has to be a dynamicbox package name.
*/
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
* Trust the package name which are sent by the client.
* The package has to be a dynamicbox package name.
*/
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, NULL, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, NULL, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
DbgPrint("It seems that the instance is already deleted: %s\n", id);
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, NULL, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, NULL, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
DbgPrint("It seems that the instance is already deleted: %s\n", id);
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
ret = instance_set_pinup(inst, pinup);
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
const char *tmp;
tmp = abi_find_slave(abi);
+// abi == app
+// tmp == /APPID/
+// pkgname = com.samsung.watch-sample (from pid, aul_get_pkgname)
if (!strcmp(tmp, pkgname)) {
ErrPrint("Only 3rd or 2nd party can be connected without request of master (%s)\n", pkgname);
goto out;
char *provider_pkgname;
int network = 0;
+ // ui-app -> PACKAGE ID
pkgid = package_get_pkgid(pkgname);
if (!pkgid) {
ErrPrint("Unknown package (%s)\n", pkgname);
continue;
}
+ // tmp == /APPID/.provider <<- PROVIDER UI-APP
+ // dbox_id == com.samsung.watch-hello <<-- DBOX ID
+ // provider_pkgname == com.samsung.watch-hello.provider
provider_pkgname = util_replace_string(tmp, DYNAMICBOX_CONF_REPLACE_TAG_APPID, dbox_id);
if (!provider_pkgname) {
DbgFree(dbox_id);
network = package_network(info);
matched = 1;
+
+ //instance_create(....)
}
break;
slave_set_pid(slave, pid);
DbgPrint("Slave is activated by request: %d (%s)/(%s)\n", pid, pkgname, slavename);
+
+ // instance_create
}
}
} else {
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, slave, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, slave, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, slave, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, slave, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
if (instance_state(inst) == INST_DESTROYED) {
ErrPrint("Package[%s] instance is already destroyed\n", pkgname);
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, slave, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
if (instance_state(inst) == INST_DESTROYED) {
ErrPrint("Package[%s] instance is already destroyed\n", pkgname);
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, slave, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
if (instance_state(inst) == INST_DESTROYED) {
ErrPrint("Package[%s] instance is already destroyed\n", pkgname);
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, slave, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, slave, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
if (instance_state(inst) == INST_DESTROYED) {
ErrPrint("Package[%s] instance is already destroyed\n", pkgname);
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, slave, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
if (instance_state(inst) == INST_DESTROYED) {
ErrPrint("Package[%s] instance is already destroyed\n", pkgname);
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, slave, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
if (instance_state(inst) == INST_DESTROYED) {
ErrPrint("Package[%s] instance is already destroyed\n", pkgname);
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, slave, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, slave, pkgname, id, &inst, NULL);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, slave, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
ret = instance_destroyed(inst, DBOX_STATUS_ERROR_NONE);
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, slave, pkgname, id, &inst, &pkg);
id = "";
if (ret != DBOX_STATUS_ERROR_NONE) {
ret = DBOX_STATUS_ERROR_INVALID_PARAMETER;
if (instance_state(inst) == INST_DESTROYED) {
- ErrPrint("Package[%s] instance is already destroyed\n", pkgname);
+ ErrPrint("Package[%s] instance is already destroyed\n", package_name(pkg));
goto out;
}
ecore_timer_del(gbar_monitor);
inst = instance_unref(inst);
if (!inst) {
- ErrPrint("Instance refcnt is ZERO: %s\n", pkgname);
+ ErrPrint("Instance refcnt is ZERO: %s\n", package_name(pkg));
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, slave, pkgname, id, &inst, &pkg);
id = "";
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, slave, pkgname, id, &inst, &pkg);
id = "";
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, slave, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
goto out;
}
- ret = validate_request(pkgname, id, &inst, &pkg);
+ ret = validate_request(pid, slave, pkgname, id, &inst, &pkg);
if (ret != DBOX_STATUS_ERROR_NONE) {
goto out;
}
}
}
} else {
- ret = validate_request(pkgname, id, &inst, NULL);
+ ret = validate_request(pid, NULL, pkgname, id, &inst, NULL);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
if (instance_state(inst) == INST_DESTROYED) {
ErrPrint("Package[%s] instance is already destroyed\n", pkgname);