Modify directory path

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

diff --git a/lib/media-util-dcm.c b/lib/media-util-dcm.c
old mode 100755 (executable)
new mode 100644 (file)
index a29cc33..5496fe9
--- a/lib/media-util-dcm.c
+++ b/lib/media-util-dcm.c
@@ -26,6 +26,7 @@
 #include <media-util-dcm.h>
 #include <media-util-err.h>
 #include <media-util-ipc.h>
+#include <tzplatform_config.h>
 
 #define DCM_MSG_MAX_SIZE 4096
 
@@ -54,7 +55,7 @@ int _media_dcm_request(int msg_type, const char *path, uid_t uid)
        memset(&serv_addr, 0, sizeof(serv_addr));
        sock = sock_info.sock_fd;
        serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[sock_info.port], strlen(MEDIA_IPC_PATH[sock_info.port]));
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port])));
 
        /* Connecting to the thumbnail server */
        if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
old mode 100755 (executable)
new mode 100644 (file)
index f0fc52d..7015c57
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -37,42 +37,42 @@
 #define MS_SOCK_UDP_BLOCK_SIZE 512
 
 char MEDIA_IPC_PATH[][70] = {
-       {"/var/run/media-server/media_ipc_dbbatchupdate.socket"},
-       {"/var/run/media-server/media_ipc_scandaemon.socket"},
-       {"/var/run/media-server/media_ipc_scanner.socket"},
-       {"/var/run/media-server/media_ipc_dbupdate.socket"},
-       {"/var/run/media-server/media_ipc_thumbcreator.socket"},
-       {"/var/run/media-server/media_ipc_thumbcomm.socket"},
-       {"/var/run/media-server/media_ipc_thumbdaemon.socket"},
-       {"/var/run/media-server/media_ipc_dcmcreator.socket"},
-       {"/var/run/media-server/media_ipc_dcmcomm.socket"},
-       {"/var/run/media-server/media_ipc_dcmdaemon.socket"},
+       {"media-server/media_ipc_dbbatchupdate.socket"},
+       {"media-server/media_ipc_scandaemon.socket"},
+       {"media-server/media_ipc_scanner.socket"},
+       {"media-server/media_ipc_dbupdate.socket"},
+       {"media-server/media_ipc_thumbcreator.socket"},
+       {"media-server/media_ipc_thumbcomm.socket"},
+       {"media-server/media_ipc_thumbdaemon.socket"},
+       {"media-server/media_ipc_dcmcreator.socket"},
+       {"media-server/media_ipc_dcmcomm.socket"},
+       {"media-server/media_ipc_dcmdaemon.socket"},
 };
 
 char MEDIA_IPC_PATH_CLIENT[][80] = {
-       {"/var/run/user/%i/media-server/media_ipc_dbbatchupdate_client%i.socket"},
-       {"/var/run/user/%i/media-server/media_ipc_scandaemon_client%i.socket"},
-       {"/var/run/user/%i/media-server/media_ipc_scanner_client%i.socket"},
-       {"/var/run/user/%i/media-server/media_ipc_dbupdate_client%i.socket"},
-       {"/var/run/user/%i/media-server/media_ipc_thumbcreator_client%i.socket"},
-       {"/var/run/user/%i/media-server/media_ipc_thumbcomm_client%i.socket"},
-       {"/var/run/user/%i/media-server/media_ipc_thumbdaemon_client%i.socket"},
-       {"/var/run/user/%i/media-server/media_ipc_dcmcreator_client%i.socket"},
-       {"/var/run/user/%i/media-server/media_ipc_dcmcomm_client%i.socket"},
-       {"/var/run/user/%i/media-server/media_ipc_dcmdaemon_client%i.socket"},
+       {"user/%i/media-server/media_ipc_dbbatchupdate_client%i.socket"},
+       {"user/%i/media-server/media_ipc_scandaemon_client%i.socket"},
+       {"user/%i/media-server/media_ipc_scanner_client%i.socket"},
+       {"user/%i/media-server/media_ipc_dbupdate_client%i.socket"},
+       {"user/%i/media-server/media_ipc_thumbcreator_client%i.socket"},
+       {"user/%i/media-server/media_ipc_thumbcomm_client%i.socket"},
+       {"user/%i/media-server/media_ipc_thumbdaemon_client%i.socket"},
+       {"user/%i/media-server/media_ipc_dcmcreator_client%i.socket"},
+       {"user/%i/media-server/media_ipc_dcmcomm_client%i.socket"},
+       {"user/%i/media-server/media_ipc_dcmdaemon_client%i.socket"},
 };
 
 char MEDIA_IPC_PATH_CLIENT_ROOT[][80] = {
-       {"/var/run/media-server/media_ipc_dbbatchupdate_client%i.socket"},
-       {"/var/run/media-server/media_ipc_scandaemon_client%i.socket"},
-       {"/var/run/media-server/media_ipc_scanner_client%i.socket"},
-       {"/var/run/media-server/media_ipc_dbupdate_client%i.socket"},
-       {"/var/run/media-server/media_ipc_thumbcreator_client%i.socket"},
-       {"/var/run/media-server/media_ipc_thumbcomm_client%i.socket"},
-       {"/var/run/media-server/media_ipc_thumbdaemon_client%i.socket"},
-       {"/var/run/media-server/media_ipc_dcmcreator_client%i.socket"},
-       {"/var/run/media-server/media_ipc_dcmcomm_client%i.socket"},
-       {"/var/run/media-server/media_ipc_dcmdaemon_client%i.socket"},
+       {"media-server/media_ipc_dbbatchupdate_client%i.socket"},
+       {"media-server/media_ipc_scandaemon_client%i.socket"},
+       {"media-server/media_ipc_scanner_client%i.socket"},
+       {"media-server/media_ipc_dbupdate_client%i.socket"},
+       {"media-server/media_ipc_thumbcreator_client%i.socket"},
+       {"media-server/media_ipc_thumbcomm_client%i.socket"},
+       {"media-server/media_ipc_thumbdaemon_client%i.socket"},
+       {"media-server/media_ipc_dcmcreator_client%i.socket"},
+       {"media-server/media_ipc_dcmcomm_client%i.socket"},
+       {"media-server/media_ipc_dcmdaemon_client%i.socket"},
 };
 
 static int _mkdir(const char *dir, mode_t mode)
