From 17e7aebd5ab6e0ab0cb54cf77cab7fce9f14724f Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Fri, 30 Nov 2018 14:37:15 +0900 Subject: [PATCH] Just fix the description Change-Id: I1b6823a8fafc73c3bd98f8e4758b49dcf0a8ee14 --- src/media_controller_ipc.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c index 0932ab3..71c72d6 100755 --- a/src/media_controller_ipc.c +++ b/src/media_controller_ipc.c @@ -25,7 +25,7 @@ #define DEFAULT_REQ_ID "DEF_REQ_ID" /* This checks if service daemon is running */ -static int __is_service_activated(mc_priv_type_e priv_type) +static int __make_service_connection(mc_priv_type_e priv_type) { int ret = MEDIA_CONTROLLER_ERROR_NONE; ret = mc_ipc_send_message_to_server(MC_MSG_SERVER_CONNECTION, priv_type, MC_SERVER_CONNECTION_MSG); @@ -360,11 +360,11 @@ int mc_ipc_send_message_to_server(mc_msg_type_e msg_type, mc_priv_type_e priv_ty send_msg.uid = getuid(); send_msg.msg_size = request_msg_size; - /*Create Socket*/ + /* Create Socket */ ret = mc_ipc_create_client_socket(MC_TIMEOUT_SEC_5, &sockfd); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "socket is not created properly"); - /*Set server Address*/ + /* Set server address. If the daemon is not running, the path did not exist */ memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; MC_SAFE_STRLCPY(serv_addr.sun_path, MC_IPC_PATH, sizeof(serv_addr.sun_path)); @@ -423,7 +423,7 @@ int mc_ipc_send_message_to_server(mc_msg_type_e msg_type, mc_priv_type_e priv_ty MC_SAFE_FREE(temp_buf); - /*Receive Response*/ + /* Receive Response */ int recv_msg_size = -1; int recv_msg = -1; RETRY: @@ -469,20 +469,22 @@ int mc_ipc_service_connect(mc_priv_type_e priv_type) struct sockaddr_un serv_addr; unsigned int retrycount = 0; - ret = __is_service_activated(priv_type); + ret = __make_service_connection(priv_type); mc_retvm_if(ret == MEDIA_CONTROLLER_ERROR_NONE, ret, "service is already running!"); mc_retvm_if(ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED, ret, "Permission deny!"); - /*Create Socket*/ + /* If can't make connection to service, the service activation is needed */ + + /* Create Socket */ ret = mc_ipc_create_client_socket(MC_TIMEOUT_SEC_5, &sockfd); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "socket is not created properly"); - /*Set server Address*/ + /* Set socket activation address, the path is already created by system */ memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; MC_SAFE_STRLCPY(serv_addr.sun_path, MC_SOCK_ACTIVATION_PATH, sizeof(serv_addr.sun_path)); - /* Connecting to the media controller service */ + /* Connecting to the media controller service for activation */ if (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) { mc_stderror("connect error"); close(sockfd); @@ -495,13 +497,14 @@ int mc_ipc_service_connect(mc_priv_type_e priv_type) close(sockfd); - ret = __is_service_activated(priv_type); + ret = __make_service_connection(priv_type); mc_retvm_if(ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED, ret, "Permission deny!"); + /* Try to make connection untill starting daemon is completed */ while ((ret != MEDIA_CONTROLLER_ERROR_NONE) && (retrycount++ < MAX_WAIT_COUNT)) { MC_MILLISEC_SLEEP(200); mc_error("[No-Error] retry count [%d]", retrycount); - ret = __is_service_activated(priv_type); + ret = __make_service_connection(priv_type); mc_retvm_if(ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED, ret, "Permission deny!"); } -- 2.7.4