Modified TCP transfer

1. Modified result compare
2. Remove response for kill-msg
3. Remove block send

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

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 37fe3c1..56f4baa 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.3.64
+Version:    0.3.65
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
index 3a21ab7..7071d3c 100755 (executable)
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -31,8 +31,6 @@
 
 #define LOG_TAG "MEDIA_SERVER_THUMB"
 
-#define THUMB_SERVER_NAME "media-thumbnail"
-#define MS_SOCK_BLOCK_SIZE 512
 #define THUMB_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN, "media-thumbnail-server")
 
 gboolean _ms_thumb_agent_timer();
@@ -107,13 +105,8 @@ int _media_thumb_get_error()
 
 int _ms_thumb_recv_msg(int sock, thumbMsg *msg)
 {
-       int recv_msg_len = 0;
        int remain_size = 0;
-       int block_size = MS_SOCK_BLOCK_SIZE;
-       int recv_block = 0;
        unsigned char *buf = NULL;
-       unsigned char *block_buf = NULL;
-
        unsigned int header_size = 0;
 
        header_size = sizeof(thumbMsg) - sizeof(unsigned char *);
@@ -124,7 +117,7 @@ int _ms_thumb_recv_msg(int sock, thumbMsg *msg)
                return MS_MEDIA_ERR_OUT_OF_MEMORY;
        }
 