@@ -107,19 +107,19 @@ int ms_ipc_create_client_socket(ms_protocol_e protocol, int timeout_sec, ms_sock
                int cx = 0, len = 0;
 
                if (tzplatform_getuid(TZ_USER_NAME) == 0) {
-                       cx = snprintf(NULL, 0, MEDIA_IPC_PATH_CLIENT_ROOT[sock_info->port], getpid());
+                       cx = snprintf(NULL, 0, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH_CLIENT_ROOT[sock_info->port]), getpid());
                        sock_info->sock_path = (char*)malloc((cx + 1)*sizeof(char));
-                       snprintf(sock_info->sock_path, cx + 1, MEDIA_IPC_PATH_CLIENT_ROOT[sock_info->port], getpid());
+                       snprintf(sock_info->sock_path, cx + 1, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH_CLIENT_ROOT[sock_info->port]), getpid());
                } else {
-                       len = snprintf(NULL, 0, "/var/run/user/%i/media-server", tzplatform_getuid(TZ_USER_NAME));
+                       len = snprintf(NULL, 0, tzplatform_mkpath(TZ_SYS_RUN, "user/%i/media-server"), tzplatform_getuid(TZ_USER_NAME));
                        path = (char*)malloc((len + 1)*sizeof(char));
-                       snprintf(path, len + 1, "/var/run/user/%i/media-server", tzplatform_getuid(TZ_USER_NAME));
+                       snprintf(path, len + 1, tzplatform_mkpath(TZ_SYS_RUN, "user/%i/media-server"), tzplatform_getuid(TZ_USER_NAME));
                        _mkdir(path, 0777);
                        free(path);
-                       cx = snprintf(NULL, 0, MEDIA_IPC_PATH_CLIENT[sock_info->port], tzplatform_getuid(TZ_USER_NAME), getpid());
+                       cx = snprintf(NULL, 0, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH_CLIENT[sock_info->port]), tzplatform_getuid(TZ_USER_NAME), getpid());
                        sock_info->sock_path = (char*)malloc((cx + 1)*sizeof(char));
                        if (sock_info->sock_path != NULL)
-                               snprintf(sock_info->sock_path, cx + 1, MEDIA_IPC_PATH_CLIENT[sock_info->port], tzplatform_getuid(TZ_USER_NAME), getpid());
+                               snprintf(sock_info->sock_path, cx + 1, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH_CLIENT[sock_info->port]), tzplatform_getuid(TZ_USER_NAME), getpid());
                }
 
                /* Create a datagram/UDP socket */
