[SATIZENVUL-1315/SATIZENVUL-1316] Remove msg_size from dcmMsg

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

diff --git a/lib/include/media-server-ipc.h b/lib/include/media-server-ipc.h
index 43ef796..499ae87 100755 (executable)
--- a/lib/include/media-server-ipc.h
+++ b/lib/include/media-server-ipc.h
@@ -113,7 +113,6 @@ typedef struct {
        int msg_type;
        int pid;
        uid_t uid;
-       size_t msg_size;
        char msg[MAX_FILEPATH_LEN];
        int result;
 } dcmMsg;

diff --git a/lib/media-util-dcm.c b/lib/media-util-dcm.c
index e77c716..dd4c0f0 100755 (executable)
--- a/lib/media-util-dcm.c
+++ b/lib/media-util-dcm.c
@@ -144,7 +144,7 @@ gboolean __media_dcm_write_socket(GIOChannel *src, GIOCondition condition, gpoin
 
        if ((err = recv(sock, &recv_msg, sizeof(dcmMsg), 0)) < 0) {
                MSAPI_DBG_STRERROR("recv failed ");
-               if (recv_msg.msg_size > 0)
+               if (strlen(recv_msg.msg) > 0)
                        __media_dcm_pop_data();
                else
                        MSAPI_DBG_ERR("origin path size is wrong.");
@@ -225,8 +225,6 @@ static int __media_dcm_send_request()
        req_msg.msg_type = req_manager->msg_type;
        req_msg.uid = req_manager->uid;
        SAFE_STRLCPY(req_msg.msg, req_manager->path, sizeof(req_msg.msg));
-       req_msg.msg[strlen(req_msg.msg)] = '\0';
-       req_msg.msg_size = strlen(req_msg.msg) + 1;
 
        if (send(sock, &req_msg, sizeof(req_msg), 0) != sizeof(req_msg)) {
                MSAPI_DBG_STRERROR("send failed");

diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c
index db3140d..0eaee7b 100755 (executable)
--- a/src/server/media-server-dcm.c
+++ b/src/server/media-server-dcm.c
@@ -264,7 +264,6 @@ gboolean _ms_dcm_agent_timer()
 
                msg.msg_type = DCM_MSG_REQUEST_KILL_SERVER;
                msg.msg[0] = '\0';
-               msg.msg_size = 0;
 
                /* Command Kill to DCM service */
                g_shutdowning_dcm_server = TRUE;
@@ -349,8 +348,7 @@ gboolean _ms_dcm_request_to_server(gpointer data)
                        memset((void *)&res_msg, 0, sizeof(res_msg));
 
                        res_msg.msg_type = recv_msg->msg_type;
-                       res_msg.msg_size = strlen(recv_msg->msg);
-                       if (res_msg.msg_size > 0)
+                       if (strlen(recv_msg->msg) > 0)
                                SAFE_STRLCPY(res_msg.msg, recv_msg->msg, sizeof(res_msg.msg));
                        res_msg.result = recv_msg->result;
 
@@ -371,7 +369,6 @@ gboolean _ms_dcm_request_to_server(gpointer data)
        }
 
        SAFE_STRLCPY(res_msg.msg, recv_msg->msg, sizeof(res_msg.msg));
-       res_msg.msg_size = recv_msg->msg_size;
 
        if (send(client_sock, &res_msg, sizeof(res_msg), 0) != sizeof(res_msg))
                MS_DBG_STRERROR("sendto failed");
@@ -444,10 +441,8 @@ gboolean _ms_dcm_agent_read_socket(GIOChannel *src, GIOCondition condition, gpoi
                memset((void *)&res_msg, 0, sizeof(res_msg));
 
                res_msg.msg_type = recv_msg->msg_type;
-               if (res_msg.msg_size != 0) {
-                       res_msg.msg_size = recv_msg->msg_size;
+               if (strlen(recv_msg->msg) != 0)
                        SAFE_STRLCPY(res_msg.msg, recv_msg->msg, sizeof(res_msg.msg));
-               }
 
                if (send(client_sock, &res_msg, sizeof(dcmMsg), 0) != sizeof(dcmMsg))
                        MS_DBG_STRERROR("sendto failed");