-       if ((recv_msg_len = recv(sock, buf, header_size, 0)) < 0) {
+       if (recv(sock, buf, header_size, 0) < 0) {
                MS_DBG_STRERROR("recv failed");
                MS_SAFE_FREE(buf);
                return _media_thumb_get_error();
@@ -136,8 +129,8 @@ int _ms_thumb_recv_msg(int sock, thumbMsg *msg)
        MS_SAFE_FREE(buf);
 
        if (msg->msg_type == THUMB_REQUEST_KILL_SERVER) {
-               MS_DBG("msg_type only cases [%d]", msg->msg_type);
-               return MS_MEDIA_ERR_NONE;
+               MS_DBG("Thumb-server does not send KILL_SERVER[%d]", msg->msg_type);
+               return MS_MEDIA_ERR_DATA_TAINTED;
        }
 
        if (strlen(msg->org_path) == 0 || strlen(msg->org_path) >= MS_FILE_PATH_LEN_MAX) {
@@ -160,34 +153,17 @@ int _ms_thumb_recv_msg(int sock, thumbMsg *msg)
 
        if (msg->thumb_size > 0) {
                remain_size = msg->thumb_size;
-               MS_MALLOC(block_buf, MS_SOCK_BLOCK_SIZE);
-               if (block_buf == NULL) {
-                       return MS_MEDIA_ERR_OUT_OF_MEMORY;
-               }
 
                MS_MALLOC(buf, remain_size);
-               if (buf == NULL) {
-                       MS_SAFE_FREE(block_buf);
+               if (buf == NULL)
                        return MS_MEDIA_ERR_OUT_OF_MEMORY;
-               }
 
-               while (remain_size > 0) {
-                       if (remain_size < MS_SOCK_BLOCK_SIZE)
-                               block_size = remain_size;
-
-                       if ((recv_msg_len = recv(sock, block_buf, block_size, 0)) < 0) {
-                               MS_DBG_STRERROR("recv failed");
-                               MS_SAFE_FREE(buf);
-                               MS_SAFE_FREE(block_buf);
-                               return _media_thumb_get_error();
-                       }
-                       memcpy(buf+recv_block, block_buf, block_size);
-                       recv_block += block_size;
-                       remain_size -= block_size;
-                       memset(block_buf, 0, MS_SOCK_BLOCK_SIZE);
+               if (recv(sock, buf, remain_size, 0) < 0) {
+                       MS_DBG_STRERROR("recv failed");
+                       MS_SAFE_FREE(buf);
+                       return _media_thumb_get_error();
                }
 
-               MS_SAFE_FREE(block_buf);
                MS_SAFE_FREE(msg->thumb_data);
 
                MS_MALLOC(msg->thumb_data, (unsigned int)(msg->thumb_size));
@@ -330,7 +306,7 @@ gboolean _ms_thumb_agent_send_msg_to_thumb_server(thumbMsg *recv_msg, thumbMsg *
        _ms_thumb_set_buffer(recv_msg, &buf, &buf_size);
 
        //MS_DBG("buffer size : %d", buf_size);
-       if (send(sock, buf, buf_size, 0) != buf_size) {
+       if (send(sock, buf, buf_size, 0) < 0) {
                MS_DBG_STRERROR("send failed");
                MS_SAFE_FREE(buf);
                close(sock);
@@ -340,6 +316,12 @@ gboolean _ms_thumb_agent_send_msg_to_thumb_server(thumbMsg *recv_msg, thumbMsg *
        MS_SAFE_FREE(buf);
        MS_DBG_SLOG("Sending msg to thumbnail server is successful");
 
+       if (recv_msg->msg_type == THUMB_REQUEST_KILL_SERVER) {
+               MS_DBG_SLOG("No response if msg type is kill server[%d]", recv_msg->msg_type);
+               close(sock);
+               return TRUE;
+       }
+
        if (_ms_thumb_recv_msg(sock, res_msg) < 0) {
                MS_DBG_ERR("_ms_thumb_recv_msg failed");
                close(sock);
@@ -364,23 +346,19 @@ gboolean _ms_thumb_agent_timer()
        if (g_server_pid > 0) {
                /* Kill thumbnail server */
                thumbMsg msg;
-               thumbMsg recv_msg;
                memset((void *)&msg, 0, sizeof(msg));
-               memset((void *)&recv_msg, 0, sizeof(recv_msg));
 
                msg.msg_type = THUMB_REQUEST_KILL_SERVER;
                msg.org_path[0] = '\0';
                msg.dst_path[0] = '\0';
-               msg.thumb_size = 0;
 
                /* Command Kill to thumbnail server */
                g_shutdowning_thumb_server = TRUE;
-               if (!_ms_thumb_agent_send_msg_to_thumb_server(&msg, &recv_msg)) {
+               if (!_ms_thumb_agent_send_msg_to_thumb_server(&msg, NULL)) {
                        MS_DBG_ERR("_ms_thumb_agent_send_msg_to_thumb_server is failed");
                        g_shutdowning_thumb_server = FALSE;
                }
                usleep(200000);
-               MS_SAFE_FREE(recv_msg.thumb_data);
        } else {
                MS_DBG_ERR("g_server_pid is %d. Maybe there's problem in thumbnail-server", g_server_pid);
        }
@@ -463,7 +441,7 @@ gboolean _ms_thumb_request_to_server(gpointer data)
                        unsigned char *buf = NULL;
                        _ms_thumb_set_buffer(&res_msg, &buf, &buf_size);
 
-                       if (send(client_sock, buf, buf_size, 0) != buf_size)
+                       if (send(client_sock, buf, buf_size, 0) < 0)
                                MS_DBG_STRERROR("sendto failed");
                        else
                                MS_DBG("Sent Refuse msg from %s", recv_msg->org_path);
@@ -483,27 +461,25 @@ gboolean _ms_thumb_request_to_server(gpointer data)
        SAFE_STRLCPY(res_msg.org_path, recv_msg->org_path, sizeof(res_msg.org_path));
 
        int buf_size = 0;
-       int sending_block = 0;
-       int block_size = sizeof(res_msg) - sizeof(unsigned char *);
+       int remain_size = 0;
+       int head_size = sizeof(res_msg) - sizeof(unsigned char *);
        unsigned char *buf = NULL;
        _ms_thumb_set_buffer(&res_msg, &buf, &buf_size);
+       remain_size = buf_size - head_size;
 
-       while (buf_size > 0) {
-               if (buf_size < MS_SOCK_BLOCK_SIZE)
-                       block_size = buf_size;
-
-               if (send(client_sock, buf+sending_block, block_size, 0) != block_size)
-                       MS_DBG_STRERROR("sendto failed");
-
-               sending_block += block_size;
-               buf_size -= block_size;
-               if (block_size < MS_SOCK_BLOCK_SIZE)
-                       block_size = MS_SOCK_BLOCK_SIZE;
+       if (send(client_sock, buf, head_size, 0) < 0) {
+               MS_DBG_STRERROR("send failed");
+       } else {
+               if (remain_size > 0) {
+                       if (send(client_sock, buf + head_size, remain_size, 0) < 0)
+                               MS_DBG_STRERROR("send failed");
+                       else
+                               MS_DBG_SLOG("Sent data(%d) from %s", res_msg.thumb_size, res_msg.org_path);
+               } else {
+                       MS_DBG_SLOG("Sent thumb(%s) from %s", res_msg.dst_path, res_msg.org_path);
+               }
        }
 
-       if (buf_size == 0)
-               MS_DBG_SLOG("Sent data(%d) from %s", res_msg.thumb_size, res_msg.org_path);
-
        close(client_sock);
        MS_SAFE_FREE(buf);
        MS_SAFE_FREE(req->recv_msg);
@@ -586,8 +562,8 @@ gboolean _ms_thumb_agent_read_socket(GIOChannel *src,
                int buf_size = 0;
                _ms_thumb_set_buffer(&res_msg, &buf, &buf_size);
 
-               if (send(client_sock, buf, buf_size, 0) != buf_size)
-                       MS_DBG_STRERROR("sendto failed");
+               if (send(client_sock, buf, buf_size, 0) < 0)
+                       MS_DBG_STRERROR("send failed");
                else
                        MS_DBG("Sent Refuse msg from %s", recv_msg->org_path);