Replace error message from invalid operation to permission deny when daemon does...

Change-Id: I9d24b19f7bf97fdf4a510b0de9ce8cc3ab97ff26
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index 720add4..dc773be 100755 (executable)
--- a/packaging/capi-media-controller.spec
+++ b/packaging/capi-media-controller.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    A media controller library in Tizen Native API
-Version:    0.0.15
+Version:    0.0.16
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c
index cbd9ba0..66a3222 100755 (executable)
--- a/src/media_controller_ipc.c
+++ b/src/media_controller_ipc.c
@@ -327,7 +327,10 @@ int mc_ipc_send_message_to_server(mc_msg_type_e msg_type, const char *request_ms
        if (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {
                mc_stderror("connect error");
                mc_ipc_delete_client_socket(&sock_info);
-               return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
+               if (errno == EACCES)
+                       return MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED;
+               else
+                       return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
        }
 
        /* Send request */
@@ -415,17 +418,19 @@ int mc_ipc_service_connect(void)
 
        mc_ipc_delete_client_socket(&sock_info);
 
-       while ((__is_service_activated() != MEDIA_CONTROLLER_ERROR_NONE) && (retrycount++ < MAX_WAIT_COUNT)) {
+       ret = __is_service_activated();
+       if (ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED) {
+               mc_error("Permission deny!");
+               return ret;
+       }
+       while ((ret != MEDIA_CONTROLLER_ERROR_NONE) && (retrycount++ < MAX_WAIT_COUNT)) {
                MC_MILLISEC_SLEEP(200);
                mc_error("[No-Error] retry count [%d]", retrycount);
-       }
-
-       if (retrycount < MAX_WAIT_COUNT) {
-               mc_debug("CONNECT OK");
-               ret = MEDIA_CONTROLLER_ERROR_NONE;
-       } else {
-               mc_error("CONNECT FAIL");
-               ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
+               ret = __is_service_activated();
+               if (ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED) {
+                       mc_error("Permission deny!");
+                       return ret;
+               }
        }
 
        return ret;