Change normal log to secure log

Change-Id: I7a9aebcd8149fbf6d15056232c017cabd2b4b79e

diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index a26a371..9a7f22e 100755 (executable)
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -56,7 +56,7 @@ static void __client_server_cb(const char *interface_name, const char *signal_na
        mc_retm_if(callback == NULL, "server_state_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_server_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_server_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid server data");
@@ -78,7 +78,7 @@ static void __client_playback_cb(const char *interface_name, const char *signal_
        mc_retm_if(callback == NULL, "playback_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_playback_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_playback_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        playback = (media_controller_playback_s *)calloc(1, sizeof(media_controller_playback_s));
        mc_retm_if(playback == NULL, "Error allocation memory");
@@ -104,7 +104,7 @@ static void __client_metadata_cb(const char *interface_name, const char *signal_
        mc_retm_if(callback == NULL, "metadata_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_metadata_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_metadata_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        ret = mc_db_get_metadata_info(mc_client->db_handle, message, &metadata);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
@@ -125,7 +125,7 @@ static void __client_shuffle_cb(const char *interface_name, const char *signal_n
        mc_retm_if(callback == NULL, "shuffle_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_shuffle_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_shuffle_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid shuffle mode data");
@@ -145,7 +145,7 @@ static void __client_repeat_cb(const char *interface_name, const char *signal_na
        mc_retm_if(callback == NULL, "repeat_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_repeat_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_repeat_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid repeat mode data");
@@ -168,7 +168,7 @@ static void __client_playlist_cb(const char *interface_name, const char *signal_
        mc_retm_if(callback == NULL, "playlist_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_playlist_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_playlist_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid custom data");
@@ -208,7 +208,7 @@ static void __client_cmd_reply_received_cb(const char *interface_name, const cha
        mc_retm_if(callback == NULL, "reply_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_cmd_reply_received_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_cmd_reply_received_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid custom data");
@@ -241,7 +241,7 @@ static void __client_custom_event_received_cb(const char *interface_name, const
        mc_client_custom_event_received_cb callback = receiver->callback;
        mc_retm_if(receiver->callback == NULL, "custom_event_received_cb is NULL");
 
-       mc_debug("__client_custom_event_received_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_custom_event_received_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid custom data");
@@ -281,7 +281,7 @@ static void __client_playback_ability_cb(const char *interface_name, const char
        mc_retm_if(callback == NULL, "metadata_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_playback_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_playback_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        ret = mc_db_get_pb_action_ability(mc_client->db_handle, message, &ability);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
@@ -302,7 +302,7 @@ static void __client_shuffle_ability_cb(const char *interface_name, const char *
        mc_retm_if(callback == NULL, "shuffle_ability_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_shuffle_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_shuffle_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid shuffle ability data");
@@ -322,7 +322,7 @@ static void __client_repeat_ability_cb(const char *interface_name, const char *s
        mc_retm_if(callback == NULL, "repeat_ability_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
-       mc_debug("__client_repeat_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__client_repeat_ability_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid repeat ability data");
@@ -764,6 +764,8 @@ int mc_client_subscribe(mc_client_h client, const mc_subscription_type_e subscri
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        media_controller_client_s *mc_client = (media_controller_client_s *)client;
 
+       mc_debug_fenter();
+
        mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(!MC_STRING_VALID(server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
        mc_retvm_if(((subscription_type < MC_SUBSCRIPTION_TYPE_SERVER_STATE) || (subscription_type > MC_SUBSCRIPTION_TYPE_REPEAT_ABILITY)) , MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid subscription_type [%d]", subscription_type);

diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c
index bff4d0c..7d48051 100755 (executable)
--- a/src/media_controller_ipc.c
+++ b/src/media_controller_ipc.c
@@ -75,7 +75,7 @@ static void __mc_ipc_signal_cb(GDBusConnection *connection,
        for (i = 0; i < listener_cnt; i++) {
                listener = (mc_ipc_listener_s *)g_list_nth_data(*listener_list, i);
                if (listener && !g_strcmp0(listener->key, key)) {
-                       mc_debug("Received : [%s] (req_id = %s) from %s.%s", message, request_id, listener->interface_name, listener->signal_name);
+                       mc_secure_debug("Received : [%s] (req_id = %s) from %s.%s", message, request_id, listener->interface_name, listener->signal_name);
                        listener->callback(listener->interface_name, listener->signal_name, message, request_id, listener->user_data);
                        break;
                }
@@ -285,7 +285,7 @@ int mc_ipc_send_message(GDBusConnection *connection, const char *dbus_name, cons
        mc_retvm_if(!MC_STRING_VALID(signal_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid signal_name");
        mc_retvm_if(!MC_STRING_VALID(message), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid message");
 
-       mc_debug("emit signal - interface_name [%s], signal_name [%s]", interface_name, signal_name);
+       mc_secure_debug("emit signal - interface_name [%s], signal_name [%s]", interface_name, signal_name);
 
        if (request_id != NULL) {
                req_id = mc_util_generate_uuid();
@@ -322,7 +322,7 @@ int mc_ipc_send_reply(GDBusConnection *connection, const char *dbus_name, const
        mc_retvm_if(!MC_STRING_VALID(signal_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid signal_name");
        mc_retvm_if(!MC_STRING_VALID(message), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid message");
 
-       mc_debug("emit signal - interface_name [%s], signal_name [%s]", interface_name, signal_name);
+       mc_secure_debug("emit signal - interface_name [%s], signal_name [%s]", interface_name, signal_name);
 
        gboolean emmiting = g_dbus_connection_emit_signal(
                                                connection,

diff --git a/src/media_controller_server.c b/src/media_controller_server.c
index 9de59a6..cd3135b 100755 (executable)
--- a/src/media_controller_server.c
+++ b/src/media_controller_server.c
@@ -153,7 +153,7 @@ static void __server_playback_action_cb(const char *interface_name, const char *
        mc_server_playback_action_cmd_received_cb callback = receiver->callback;
        mc_retm_if(receiver->callback == NULL, "playback_action_command_received_cb is NULL");
 
-       mc_debug("__server_playback_action_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__server_playback_action_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid playback_action command");
@@ -187,7 +187,7 @@ static void __server_playback_position_cmd_cb(const char *interface_name, const
        mc_server_playback_position_cmd_received_cb callback = receiver->callback;
        mc_retm_if(receiver->callback == NULL, "playback_position_cmd_received_cb is NULL");
 
-       mc_debug("__server_playback_position_cmd_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__server_playback_position_cmd_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid playback_position command");
@@ -221,7 +221,7 @@ static void __server_shuffle_mode_cmd_cb(const char *interface_name, const char
        mc_server_shuffle_mode_cmd_received_cb callback = receiver->callback;
        mc_retm_if(receiver->callback == NULL, "shuffle_mode_cmd_received_cb is NULL");
 
-       mc_debug("__server_shuffle_mode_cmd_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__server_shuffle_mode_cmd_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid shuffle_mode command");
@@ -255,7 +255,7 @@ static void __server_repeat_mode_cmd_cb(const char *interface_name, const char *
        mc_server_repeat_mode_cmd_received_cb callback = receiver->callback;
        mc_retm_if(receiver->callback == NULL, "repeat_mode_cmd_received_cb is NULL");
 
-       mc_debug("__server_repeat_mode_cmd_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__server_repeat_mode_cmd_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid repeat_mode command");
@@ -290,7 +290,7 @@ static void __server_play_playlist_cmd_cb(const char *interface_name, const char
        mc_server_playlist_cmd_received_cb callback = receiver->callback;
        mc_retm_if(receiver->callback == NULL, "mc_server_playlist_cmd_received_cb is NULL");
 
-       mc_debug("__server_play_playlist_cmd_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__server_play_playlist_cmd_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid play_playlist command");
@@ -333,7 +333,7 @@ static void __server_custom_cmd_cb(const char *interface_name, const char *signa
        mc_server_custom_cmd_received_cb callback = receiver->callback;
        mc_retm_if(receiver->callback == NULL, "custom_command_received_cb is NULL");
 
-       mc_debug("__server_custom_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__server_custom_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid custom data");
@@ -375,7 +375,7 @@ static void __server_event_reply_received_cb(const char *interface_name, const c
        mc_cmd_reply_received_cb callback = (mc_cmd_reply_received_cb)reciever->callback;
        mc_retm_if(reciever->callback == NULL, "reply_cb is NULL");
 
-       mc_debug("__server_event_reply_received_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__server_event_reply_received_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid custom data");
@@ -470,7 +470,7 @@ static void __server_search_cmd_cb(const char *interface_name, const char *signa
        mc_server_search_cmd_received_cb callback = receiver->callback;
        mc_retm_if(receiver->callback == NULL, "search_command_received_cb is NULL");
 
-       mc_debug("__server_search_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
+       mc_secure_debug("__server_search_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data);
 
        params = g_strsplit(message, MC_STRING_DELIMITER, 0);
        mc_retm_if(params == NULL, "invalid search data");
@@ -566,7 +566,7 @@ static int __mc_server_send_message(media_controller_server_s *mc_server, const
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                mc_error("Error mc_ipc_send_message [%d]", ret);
 
-       mc_debug("interface_name[%s] signal_name[%s] message[%s]", interface_name, signal_name, message);
+       mc_secure_debug("interface_name[%s] signal_name[%s] message[%s]", interface_name, signal_name, message);
 
        /*Send again for the subscriber which receive filtered msg with server_name*/
        char *filter_interface_name = NULL;
@@ -799,7 +799,7 @@ int mc_server_set_metadata(mc_server_h server, mc_meta_e attribute, const char *
 
        mc_retvm_if(mc_server == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
 
-       mc_debug("meta data set attribute [%d] value [%s]", attribute, value);
+       mc_secure_debug("meta data set attribute [%d] value [%s]", attribute, value);
 
        switch (attribute) {
        case MC_META_MEDIA_TITLE:

diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c
index 0ff0736..6dd04a5 100755 (executable)
--- a/svc/media_controller_db_util.c
+++ b/svc/media_controller_db_util.c
@@ -64,7 +64,7 @@ static int __mc_foreach_table_list(void *handle, GList **list)
 
                if (MC_STRING_VALID((const char *)sqlite3_column_text(stmt, 0))) {
                        table_name = strdup((const char *)sqlite3_column_text(stmt, 0));
-                       mc_debug("table_name: %s", table_name);
+                       mc_secure_debug("table_name: %s", table_name);
 
                        if (MC_STRING_VALID(table_name))
                                (*list) = g_list_append((*list), table_name);
@@ -526,7 +526,7 @@ int mc_db_util_init_latest_server_table(void *handle)
                }
                if (MC_STRING_VALID((const char *)sqlite3_column_text(stmt, 1))) {
                        latest_server_name = strdup((const char *)sqlite3_column_text(stmt, 1));
-                       mc_debug("latest_server_name: %s", latest_server_name);
+                       mc_secure_debug("latest_server_name: %s", latest_server_name);
                        break;
                }
                ret = sqlite3_step(stmt);

diff --git a/svc/media_controller_socket.c b/svc/media_controller_socket.c
index 35bdcb5..24f174f 100755 (executable)
--- a/svc/media_controller_socket.c
+++ b/svc/media_controller_socket.c
@@ -133,7 +133,7 @@ int mc_ipc_receive_message_tcp(int client_sock, mc_comm_msg_s *recv_msg)
                }
        }
 
-       mc_debug("receive msg from [%d(%d)] %d, %s", recv_msg->pid, recv_msg->uid, recv_msg->msg_type, recv_msg->msg);
+       mc_secure_debug("receive msg from [%d(%d)] %d, %s", recv_msg->pid, recv_msg->uid, recv_msg->msg_type, recv_msg->msg);
 
        return MEDIA_CONTROLLER_ERROR_NONE;
 }