@@ -208,9 +208,9 @@ int ms_ipc_create_server_socket(ms_protocol_e protocol, ms_msg_port_type_e port,
        memset(&serv_addr, 0, sizeof(serv_addr));
 
        serv_addr.sun_family = AF_UNIX;
-//     MSAPI_DBG_SLOG("%s", MEDIA_IPC_PATH[serv_port]);
-       unlink(MEDIA_IPC_PATH[serv_port]);
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[serv_port], strlen(MEDIA_IPC_PATH[serv_port]));
+//     MSAPI_DBG_SLOG("%s", tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]));
+       unlink(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]));
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port])));
 
        /* Bind to the local address */
        for (i = 0; i < 100; i++) {
@@ -242,7 +242,7 @@ int ms_ipc_create_server_socket(ms_protocol_e protocol, ms_msg_port_type_e port,
        }
 
        /*change permission of sock file*/
-       if (chmod(MEDIA_IPC_PATH[serv_port], 0777) < 0)
+       if (chmod(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]), 0777) < 0)
                MSAPI_DBG_STRERROR("chmod failed");
 
        *sock_fd = sock;
@@ -258,7 +258,7 @@ int ms_ipc_send_msg_to_server(int sockfd, ms_msg_port_type_e port, ms_comm_msg_s
        /* Set server Address */
        memset(&addr, 0, sizeof(addr));
        addr.sun_family = AF_UNIX;
-       strncpy(addr.sun_path, MEDIA_IPC_PATH[port], strlen(MEDIA_IPC_PATH[port]));
+       strncpy(addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port])));
 //     MSAPI_DBG_SLOG("%s", addr.sun_path);
 
        if (sendto(sockfd, send_msg, sizeof(*(send_msg)), 0, (struct sockaddr *)&addr, sizeof(addr)) != sizeof(*(send_msg))) {
@@ -283,7 +283,7 @@ int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_msg_port_type_e port, ms_comm_m
        memset(&addr, 0, sizeof(addr));
 
        addr.sun_family = AF_UNIX;
-       strncpy(addr.sun_path, MEDIA_IPC_PATH[port], strlen(MEDIA_IPC_PATH[port]));
+       strncpy(addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port])));
 //     MSAPI_DBG("%s", addr.sun_path);
 
        /* Connecting to the media db server */

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 7bb0f38..f6293ca 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.2.72
+Version:    0.2.73
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c
old mode 100755 (executable)
new mode 100644 (file)
index d909508..3cf7e8b
--- a/src/server/media-server-dcm.c
+++ b/src/server/media-server-dcm.c
@@ -300,7 +300,7 @@ gboolean _ms_dcm_agent_send_msg_to_dcm_server(dcmMsg *recv_msg, dcmMsg *res_msg)
        memset(&serv_addr, 0, sizeof(serv_addr));
        sock = sock_info.sock_fd;
        serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[MS_DCM_DAEMON_PORT], strlen(MEDIA_IPC_PATH[MS_DCM_DAEMON_PORT]));
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_DCM_DAEMON_PORT]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_DCM_DAEMON_PORT])));
 
        /* Connecting to the DCM service */
        if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
old mode 100755 (executable)
new mode 100644 (file)
index 4de8a88..39b1594
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -311,7 +311,7 @@ static void __ms_add_requst_receiver(GMainLoop *mainloop, GIOChannel **channel)
 
        /*prepare socket*/
        /* create dir socket */
-       _mkdir("/var/run/media-server", S_IRWXU | S_IRWXG | S_IRWXO);
+       _mkdir(tzplatform_mkpath(TZ_SYS_RUN, "media-server"), S_IRWXU | S_IRWXG | S_IRWXO);
 
        /* Create and bind new UDP socket */
        if (ms_ipc_create_server_socket(MS_PROTOCOL_TCP, MS_SCANNER_PORT, &sockfd) != MS_MEDIA_ERR_NONE) {

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
old mode 100755 (executable)
new mode 100644 (file)
index add6599..ef01dd6
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -470,7 +470,7 @@ gboolean _ms_thumb_agent_send_msg_to_thumb_server(thumbMsg *recv_msg, thumbMsg *
        memset(&serv_addr, 0, sizeof(serv_addr));
        sock = sock_info.sock_fd;
        serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[MS_THUMB_DAEMON_PORT], strlen(MEDIA_IPC_PATH[MS_THUMB_DAEMON_PORT]));
+       strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_THUMB_DAEMON_PORT]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_THUMB_DAEMON_PORT])));
 
        /* Connecting to the thumbnail server */
        if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {