Slave debugging method is updated

Change-Id: I73ca30e4a3b6530c2924692023741ecb928bbf6e

diff --git a/packaging/com.samsung.data-provider-master.spec b/packaging/com.samsung.data-provider-master.spec
index 0633bfb..2d16526 100644 (file)
--- a/packaging/com.samsung.data-provider-master.spec
+++ b/packaging/com.samsung.data-provider-master.spec
@@ -1,6 +1,6 @@
 Name: com.samsung.data-provider-master
 Summary: Master service provider for liveboxes.
-Version: 0.15.4
+Version: 0.15.5
 Release: 1
 Group: framework/livebox
 License: Flora License

diff --git a/src/server.c b/src/server.c
index c87b845..2a481b7 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -3940,16 +3940,19 @@ static struct packet *slave_hello(pid_t pid, int handle, const struct packet *pa
                        const char *abi;
 
                        if (aul_app_get_pkgname_bypid(pid, pkgname, sizeof(pkgname)) != AUL_R_OK) {
-                               ErrPrint("pid[%d] is not authroized provider package\n", pid);
-                               ret = -EINVAL;
-                               goto out;
+                               ErrPrint("pid[%d] is not authroized provider package, try to find it using its name[%s]\n", pid, slavename);
+                               slave = slave_find_by_name(slavename);
+                               pkgname[0] = '\0'; /* Reset the pkgname */
+                       } else {
+                               slave = slave_find_by_pkgname(pkgname);
                        }
 
-                       slave = slave_find_by_pkgname(pkgname);
                        if (!slave) {
                                abi = abi_find_by_pkgname(pkgname);
-                               if (!abi)
-                                       abi = "unknown";
+                               if (!abi) {
+                                       abi = DEFAULT_ABI;
+                                       DbgPrint("Slave pkgname is invalid, ABI is replaced with '%s'(default)\n", abi);
+                               }
 
                                slave = slave_create(slavename, 1, abi, pkgname);
                                if (!slave) {

diff --git a/src/slave_life.c b/src/slave_life.c
index 771fe3d..c04ab5d 100644 (file)
--- a/src/slave_life.c
+++ b/src/slave_life.c
@@ -1184,15 +1184,15 @@ HAPI const char *slave_state_string(const struct slave_node *slave)
 {
        switch (slave->state) {
        case SLAVE_REQUEST_TO_LAUNCH:
-               return "Request to launch";
+               return "RequestToLaunch";
        case SLAVE_REQUEST_TO_TERMINATE:
-               return "Request to terminate";
+               return "RequestToTerminate";
        case SLAVE_TERMINATED:
                return "Terminated";
        case SLAVE_REQUEST_TO_PAUSE:
-               return "Request to pause";
+               return "RequestToPause";
        case SLAVE_REQUEST_TO_RESUME:
-               return "Request to resume";
+               return "RequestToResume";
        case SLAVE_PAUSED:
                return "Paused";
        case SLAVE_RESUMED: