Delete 'tcp' from function name

It was added in the past to prevent confusion with 'udp'.
However, since there is no longer a 'udp' connection in content FW, the function name was modified.

Change-Id: I8eac83773ad79be23418b2a589057ffa64942381
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 8fa0d1e..8e79942 100644 (file)
--- a/lib/include/media-util-ipc.h
+++ b/lib/include/media-util-ipc.h
@@ -79,11 +79,11 @@ typedef struct {
 
 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_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_accept_client_tcp(int serv_sock, int* client_sock);
+int ms_ipc_send_msg_to_server(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *serv_addr);
+int ms_ipc_send_msg_to_client(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *client_addr);
+int ms_ipc_accept_client(int serv_sock, int *client_sock);
 int ms_ipc_request_recovery(uid_t uid);
-int ms_ipc_request_update_tcp(const char *request_msg, uid_t uid);
+int ms_ipc_request_update_db(const char *request_msg, uid_t uid);
 
 #ifdef __cplusplus
 }

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index ebd0b31..fc2e5c0 100644 (file)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -305,10 +305,10 @@ int media_db_request_update_db(const char *query_str, uid_t uid)
                return ret;
        }
 #endif
-       ret = ms_ipc_request_update_tcp(query_str, uid);
+       ret = ms_ipc_request_update_db(query_str, uid);
 
        if (ret != MS_MEDIA_ERR_NONE)
-               MSAPI_DBG_ERR("ms_ipc_request_update_tcp failed : %d", ret);
+               MSAPI_DBG_ERR("ms_ipc_request_update_db failed : %d", ret);
 
        return ret;
 }

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index 4d79d10..2f9ea5e 100644 (file)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -115,7 +115,7 @@ ERROR:
        return MS_MEDIA_ERR_IPC;
 }
 
-int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *serv_addr)
+int ms_ipc_send_msg_to_server(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *serv_addr)
 {
        int ret = MS_MEDIA_ERR_NONE;
        struct sockaddr_un addr = { 0, };
@@ -145,7 +145,7 @@ int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_comm_msg_s *send_msg, struct so
        return MS_MEDIA_ERR_NONE;
 }
 
-int ms_ipc_send_msg_to_client_tcp(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *client_addr)
+int ms_ipc_send_msg_to_client(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *client_addr)
 {
        if (write(sockfd, send_msg, sizeof(*(send_msg))) != sizeof(*(send_msg))) {
                MSAPI_DBG_STRERROR("write failed");
@@ -157,7 +157,7 @@ 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_accept_client_tcp(int serv_sock, int* client_sock)
+int ms_ipc_accept_client(int serv_sock, int* client_sock)
 {
        int sockfd = -1;
        struct sockaddr_un client_addr;
@@ -250,7 +250,7 @@ RETRY:
        return ret;
 }
 
-int ms_ipc_request_update_tcp(const char *request_msg, uid_t uid)
+int ms_ipc_request_update_db(const char *request_msg, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
        int sockfd = -1;

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index e1f0ed8..5586614 100644 (file)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -263,7 +263,7 @@ static int __media_db_request_update_async(ms_msg_type_e msg_type,
        ret = ms_ipc_create_client_socket(0, &sockfd);
        MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_ipc_create_client_socket failed[%d]", ret);
 
-       ret = ms_ipc_send_msg_to_server_tcp(sockfd, &send_msg, NULL);
+       ret = ms_ipc_send_msg_to_server(sockfd, &send_msg, NULL);
        if (ret != MS_MEDIA_ERR_NONE) {
                MSAPI_DBG_ERR("ms_ipc_send_msg_to_server failed : %d", ret);
                close(sockfd);
@@ -298,9 +298,9 @@ static int __media_db_request_update_cancel(ms_msg_type_e msg_type, const char *
        ret = ms_ipc_create_client_socket(0, &sockfd);
        MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_ipc_create_client_socket failed[%d]", ret);
 
-       ret = ms_ipc_send_msg_to_server_tcp(sockfd, &send_msg, NULL);
+       ret = ms_ipc_send_msg_to_server(sockfd, &send_msg, NULL);
        close(sockfd);
-       MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_ipc_send_msg_to_server_tcp failed[%d]", ret);
+       MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_ipc_send_msg_to_server failed[%d]", ret);
 
        return __remove_request(request_path);
 }

diff --git a/lib/media-util-socket-activation.c b/lib/media-util-socket-activation.c
index f4914b0..d861569 100644 (file)
--- a/lib/media-util-socket-activation.c
+++ b/lib/media-util-socket-activation.c
@@ -55,7 +55,7 @@ static int __check_media_server()
                return ret;
        }
 
-       ret = ms_ipc_send_msg_to_server_tcp(sockfd, &send_msg, NULL);
+       ret = ms_ipc_send_msg_to_server(sockfd, &send_msg, NULL);
        if (ret != MS_MEDIA_ERR_NONE) {
                MSAPI_DBG_ERR("ms_ipc_send_msg_to_server failed : %d", ret);
                close(sockfd);

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index d566598..431d6bb 100644 (file)
--- 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.5.9
+Version:    0.5.10
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index e441d67..5d9a83a 100644 (file)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -120,7 +120,7 @@ void ms_reset_ownerlist(void)
 
                /* owner data exists */
                /* send result to the owner of request */
-               ms_ipc_send_msg_to_client_tcp(data->client_sockfd, &send_msg, NULL);
+               ms_ipc_send_msg_to_client(data->client_sockfd, &send_msg, NULL);
                g_array_remove_index(owner_list, 0);
        }
 }
@@ -139,14 +139,14 @@ static int __ms_send_result_to_client(int pid, ms_comm_msg_s *recv_msg)
                        data = g_array_index(owner_list, ms_req_owner_data*, i);
                        if (strcmp(data->req_path, recv_msg->msg) == 0) {
                                MS_DBG_SERR("PARTIAL message:pid %d,path %s", data->pid, data->req_path);
-                               ms_ipc_send_msg_to_client_tcp(data->client_sockfd, recv_msg, NULL);
+                               ms_ipc_send_msg_to_client(data->client_sockfd, recv_msg, NULL);
                        }
                }
        } else {
                for (i = 0; i < owner_list->len; i++) {
                        data = g_array_index(owner_list, ms_req_owner_data*, i);
                        if (data->pid == pid && strcmp(data->req_path, recv_msg->msg) == 0) {
-                               ms_ipc_send_msg_to_client_tcp(data->client_sockfd, recv_msg, NULL);
+                               ms_ipc_send_msg_to_client(data->client_sockfd, recv_msg, NULL);
                                if (recv_msg->msg_type != MS_MSG_SCANNER_COMPLETE && recv_msg->msg_type != MS_MSG_RECURSIVE_START)
                                        g_array_remove_index(owner_list, i);
 
@@ -203,7 +203,7 @@ gboolean ms_read_scanner_dispatcher_socket_func(GIOChannel *src, GIOCondition co
        MS_DBG_RETVM_IF(sockfd < 0, G_SOURCE_CONTINUE, "sock fd is invalid!");
 
        /* get client socket fd */
-       ret = ms_ipc_accept_client_tcp(sockfd, &client_sock);
+       ret = ms_ipc_accept_client(sockfd, &client_sock);
        MS_DBG_RETV_IF(ret != MS_MEDIA_ERR_NONE, G_SOURCE_CONTINUE);
 
        memset(&creds, 0, sizeof(creds));
@@ -284,7 +284,7 @@ ERROR:
 
        res_msg.result = ret;
 
-       ms_ipc_send_msg_to_client_tcp(client_sock, &res_msg, NULL);
+       ms_ipc_send_msg_to_client(client_sock, &res_msg, NULL);
        close(client_sock);
 
        return G_SOURCE_CONTINUE;
@@ -389,7 +389,7 @@ gboolean ms_read_db_update_socket_func(GIOChannel *src, GIOCondition condition,
        MS_DBG_RETVM_IF(sock < 0, G_SOURCE_CONTINUE, "sock fd is invalid!");
 
        /* get client socket fd */
-       ret = ms_ipc_accept_client_tcp(sock, &client_sock);
+       ret = ms_ipc_accept_client(sock, &client_sock);
        MS_DBG_RETV_IF(ret != MS_MEDIA_ERR_NONE, G_SOURCE_CONTINUE);
 
        memset(&creds, 0, sizeof(creds));