Fix TCP error when thumb-server is ready

Change-Id: Ica16b7d2adebb5f037bfa9c0ffe9d315202f8467
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-util-ipc.h b/lib/include/media-util-ipc.h
index 70878c1..9c7e70f 100755 (executable)
--- a/lib/include/media-util-ipc.h
+++ b/lib/include/media-util-ipc.h
@@ -49,7 +49,6 @@ int ms_ipc_create_client_socket(int timeout_sec, int *sock_fd);
 int ms_ipc_create_server_socket(ms_msg_port_type_e port, int *sock_fd);
 int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_msg_port_type_e port, ms_comm_msg_s *send_msg, struct sockaddr_un *serv_addr);
 int ms_ipc_send_msg_to_client_tcp(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *client_addr);
-int ms_ipc_receive_message(int sockfd, void *recv_msg);
 int ms_ipc_receive_message_tcp(int client_sock, ms_comm_msg_s *recv_msg);
 int ms_ipc_accept_client_tcp(int serv_sock, int* client_sock);
 

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index fa3aca2..879b3cd 100755 (executable)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -162,25 +162,6 @@ int ms_ipc_send_msg_to_client_tcp(int sockfd, ms_comm_msg_s *send_msg, struct so
        return MS_MEDIA_ERR_NONE;
 }
 
-int ms_ipc_receive_message(int sockfd, void *recv_msg)
-{
-       int recv_msg_size;
-
-       MSAPI_RETV_IF(recv_msg == NULL, MS_MEDIA_ERR_INVALID_PARAMETER);
-
-       if ((recv_msg_size = read(sockfd, recv_msg, sizeof(ms_comm_msg_s))) < 0) {
-               if (errno == EWOULDBLOCK) {
-                       MSAPI_DBG_ERR("Timeout. Can't try any more");
-                       return MS_MEDIA_ERR_SOCKET_RECEIVE_TIMEOUT;
-               } else {
-                       MSAPI_DBG_STRERROR("recv failed");
-                       return MS_MEDIA_ERR_SOCKET_RECEIVE;
-               }
-       }
-
-       return MS_MEDIA_ERR_NONE;
-}
-
 int ms_ipc_accept_client_tcp(int serv_sock, int* client_sock)
 {
        int sockfd = -1;

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
index 3a21ab7..976c99a 100755 (executable)
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -243,7 +243,8 @@ gboolean _ms_thumb_agent_recv_msg_from_server()
 {
        struct sockaddr_un serv_addr;
        unsigned int serv_addr_len;
-
+       ms_thumb_server_msg recv_msg;
+       int len = 0;
        int sockfd = -1;
 
        if (g_communicate_sock <= 0)
@@ -256,17 +257,12 @@ gboolean _ms_thumb_agent_recv_msg_from_server()
                return FALSE;
        }
 
-       ms_thumb_server_msg recv_msg;
-       int recv_msg_size = 0;
-
-       recv_msg_size = ms_ipc_receive_message(sockfd, &recv_msg);
-       if (recv_msg_size != MS_MEDIA_ERR_NONE) {
-               MS_DBG_STRERROR("ms_ipc_receive_message failed");
+       if ((len = read(sockfd, &recv_msg, sizeof(ms_thumb_server_msg))) < 0) {
+               MS_DBG_STRERROR("read failed");
                close(sockfd);
                return FALSE;
        }
 
-       //MS_DBG("Receive : %d(%d)", recv_msg.msg_type, recv_msg_size);
        if (recv_msg.msg_type == MS_MSG_THUMB_SERVER_READY)
                MS_DBG("Thumbnail server is ready");