Code sync from tizen_2.4 59/42759/2 accepted/tizen/mobile/20150708.070014 accepted/tizen/tv/20150708.070032 accepted/tizen/wearable/20150708.070049 submit/tizen/20150630.051205 submit/tizen/20150708.045531
authorJiwan Kim <ji-wan.kim@samsung.com>
Thu, 2 Jul 2015 06:29:26 +0000 (15:29 +0900)
committerJiwan Kim <ji-wan.kim@samsung.com>
Thu, 2 Jul 2015 07:45:23 +0000 (16:45 +0900)
Change-Id: I1acd5fc5e45a6fbae343afaf4547c89670e33009

23 files changed:
CMakeLists.txt
introspection/call.xml [changed mode: 0755->0644]
introspection/modem.xml
introspection/phonebook.xml
packaging/tel-plugin-dbus_tapi.spec
src/call.c [changed mode: 0755->0644]
src/common.c [changed mode: 0755->0644]
src/desc-dbus.c [changed mode: 0755->0644]
src/gps.c [changed mode: 0755->0644]
src/modem.c
src/network.c [changed mode: 0755->0644]
src/oem.c
src/phonebook.c [changed mode: 0755->0644]
src/sap.c
src/sat.c [changed mode: 0755->0644]
src/sat_manager.c [changed mode: 0755->0644]
src/sat_ui_support/TelCall.h [changed mode: 0755->0644]
src/sat_ui_support/TelSs.h [changed mode: 0755->0644]
src/sat_ui_support/sat_ui_support.c [changed mode: 0755->0644]
src/sat_ui_support/sat_ui_support.h [changed mode: 0755->0644]
src/sim.c [changed mode: 0755->0644]
src/sms.c [changed mode: 0755->0644]
src/ss.c [changed mode: 0755->0644]

index cfcde7d..1f0a074 100755 (executable)
@@ -20,7 +20,7 @@ pkg_check_modules(pkgs REQUIRED
        tcore
        aul
        appsvc
-       pkgmgr
+       capi-appfw-app-manager
        cynara-client
        cynara-creds-gdbus
        cynara-session
old mode 100755 (executable)
new mode 100644 (file)
index 19bf15f..a5d8c1f
@@ -9,17 +9,17 @@
                </method>
 
                <method name="Answer">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="in" type="i" name="answer_type"/>
                        <arg direction="out" type="i" name="result"/>
-                       <arg direction="out" type="i" name="call_id"/>
+                       <arg direction="out" type="i" name="call_handle"/>
                </method>
 
                <method name="End">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="in" type="i" name="end_type"/>
                        <arg direction="out" type="i" name="result"/>
-                       <arg direction="out" type="i" name="call_id"/>
+                       <arg direction="out" type="i" name="call_handle"/>
                        <arg direction="out" type="i" name="end_type"/>
                </method>
 
                </method>
 
                <method name="Active">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="out" type="i" name="result"/>
-                       <arg direction="out" type="i" name="call_id"/>
+                       <arg direction="out" type="i" name="call_handle"/>
                </method>
 
                <method name="Hold">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="out" type="i" name="result"/>
-                       <arg direction="out" type="i" name="call_id"/>
+                       <arg direction="out" type="i" name="call_handle"/>
                </method>
 
                <method name="Swap">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="out" type="i" name="result"/>
-                       <arg direction="out" type="i" name="call_id"/>
+                       <arg direction="out" type="i" name="call_handle"/>
                </method>
 
                <method name="Join">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="out" type="i" name="result"/>
-                       <arg direction="out" type="i" name="call_id"/>
+                       <arg direction="out" type="i" name="call_handle"/>
                </method>
 
                <method name="Split">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="out" type="i" name="result"/>
-                       <arg direction="out" type="i" name="call_id"/>
+                       <arg direction="out" type="i" name="call_handle"/>
                </method>
 
                <method name="Transfer">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="out" type="i" name="result"/>
-                       <arg direction="out" type="i" name="call_id"/>
+                       <arg direction="out" type="i" name="call_handle"/>
                </method>
 
                <method name="Deflect">
@@ -91,8 +91,8 @@
                </method>
 
                <method name="GetStatus">
-                       <arg direction="in" type="i" name="call_id"/>
-                       <arg direction="out" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
+                       <arg direction="out" type="i" name="call_handle"/>
                        <arg direction="out" type="s" name="call_number"/>
                        <arg direction="out" type="i" name="call_type"/>
                        <arg direction="out" type="b" name="call_direction"/>
                </method>
 
                <method name="Modify">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="in" type="i" name="call_type"/>
                        <arg direction="out" type="i" name="result"/>
                </method>
 
                <method name="ConfirmModify">
-                       <arg direction="in" type="i" name="call_id"/>
+                       <arg direction="in" type="i" name="call_handle"/>
                        <arg direction="in" type="i" name="confirm_type"/>
                        <arg direction="out" type="i" name="result"/>
                </method>
 
                <signal name="VoiceCallStatusIdle">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                        <arg type="i" name="end_cause"/>
                        <arg type="i" name="start_time"/>
                        <arg type="i" name="end_time"/>
                </signal>
 
                <signal name="VoiceCallStatusDialing">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="VoiceCallStatusAlert">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="VoiceCallStatusActive">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="VoiceCallStatusHeld">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="VoiceCallStatusIncoming">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                        <arg type="i" name="cli_mode"/>
                        <arg type="i" name="cli_cause"/>
                        <arg type="s" name="call_number"/>
                </signal>
 
                <signal name="VideoCallStatusIdle">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                        <arg type="i" name="end_cause"/>
                        <arg type="i" name="start_time"/>
                        <arg type="i" name="end_time"/>
                </signal>
 
                <signal name="VideoCallStatusDialing">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="VideoCallStatusAlert">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="VideoCallStatusActive">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="VideoCallStatusIncoming">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
+                       <arg type="i" name="cli_mode"/>
+                       <arg type="i" name="cli_cause"/>
+                       <arg type="s" name="call_number"/>
+                       <arg type="b" name="forwarded"/>
+                       <arg type="i" name="active_line"/>
+                       <arg type="s" name="call_name"/>
                </signal>
 
                <signal name="Waiting">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="Forwarded">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="ForwardedCall">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="BarredIncoming">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="BarredOutgoing">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="ForwardConditional">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="ForwardUnconditional">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="CallActive">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="CallHeld">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="CallJoined">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                </signal>
 
                <signal name="CallPrivacyMode">
                </signal>
 
                <signal name="CallModifyRequest">
-                       <arg type="i" name="call_id"/>
+                       <arg type="i" name="call_handle"/>
                        <arg type="i" name="call_type"/>
                </signal>
+
+
+               <signal name="CallFallback">
+                       <arg type="i" name="call_handle"/>
+                       <arg type="i" name="fallback_to"/>
+               </signal>
        </interface>
 
 </node>
index c5d8106..645d20c 100644 (file)
                        <arg direction="out" type="i" name="result"/>
                </method>
 
+               <method name="GetDeviceInfo">
+                       <arg direction="out" type="i" name="result"/>
+                       <arg direction="out" type="s" name="vendor_name"/>
+                       <arg direction="out" type="s" name="device_name"/>
+               </method>
+
                <!--
                        Power:
                        @status: Online(0), Offline(1), Error(2), Unknown(3)
                <!-- power: Power status -->
                <property name="power" type="i" access="read"/>
 
+               <!--
+                       dongle_status: Dongle insertion status
+                       0=Removed, 1=Inserted
+               -->
+               <property name="dongle_status" type="i" access="read"/>
+
+               <!--
+                       dongle_login: Dongle login status
+                       0=Failure, 1=Success
+               -->
+               <property name="dongle_login" type="i" access="read"/>
+
        </interface>
 
 </node>
index e5a5b78..0f89a41 100644 (file)
                        <arg type="b" name="b_gas"/>
                </signal>
 
+               <signal name="ContactChange">
+                       <arg type="i" name="type"/>
+                       <arg type="q" name="index"/>
+                       <arg type="i" name="operation"/>
+               </signal>
+
        </interface>
 
 </node>
index f15a2e1..cff8b7e 100755 (executable)
@@ -1,11 +1,11 @@
 %define major 0
 %define minor 3
-%define patchlevel 51
+%define patchlevel 63
 
 Name:           tel-plugin-dbus_tapi
 Version:        %{major}.%{minor}.%{patchlevel}
 Release:        2
-License:        Apache
+License:        Apache-2.0
 Summary:        dbus-tapi plugin for telephony
 Group:          System/Libraries
 Source0:        tel-plugin-dbus_tapi-%{version}.tar.gz
@@ -13,12 +13,12 @@ BuildRequires:  cmake
 BuildRequires:  python-xml
 BuildRequires:  python
 BuildRequires:  pkgconfig(appsvc)
+BuildRequires:  pkgconfig(capi-appfw-app-manager)
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(tcore)
 BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-creds-gdbus)
@@ -54,7 +54,7 @@ mkdir -p %{buildroot}%{_datadir}/license
 
 %files
 %manifest tel-plugin-dbus_tapi.manifest
-%defattr(-,root,root,-)
+%defattr(644,system,system,-)
 #%doc COPYING
 %{_libdir}/telephony/plugins/*
 %{_datadir}/license/tel-plugin-dbus_tapi
old mode 100755 (executable)
new mode 100644 (file)
index 2e5c756..f9a5562
@@ -29,7 +29,8 @@
 
 #include <aul.h>
 #include <appsvc.h>
-#include <bundle.h>
+#include <app_manager.h>
+#include <bundle_internal.h>
 #include <tcore.h>
 #include <plugin.h>
 #include <server.h>
@@ -42,6 +43,7 @@
 #include "generated-code.h"
 #include "common.h"
 
+#ifdef TIZEN_PLATFORM_ALLOW_LAUNCH_CALLAPP /* do not allow to launch call app. Let call-manager do this */
 typedef struct {
        struct tnoti_call_status_incoming *incoming;
        enum dbus_tapi_sim_slot_id slot_id;
@@ -84,139 +86,152 @@ static gboolean __dispatch_on_new_thread(gchar *name, GThreadFunc thread_cb, gpo
                return FALSE;
        }
        thread = g_thread_new(name, thread_cb, thread_data);
-       if (thread == NULL){
+       if (thread == NULL)
                return FALSE;
-       }else{
+       else
                dbg("Thread %p is created for %s", thread, name);
-       }
 
        return TRUE;
 }
 
 static gpointer _launch_voice_call(gpointer data)
 {
+       bool running = FALSE;
        GThread* selfi = g_thread_self();
-       char id[2] = {0, };
-       char cli[2] = {0, };
-       char clicause[3] = {0, };
-       char forward[2] = {0, };
-       char active_line[2] = {0, };
-       char cna[2] = {0, };
-       char number[83] = {0, };
-       char name[83] = {0, };
-       char slot_info[2] = {0,};
-
-       bundle *kb  = 0;
-       thread_cb_data *cb_data = (thread_cb_data *)data;
 
        dbg("enter");
+       app_manager_is_running("org.tizen.call", &running);
 
-       snprintf( id, 2, "%d", cb_data->incoming->id );
-       dbg("id : [%s]", id );
-       snprintf( cli, 2, "%d", cb_data->incoming->cli.mode );
-       dbg("cli : [%s]", cli );
-       snprintf( clicause, 3, "%d", cb_data->incoming->cli.no_cli_cause );
-       dbg("clicause : [%s]", clicause );
-       snprintf( number, 83, "%s", cb_data->incoming->cli.number );
-       dbg("number : [%s]", number );
-       snprintf( forward, 2, "%d", cb_data->incoming->forward );
-       dbg("forward : [%s]", forward );
-       snprintf( active_line, 2, "%d", cb_data->incoming->active_line );
-       dbg("active_line : [%s]", active_line );
-
-       if ( cb_data->incoming->cna.mode == CALL_CNA_MODE_PRESENT )
-               snprintf( cna, 2, "%d", 0 );
-       else
-               snprintf( cna, 2, "%d", 1 );
-
-       dbg("cna : [%s]", cna );
-       snprintf( name, 83, "%s", cb_data->incoming->cna.name );
-       dbg("name : [%s]", name );
-
-       snprintf(slot_info, 2, "%d", cb_data->slot_id);
-       dbg("slot_id : [%s]", slot_info);
-
-
-       kb = bundle_create();
-
-       /* AppSvc */
-       //appsvc_set_operation(kb, APPSVC_OPERATION_CALL);
-       appsvc_set_pkgname(kb, "org.tizen.call");
-       appsvc_set_uri(kb,"tel:MT");
-
-       appsvc_add_data(kb, "launch-type", "MT");
-       appsvc_add_data(kb, "handle", id);
-       appsvc_add_data(kb, "number", number);
-       appsvc_add_data(kb, "name_mode", cna);
-       appsvc_add_data(kb, "name", name);
-       appsvc_add_data(kb, "cli", cli);
-       appsvc_add_data(kb, "clicause", clicause);
-       appsvc_add_data(kb, "fwded", forward);
-       appsvc_add_data(kb, "activeline", active_line);
-       appsvc_add_data(kb, "slot_id", slot_info);
-
-       appsvc_run_service(kb, 0, NULL, NULL);
-       bundle_free(kb);
-       g_free(cb_data->incoming);
-       g_free(cb_data);
+       if (running) {
+               dbg("call app is already running");
+       } else {
+               char handle[2] = {0, };
+               char cli[2] = {0, };
+               char clicause[3] = {0, };
+               char forward[2] = {0, };
+               char active_line[2] = {0, };
+               char cna[2] = {0, };
+               char number[83] = {0, };
+               char name[83] = {0, };
+               char slot_info[2] = {0,};
+
+               bundle *kb  = 0;
+               thread_cb_data *cb_data = (thread_cb_data *)data;
+
+               snprintf(handle, 2, "%d", cb_data->incoming->handle);
+               dbg("handle : [%s]", handle);
+               snprintf(cli, 2, "%d", cb_data->incoming->cli.mode);
+               dbg("cli : [%s]", cli);
+               snprintf(clicause, 3, "%d", cb_data->incoming->cli.no_cli_cause);
+               dbg("clicause : [%s]", clicause);
+               snprintf(number, 83, "%s", cb_data->incoming->cli.number);
+               dbg("number : [%s]", number);
+               snprintf(forward, 2, "%d", cb_data->incoming->forward);
+               dbg("forward : [%s]", forward);
+               snprintf(active_line, 2, "%d", cb_data->incoming->active_line);
+               dbg("active_line : [%s]", active_line);
+
+               if (cb_data->incoming->cna.mode == CALL_CNA_MODE_PRESENT)
+                       snprintf(cna, 2, "%d", 0);
+               else
+                       snprintf(cna, 2, "%d", 1);
+
+               dbg("cna : [%s]", cna);
+               snprintf(name, 83, "%s", cb_data->incoming->cna.name);
+               dbg("name : [%s]", name);
+
+               snprintf(slot_info, 2, "%d", cb_data->slot_id);
+               dbg("slot_id : [%s]", slot_info);
+
+
+               kb = bundle_create();
+
+               /* AppSvc */
+               /* appsvc_set_operation(kb, APPSVC_OPERATION_CALL); */
+               appsvc_set_pkgname(kb, "org.tizen.call");
+               appsvc_set_uri(kb, "tel:MT");
+
+               appsvc_add_data(kb, "launch-type", "MT");
+               appsvc_add_data(kb, "handle", handle);
+               appsvc_add_data(kb, "number", number);
+               appsvc_add_data(kb, "name_mode", cna);
+               appsvc_add_data(kb, "name", name);
+               appsvc_add_data(kb, "cli", cli);
+               appsvc_add_data(kb, "clicause", clicause);
+               appsvc_add_data(kb, "fwded", forward);
+               appsvc_add_data(kb, "activeline", active_line);
+               appsvc_add_data(kb, "slot_id", slot_info);
+
+               appsvc_run_service(kb, 0, NULL, NULL);
+               bundle_free(kb);
+               g_free(cb_data->incoming);
+               g_free(cb_data);
+       }
 
-       if (TRUE == __thread_dispatch(g_main_context_default(), G_PRIORITY_LOW, (GSourceFunc)__thread_finish_cb, selfi)) {
+       if (TRUE == __thread_dispatch(g_main_context_default(), G_PRIORITY_LOW, (GSourceFunc)__thread_finish_cb, selfi))
                dbg("Thread %p processing is complete", selfi);
-       }
 
        return NULL;
 }
 
 static gpointer _launch_video_call(gpointer data)
 {
+       bool running = FALSE;
        GThread* selfi = g_thread_self();
-       char id[2] = {0, };
-       char cli[2] = {0, };
-       char forward[2] = {0, };
-       char number[83] = {0, };
-       char slot_info[2] = {0,};
-       int ret = 0;
-
-       bundle *kb  = 0;
-       thread_cb_data *cb_data = (thread_cb_data *)data;
 
        dbg("enter");
+       app_manager_is_running("org.tizen.call", &running);
 
-       snprintf( id, 2, "%d", cb_data->incoming->id );
-       dbg("id : [%s]", id );
-       snprintf( number, 83, "%s", cb_data->incoming->cli.number );
-       dbg("number : [%s]", number );
-       snprintf( cli, 2, "%d", cb_data->incoming->cli.mode );
-       dbg("cli : [%s]", id );
-       snprintf( forward, 2, "%d", cb_data->incoming->forward );
-       dbg("forward : [%s]", forward );
+       if (running) {
+               dbg("call app is already running");
+       } else {
 
-       snprintf(slot_info, 2, "%d", cb_data->slot_id);
-       dbg("slot_id : [%s]", slot_info);
+               char handle[2] = {0, };
+               char cli[2] = {0, };
+               char forward[2] = {0, };
+               char number[83] = {0, };
+               char slot_info[2] = {0,};
+               int ret = 0;
 
-       kb = bundle_create();
-       bundle_add(kb, "KEY_CALL_TYPE", "mt");
-       bundle_add(kb, "KEY_CALL_HANDLE", id);
-       bundle_add(kb, "KEY_CALLING_PARTY_NUMBER", number);
-       bundle_add(kb, "KEY_CLI_CAUSE", cli);
-       bundle_add(kb, "KEY_FORWARDED", forward);
-       bundle_add(kb, "KEY_SLOT_ID", slot_info);
+               bundle *kb  = 0;
+               thread_cb_data *cb_data = (thread_cb_data *)data;
 
+               snprintf(handle, 2, "%d", cb_data->incoming->handle);
+               dbg("id : [%s]", handle);
+               snprintf(number, 83, "%s", cb_data->incoming->cli.number);
+               dbg("number : [%s]", number);
+               snprintf(cli, 2, "%d", cb_data->incoming->cli.mode);
+               dbg("cli : [%s]", cli);
+               snprintf(forward, 2, "%d", cb_data->incoming->forward);
+               dbg("forward : [%s]", forward);
 
-       ret = aul_launch_app("org.tizen.vtmain", kb);
-       bundle_free(kb);
+               snprintf(slot_info, 2, "%d", cb_data->slot_id);
+               dbg("slot_id : [%s]", slot_info);
 
-       dbg("VT AUL return %d",ret);
+               kb = bundle_create();
+               bundle_add(kb, "KEY_CALL_TYPE", "mt");
+               bundle_add(kb, "KEY_CALL_HANDLE", handle);
+               bundle_add(kb, "KEY_CALLING_PARTY_NUMBER", number);
+               bundle_add(kb, "KEY_CLI_CAUSE", cli);
+               bundle_add(kb, "KEY_FORWARDED", forward);
+               bundle_add(kb, "KEY_SLOT_ID", slot_info);
 
-       g_free(cb_data->incoming);
-       g_free(cb_data);
 
-       if (TRUE == __thread_dispatch(g_main_context_default(), G_PRIORITY_LOW, (GSourceFunc)__thread_finish_cb, selfi)) {
-               dbg("Thread %p processing is complete", selfi);
+               ret = aul_launch_app("org.tizen.vtmain", kb);
+               bundle_free(kb);
+
+               dbg("VT AUL return %d", ret);
+
+               g_free(cb_data->incoming);
+               g_free(cb_data);
        }
 
+       if (TRUE == __thread_dispatch(g_main_context_default(), G_PRIORITY_LOW, (GSourceFunc)__thread_finish_cb, selfi))
+               dbg("Thread %p processing is complete", selfi);
+
        return NULL;
 }
+#endif
 
 static gboolean on_call_dial(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_type, gint call_ecc, gchar* call_number, gpointer user_data)
 {
@@ -224,11 +239,11 @@ static gboolean on_call_dial(TelephonyCall *call, GDBusMethodInvocation *invocat
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       memset(&req, 0x0,sizeof(req));
+       memset(&req, 0x0, sizeof(req));
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
@@ -236,18 +251,17 @@ static gboolean on_call_dial(TelephonyCall *call, GDBusMethodInvocation *invocat
        req.type = call_type;
        req.ecc = call_ecc;
 
-       if ( call_number ){
-               g_strlcpy( req.number, call_number, MAX_CALL_DIAL_NUM_LEN);
-       }
+       if (call_number)
+               g_strlcpy(req.number, call_number, MAX_CALL_DIAL_NUM_LEN);
 
-       dbg("dial len : %d, dial str : %s", strlen(req.number), req.number);
+       dbg("[%s] dial len : %d, dial str : %s", GET_CP_NAME(invocation), strlen(req.number), req.number);
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_dial ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_DIAL );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_dial), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_DIAL);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -255,28 +269,30 @@ static gboolean on_call_dial(TelephonyCall *call, GDBusMethodInvocation *invocat
        return TRUE;
 }
 
-static gboolean on_call_answer(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_id, gint answer_type, gpointer user_data)
+static gboolean on_call_answer(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_handle, gint answer_type, gpointer user_data)
 {
        struct treq_call_answer req;
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
        req.type = answer_type;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_answer ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_ANSWER );
+       dbg("[%s] call handle : %d, type : %d", GET_CP_NAME(invocation), req.handle, req.type);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_answer), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_ANSWER);
+
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -284,28 +300,30 @@ static gboolean on_call_answer(TelephonyCall *call, GDBusMethodInvocation *invoc
        return TRUE;
 }
 
-static gboolean on_call_end(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_id, gint end_type, gpointer user_data)
+static gboolean on_call_end(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_handle, gint end_type, gpointer user_data)
 {
        struct treq_call_end req;
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
        req.type = end_type;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_end ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_END );
+       dbg("[%s] call handle : %d, type : %d", GET_CP_NAME(invocation), req.handle, req.type);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_end), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_END);
+
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -319,22 +337,22 @@ static gboolean on_call_start_cont_dtmf(TelephonyCall *call, GDBusMethodInvocati
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
-       memset(&req, 0x0,sizeof(req));
+       memset(&req, 0x0, sizeof(req));
 
        req.dtmf_digit = dtmf_digit;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_start_cont_dtmf ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_START_CONT_DTMF );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_start_cont_dtmf), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_START_CONT_DTMF);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -347,18 +365,18 @@ static gboolean on_call_stop_cont_dtmf(TelephonyCall *call, GDBusMethodInvocatio
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       tcore_user_request_set_command( ur, TREQ_CALL_STOP_CONT_DTMF );
+       tcore_user_request_set_command(ur, TREQ_CALL_STOP_CONT_DTMF);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -372,33 +390,31 @@ static gboolean on_call_send_burst_dtmf(TelephonyCall *call, GDBusMethodInvocati
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
-       memset(&req, 0x0,sizeof(req));
-       if ( dtmf_string ) {
-               g_strlcpy( req.dtmf_string, dtmf_string, MAX_CALL_BURST_DTMF_STRING_LEN +1 );
-       }
-       else {
-               FAIL_RESPONSE (invocation, "Invalid Input");
-               err("Invalid DTMF string" );
+       memset(&req, 0x0, sizeof(req));
+       if (dtmf_string) {
+               g_strlcpy(req.dtmf_string, dtmf_string, MAX_CALL_BURST_DTMF_STRING_LEN + 1);
+       } else {
+               FAIL_RESPONSE(invocation, "Invalid Input");
+               err("Invalid DTMF string");
                tcore_user_request_unref(ur);
                return TRUE;
        }
 
-
        req.pulse_width = pulse_width;
        req.inter_digit_interval = inter_digit_interval;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_send_burst_dtmf ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SEND_BURST_DTMF );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_send_burst_dtmf), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SEND_BURST_DTMF);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                err("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -406,27 +422,28 @@ static gboolean on_call_send_burst_dtmf(TelephonyCall *call, GDBusMethodInvocati
        return TRUE;
 }
 
-static gboolean on_call_active(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_id, gpointer user_data)
+static gboolean on_call_active(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_handle, gpointer user_data)
 {
        struct treq_call_active req;
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
+       dbg("[%s] call handle : %d", GET_CP_NAME(invocation), req.handle);
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_active ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_ACTIVE );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_active), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_ACTIVE);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -434,27 +451,28 @@ static gboolean on_call_active(TelephonyCall *call, GDBusMethodInvocation *invoc
        return TRUE;
 }
 
-static gboolean on_call_hold(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_id, gpointer user_data)
+static gboolean on_call_hold(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_handle, gpointer user_data)
 {
        struct treq_call_hold req;
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
+       dbg("[%s] call handle : %d", GET_CP_NAME(invocation), req.handle);
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_hold ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_HOLD );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_hold), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_HOLD);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -462,27 +480,28 @@ static gboolean on_call_hold(TelephonyCall *call, GDBusMethodInvocation *invocat
        return TRUE;
 }
 
-static gboolean on_call_swap(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_id, gpointer user_data)
+static gboolean on_call_swap(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_handle, gpointer user_data)
 {
        struct treq_call_swap req;
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
+       dbg("[%s] call handle : %d", GET_CP_NAME(invocation), req.handle);
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_swap ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SWAP );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_swap), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SWAP);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -490,27 +509,28 @@ static gboolean on_call_swap(TelephonyCall *call, GDBusMethodInvocation *invocat
        return TRUE;
 }
 
-static gboolean on_call_join(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_id, gpointer user_data)
+static gboolean on_call_join(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_handle, gpointer user_data)
 {
        struct treq_call_join req;
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
+       dbg("[%s] call handle : %d", GET_CP_NAME(invocation), req.handle);
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_join ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_JOIN );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_join), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_JOIN);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -518,27 +538,28 @@ static gboolean on_call_join(TelephonyCall *call, GDBusMethodInvocation *invocat
        return TRUE;
 }
 
-static gboolean on_call_split(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_id, gpointer user_data)
+static gboolean on_call_split(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_handle, gpointer user_data)
 {
        struct treq_call_split req;
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
+       dbg("[%s] call handle : %d", GET_CP_NAME(invocation), req.handle);
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_split ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SPLIT );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_split), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SPLIT);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -546,27 +567,28 @@ static gboolean on_call_split(TelephonyCall *call, GDBusMethodInvocation *invoca
        return TRUE;
 }
 
-static gboolean on_call_transfer(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_id, gpointer user_data)
+static gboolean on_call_transfer(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_handle, gpointer user_data)
 {
        struct treq_call_transfer req;
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
+       dbg("[%s] call handle : %d", GET_CP_NAME(invocation), req.handle);
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_transfer ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_TRANSFER );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_transfer), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_TRANSFER);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -580,23 +602,22 @@ static gboolean on_call_deflect(TelephonyCall *call, GDBusMethodInvocation *invo
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       if ( call_number ){
-               g_strlcpy( req.number, call_number, MAX_CALL_DIAL_NUM_LEN);
-       }
+       if (call_number)
+               g_strlcpy(req.number, call_number, MAX_CALL_DIAL_NUM_LEN);
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_deflect ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_DEFLECT );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_deflect), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_DEFLECT);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -609,17 +630,17 @@ static gboolean on_call_get_privacy_mode(TelephonyCall *call, GDBusMethodInvocat
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
-       tcore_user_request_set_command( ur, TREQ_CALL_GET_PRIVACY_MODE );
+       tcore_user_request_set_command(ur, TREQ_CALL_GET_PRIVACY_MODE);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -633,21 +654,21 @@ static gboolean on_call_set_privacy_mode(TelephonyCall *call, GDBusMethodInvocat
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
        req.privacy_mode = privacy_mode;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_set_voice_privacy_mode ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SET_PRIVACY_MODE );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_set_voice_privacy_mode), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SET_PRIVACY_MODE);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -655,14 +676,14 @@ static gboolean on_call_set_privacy_mode(TelephonyCall *call, GDBusMethodInvocat
        return TRUE;
 }
 
-static gboolean on_call_get_status(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_id, gpointer user_data )
+static gboolean on_call_get_status(TelephonyCall *call, GDBusMethodInvocation *invocation, gint call_handle, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        TcorePlugin *plugin = 0;
        GSList *o_list = 0;
        CoreObject *o = 0;
        CallObject *co = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        gchar call_number[MAX_CALL_NUMBER_LEN];
        gint call_type;
@@ -670,61 +691,61 @@ static gboolean on_call_get_status(TelephonyCall *call, GDBusMethodInvocation *i
        gint call_status;
        gboolean call_multiparty_state;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
                return TRUE;
 
        plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
 
        o_list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_CALL);
-       if ( !o_list ) {
+       if (!o_list) {
                dbg("[ error ] co_list : 0");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return TRUE;
        }
 
        o = (CoreObject *)o_list->data;
        g_slist_free(o_list);
 
-       co = tcore_call_object_find_by_id( o, call_id );
-       if ( !co ) {
+       co = tcore_call_object_find_by_handle(o, call_handle);
+       if (!co) {
                dbg("[ error ] co : 0");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return TRUE;
        }
 
-       memset( call_number, 0, MAX_CALL_NUMBER_LEN );
-       tcore_call_object_get_number( co, call_number );
+       memset(call_number, 0, MAX_CALL_NUMBER_LEN);
+       tcore_call_object_get_number(co, call_number);
 
-       call_type = tcore_call_object_get_type( co );
-       call_direction = tcore_call_object_get_direction( co );
+       call_type = tcore_call_object_get_type(co);
+       call_direction = tcore_call_object_get_direction(co);
 
-       if ( call_direction == TCORE_CALL_DIRECTION_OUTGOING ) {
+       if (call_direction == TCORE_CALL_DIRECTION_OUTGOING)
                call_direction = TRUE;
-       } else {
+       else
                call_direction = FALSE;
-       }
 
-       call_status = tcore_call_object_get_status( co );
-       call_multiparty_state = tcore_call_object_get_multiparty_state( co );
+       call_status = tcore_call_object_get_status(co);
+       call_multiparty_state = tcore_call_object_get_multiparty_state(co);
        telephony_call_complete_get_status(call, invocation,
-                       call_id, call_number, call_type, call_direction, call_status, call_multiparty_state);
+                       call_handle, call_number, call_type, call_direction, call_status, call_multiparty_state);
 
        return TRUE;
 }
 
-static gboolean on_call_get_status_all(TelephonyCall *call, GDBusMethodInvocation *invocation, gpointer user_data )
+static gboolean on_call_get_status_all(TelephonyCall *call, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        TcorePlugin *plugin = 0;
        GSList *list = 0;
        CoreObject *o = 0;
        CallObject *co = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        GVariant *gv = 0;
        GVariantBuilder b;
 
        gint call_id;
+       gint handle;
        gchar call_number[MAX_CALL_NUMBER_LEN];
        gint call_type;
        gboolean call_direction;
@@ -733,15 +754,15 @@ static gboolean on_call_get_status_all(TelephonyCall *call, GDBusMethodInvocatio
 
        int len, i;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
                return TRUE;
 
        plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
 
        list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_CALL);
-       if ( !list ) {
+       if (!list) {
                dbg("[ error ] co_list : 0");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return TRUE;
        }
 
@@ -750,92 +771,91 @@ static gboolean on_call_get_status_all(TelephonyCall *call, GDBusMethodInvocatio
 
        g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-#define MAX_CALL_STATUS_NUM 7
-       for ( i=0; i<MAX_CALL_STATUS_NUM; i++ ) {
-               list = tcore_call_object_find_by_status( o, i );
-
-               if ( list ) {
+#define MAX_CALL_STATUS_NUM 9
+       for (i = 0; i < MAX_CALL_STATUS_NUM; i++) {
+               list = tcore_call_object_find_by_status(o, i);
 
+               if (list) {
                        GSList *tmp = 0;
                        tmp = list;
 
-                       dbg("[ check ] there is  a call on state %s", i== TCORE_CALL_STATUS_IDLE?"(IDLE)":
-                                                               (i== TCORE_CALL_STATUS_ACTIVE?"(ACTIVE)":
-                                                               (i== TCORE_CALL_STATUS_HELD?"(HELD)":
-                                                               (i== TCORE_CALL_STATUS_DIALING?"(DIALING)":
-                                                               (i== TCORE_CALL_STATUS_ALERT?"(ALERT)":
-                                                               (i== TCORE_CALL_STATUS_INCOMING?"(INCOMING)":
-                                                               (i== TCORE_CALL_STATUS_WAITING?"(WAITING)":"(UNKNOWN)")))))));
-
-                       while ( tmp ) {
-
+                       dbg("[%s][ call status ] there is  a call on state %s", GET_CP_NAME(invocation),
+                               (i == TCORE_CALL_STATUS_IDLE ? "(IDLE)" :
+                               (i == TCORE_CALL_STATUS_ACTIVE ? "(ACTIVE)" :
+                               (i == TCORE_CALL_STATUS_HELD ? "(HELD)" :
+                               (i == TCORE_CALL_STATUS_DIALING ? "(DIALING)" :
+                               (i == TCORE_CALL_STATUS_ALERT ? "(ALERT)" :
+                               (i == TCORE_CALL_STATUS_INCOMING ? "(INCOMING)" :
+                               (i == TCORE_CALL_STATUS_WAITING ? "(WAITING)" :
+                               (i == TCORE_CALL_STATUS_SETUP ? "(SETUP)" :
+                               (i == TCORE_CALL_STATUS_SETUP_PENDING ? "(SETUP_PENDING)" : "(UNKNOWN)"))))))))));
+
+                       while (tmp) {
                                co = (CallObject*)tmp->data;
-                               if ( !co ) {
+                               if (!co) {
                                        dbg("[ error ] call object : 0");
                                        tmp = tmp->next;
                                        continue;
                                }
 
-                               call_id = tcore_call_object_get_id( co );
+                               handle = tcore_call_object_get_handle(co);
+                               call_id = tcore_call_object_get_id(co);
 
-                               memset( call_number, 0, MAX_CALL_NUMBER_LEN );
-                               len = tcore_call_object_get_number( co, call_number );
-                               if ( !len ) {
-                                       dbg("[ check ] no number : (0x%d)", call_id);
-                               }
+                               memset(call_number, 0, MAX_CALL_NUMBER_LEN);
+                               len = tcore_call_object_get_number(co, call_number);
+                               if (!len)
+                                       dbg("[ check ] no number : (handle : 0x%d)", handle);
 
-                               call_type = tcore_call_object_get_type( co );
-                               call_direction = tcore_call_object_get_direction( co );
+                               call_type = tcore_call_object_get_type(co);
+                               call_direction = tcore_call_object_get_direction(co);
 
-                               if ( call_direction == TCORE_CALL_DIRECTION_OUTGOING ) {
+                               if (call_direction == TCORE_CALL_DIRECTION_OUTGOING)
                                        call_direction = TRUE;
-                               } else {
+                               else
                                        call_direction = FALSE;
+
+                               call_status = tcore_call_object_get_status(co);
+                               if ((TCORE_CALL_STATUS_SETUP == call_status) || (TCORE_CALL_STATUS_SETUP_PENDING == call_status)) {
+                                       dbg("SETUP/SETUP_PENDING found. This is already notified as dialing status to applicaiton, so change it to 'Dialing' ");
+                                       call_status = TCORE_CALL_STATUS_DIALING;
                                }
 
-                               call_status = tcore_call_object_get_status( co );
-                               call_multiparty_state = tcore_call_object_get_multiparty_state( co );
-
-                               dbg("call_id                : %d", call_id);
-                               dbg("call_number_len        : %d", len);
-                               dbg("call_number            : \"%s\"", call_number);
-                               dbg("call_type              : %s (%d)", call_type==TCORE_CALL_TYPE_VOICE?"VOICE":
-                                                                       (call_type==TCORE_CALL_TYPE_VIDEO?"VIDEO":
-                                                                       (call_type==TCORE_CALL_TYPE_E911?"E911":
-                                                                       (call_type==TCORE_CALL_TYPE_STDOTASP?"STDOTASP":
-                                                                       (call_type==TCORE_CALL_TYPE_NONSTDOTASP?"NONSTDOTASP":"UNKNOWN")))), call_type);
-                               dbg("call_direction         : %s (%d)", call_direction==TRUE?"MO":"MT", call_direction);
-                               dbg("call_status            : %s (%d)", call_status== TCORE_CALL_STATUS_IDLE?"IDLE":
-                                                                       (call_status== TCORE_CALL_STATUS_ACTIVE?"ACTIVE":
-                                                                       (call_status== TCORE_CALL_STATUS_HELD?"HELD":
-                                                                       (call_status== TCORE_CALL_STATUS_DIALING?"DIALING":
-                                                                       (call_status== TCORE_CALL_STATUS_ALERT?"ALERT":
-                                                                       (call_status== TCORE_CALL_STATUS_INCOMING?"INCOMING":
-                                                                       (call_status== TCORE_CALL_STATUS_WAITING?"WAITING":"UNKNOWN")))))), call_status);
-                               dbg("call_multiparty_state  : %s (%d)", call_multiparty_state ==1?"T":"F", call_multiparty_state);
+                               call_multiparty_state = tcore_call_object_get_multiparty_state(co);
+
+                               dbg("call_handle : (%d), call_id : (%d)", handle, call_id);
+                               dbg("call_number : (%s), len : (%d)", call_number, len);
+                               dbg("call_type : (%s), call_direction : (%s)",
+                                       call_type == TCORE_CALL_TYPE_VOICE ? "VOICE" :
+                                       (call_type == TCORE_CALL_TYPE_VIDEO ? "VIDEO" :
+                                       (call_type == TCORE_CALL_TYPE_E911 ? "E911" :
+                                       (call_type == TCORE_CALL_TYPE_STDOTASP ? "STDOTASP" :
+                                       (call_type == TCORE_CALL_TYPE_NONSTDOTASP ? "NONSTDOTASP" : "UNKNOWN")))),
+                                       call_direction == TRUE ? "MO" : "MT");
+                               dbg("call_status : (%s) , call_multiparty_state : (%s)",
+                                       call_status == TCORE_CALL_STATUS_IDLE ? "(IDLE)" :
+                                       (call_status == TCORE_CALL_STATUS_ACTIVE ? "(ACTIVE)" :
+                                       (call_status == TCORE_CALL_STATUS_HELD ? "(HELD)" :
+                                       (call_status == TCORE_CALL_STATUS_DIALING ? "(DIALING)" :
+                                       (call_status == TCORE_CALL_STATUS_ALERT ? "(ALERT)" :
+                                       (call_status == TCORE_CALL_STATUS_INCOMING ? "(INCOMING)" :
+                                       (call_status == TCORE_CALL_STATUS_WAITING ? "(WAITING)" :
+                                       (call_status == TCORE_CALL_STATUS_SETUP ? "(SETUP)" :
+                                       (call_status == TCORE_CALL_STATUS_SETUP_PENDING ? "(SETUP_PENDING)" : "(UNKNOWN)")))))))),
+                                       call_multiparty_state == 1 ? "T" : "F");
 
                                g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "call_id", g_variant_new_int32( call_id ));
-                               g_variant_builder_add(&b, "{sv}", "call_number", g_variant_new_string( call_number ));
-                               g_variant_builder_add(&b, "{sv}", "call_type", g_variant_new_int32( call_type ));
-                               g_variant_builder_add(&b, "{sv}", "call_direction", g_variant_new_boolean( call_direction ));
-                               g_variant_builder_add(&b, "{sv}", "call_state", g_variant_new_int32( call_status ));
-                               g_variant_builder_add(&b, "{sv}", "call_multiparty_state", g_variant_new_boolean( call_multiparty_state ));
+                               g_variant_builder_add(&b, "{sv}", "call_id", g_variant_new_int32(handle));
+                               g_variant_builder_add(&b, "{sv}", "call_number", g_variant_new_string(call_number));
+                               g_variant_builder_add(&b, "{sv}", "call_type", g_variant_new_int32(call_type));
+                               g_variant_builder_add(&b, "{sv}", "call_direction", g_variant_new_boolean(call_direction));
+                               g_variant_builder_add(&b, "{sv}", "call_state", g_variant_new_int32(call_status));
+                               g_variant_builder_add(&b, "{sv}", "call_multiparty_state", g_variant_new_boolean(call_multiparty_state));
                                g_variant_builder_close(&b);
 
-                               tmp = g_slist_next( tmp );
+                               tmp = g_slist_next(tmp);
                        }
                        g_slist_free(list);
-               } else {
-                       dbg("[ check ] there is no call on state %s", i== TCORE_CALL_STATUS_IDLE?"(IDLE)":
-                                                               (i== TCORE_CALL_STATUS_ACTIVE?"(ACTIVE)":
-                                                               (i== TCORE_CALL_STATUS_HELD?"(HELD)":
-                                                               (i== TCORE_CALL_STATUS_DIALING?"(DIALING)":
-                                                               (i== TCORE_CALL_STATUS_ALERT?"(ALERT)":
-                                                               (i== TCORE_CALL_STATUS_INCOMING?"(INCOMING)":
-                                                               (i== TCORE_CALL_STATUS_WAITING?"(WAITING)":"(UNKNOWN)")))))));
                }
-
        }
 
        gv = g_variant_builder_end(&b);
@@ -851,9 +871,9 @@ static gboolean on_call_set_sound_path(TelephonyCall *call, GDBusMethodInvocatio
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
@@ -861,12 +881,12 @@ static gboolean on_call_set_sound_path(TelephonyCall *call, GDBusMethodInvocatio
        req.path = sound_path;
        req.extra_volume_on = extra_volume_on;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_set_sound_path ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SET_SOUND_PATH );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_set_sound_path), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SET_SOUND_PATH);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -880,9 +900,9 @@ static gboolean on_call_get_sound_volume_level(TelephonyCall *call, GDBusMethodI
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
@@ -890,12 +910,11 @@ static gboolean on_call_get_sound_volume_level(TelephonyCall *call, GDBusMethodI
        req.device = sound_device;
        req.sound = sound_type;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_get_sound_volume_level ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_GET_SOUND_VOLUME_LEVEL );
-
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_get_sound_volume_level), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_GET_SOUND_VOLUME_LEVEL);
 
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
                GVariantBuilder b;
                GVariant *result = 0;
 
@@ -905,7 +924,7 @@ static gboolean on_call_get_sound_volume_level(TelephonyCall *call, GDBusMethodI
                g_variant_builder_close(&b);
                result = g_variant_builder_end(&b);
 
-               telephony_call_complete_get_sound_volume_level(call, invocation, result, ret );
+               telephony_call_complete_get_sound_volume_level(call, invocation, result, ret);
 
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
@@ -921,9 +940,9 @@ static gboolean on_call_set_sound_volume_level(TelephonyCall *call, GDBusMethodI
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
@@ -932,12 +951,12 @@ static gboolean on_call_set_sound_volume_level(TelephonyCall *call, GDBusMethodI
        req.sound = sound_type;
        req.volume = sound_volume;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_set_sound_volume_level ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SET_SOUND_VOLUME_LEVEL );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_set_sound_volume_level), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SET_SOUND_VOLUME_LEVEL);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -950,18 +969,18 @@ static gboolean on_call_get_sound_mute_status(TelephonyCall *call, GDBusMethodIn
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       tcore_user_request_set_command( ur, TREQ_CALL_GET_SOUND_MUTE_STATUS );
+       tcore_user_request_set_command(ur, TREQ_CALL_GET_SOUND_MUTE_STATUS);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -975,9 +994,9 @@ static gboolean on_call_set_sound_mute_status(TelephonyCall *call, GDBusMethodIn
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
@@ -985,14 +1004,14 @@ static gboolean on_call_set_sound_mute_status(TelephonyCall *call, GDBusMethodIn
        req.path = path;
        req.status = status;
 
-       dbg("[ check ] path : 0x%x, status : 0x%x", path, status);
+       dbg("[%s] path : 0x%x, status : 0x%x", GET_CP_NAME(invocation), path, status);
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_set_sound_mute_status ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SET_SOUND_MUTE_STATUS );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_set_sound_mute_status), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SET_SOUND_MUTE_STATUS);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -1006,21 +1025,21 @@ static gboolean on_call_set_sound_recording(TelephonyCall *call, GDBusMethodInvo
        struct treq_call_set_sound_recording req;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
        req.state = (gboolean)recording_state;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_set_sound_recording ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SET_SOUND_RECORDING );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_set_sound_recording), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SET_SOUND_RECORDING);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -1034,23 +1053,23 @@ static gboolean on_call_set_sound_equalization(TelephonyCall *call, GDBusMethodI
        struct treq_call_set_sound_equalization req;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
        req.mode = eq_mode;
        req.direction = (enum telephony_call_sound_direction)eq_direction;
-       memcpy( (char*)req.parameter, (const char*)eq_parameter, (MAX_CALL_EQ_PARAMETER_SIZE*2) );
+       memcpy((char *)req.parameter, (const char *)eq_parameter, (MAX_CALL_EQ_PARAMETER_SIZE * 2));
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_set_sound_equalization ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SET_SOUND_EQUALIZATION );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_set_sound_equalization), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SET_SOUND_EQUALIZATION);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -1064,21 +1083,21 @@ static gboolean on_call_set_sound_noise_reduction(TelephonyCall *call, GDBusMeth
        struct treq_call_set_sound_noise_reduction req;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
        req.status = (gboolean)nr_state;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_set_sound_noise_reduction ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SET_SOUND_NOISE_REDUCTION );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_set_sound_noise_reduction), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SET_SOUND_NOISE_REDUCTION);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               telephony_call_complete_set_sound_noise_reduction(call, invocation, ret );
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               telephony_call_complete_set_sound_noise_reduction(call, invocation, ret);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
                return FALSE;
@@ -1093,21 +1112,21 @@ static gboolean on_call_set_sound_clock_status(TelephonyCall *call, GDBusMethodI
        struct treq_call_set_sound_clock_status req;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
        req.status = clock_status;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_set_sound_clock_status ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SET_SOUND_CLOCK_STATUS );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_set_sound_clock_status), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SET_SOUND_CLOCK_STATUS);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -1122,21 +1141,21 @@ static gboolean on_call_set_preferred_voice_subscription(TelephonyCall *call, GD
        struct treq_call_set_preferred_voice_subscription req;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
        req.preferred_subs = preferred_subscription;
 
-       tcore_user_request_set_data( ur, sizeof( struct treq_call_set_preferred_voice_subscription ), &req );
-       tcore_user_request_set_command( ur, TREQ_CALL_SET_PREFERRED_VOICE_SUBSCRIPTION );
+       tcore_user_request_set_data(ur, sizeof(struct treq_call_set_preferred_voice_subscription), &req);
+       tcore_user_request_set_command(ur, TREQ_CALL_SET_PREFERRED_VOICE_SUBSCRIPTION);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -1149,18 +1168,18 @@ static gboolean on_call_get_preferred_voice_subscription(TelephonyCall *call, GD
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_CALL, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       tcore_user_request_set_command( ur, TREQ_CALL_GET_PREFERRED_VOICE_SUBSCRIPTION );
+       tcore_user_request_set_command(ur, TREQ_CALL_GET_PREFERRED_VOICE_SUBSCRIPTION);
 
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -1170,21 +1189,24 @@ static gboolean on_call_get_preferred_voice_subscription(TelephonyCall *call, GD
 
 static gboolean on_call_modify(TelephonyCall *call,
        GDBusMethodInvocation *invocation,
-       gint call_id, gint call_type, gpointer user_data)
+       gint call_handle, gint call_type, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        struct treq_call_modify req = {0};
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
        req.call_type = call_type;
+
+       dbg("[%s] call handle : %d, call_type : %d", GET_CP_NAME(invocation), req.handle, req.call_type);
+
        tcore_user_request_set_data(ur, sizeof(struct treq_call_modify), &req);
        tcore_user_request_set_command(ur, TREQ_CALL_MODIFY);
 
@@ -1200,21 +1222,24 @@ static gboolean on_call_modify(TelephonyCall *call,
 
 static gboolean on_call_confirm_modify(TelephonyCall *call,
        GDBusMethodInvocation *invocation,
-       gint call_id, gint confirm_type, gpointer user_data)
+       gint call_handle, gint confirm_type, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        struct treq_call_confirm_modify req = {0};
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, call, invocation);
 
-       req.id = call_id;
+       req.handle = call_handle;
        req.confirm_type = confirm_type;
+
+       dbg("[%s] call handle : %d, confirm_type : %d", GET_CP_NAME(invocation), req.handle, req.confirm_type);
+
        tcore_user_request_set_data(ur, sizeof(struct treq_call_confirm_modify), &req);
        tcore_user_request_set_command(ur, TREQ_CALL_CONFIRM_MODIFY);
 
@@ -1236,437 +1261,364 @@ gboolean dbus_plugin_setup_call_interface(TelephonyObjectSkeleton *object, struc
        telephony_object_skeleton_set_call(object, call);
        g_object_unref(call);
 
-       g_signal_connect (call,
-                       "handle-dial",
-                       G_CALLBACK (on_call_dial),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-answer",
-                       G_CALLBACK (on_call_answer),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-end",
-                       G_CALLBACK (on_call_end),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-start-cont-dtmf",
-                       G_CALLBACK (on_call_start_cont_dtmf),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-stop-cont-dtmf",
-                       G_CALLBACK (on_call_stop_cont_dtmf),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-send-burst-dtmf",
-                       G_CALLBACK (on_call_send_burst_dtmf),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-active",
-                       G_CALLBACK (on_call_active),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-hold",
-                       G_CALLBACK (on_call_hold),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-swap",
-                       G_CALLBACK (on_call_swap),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-join",
-                       G_CALLBACK (on_call_join),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-split",
-                       G_CALLBACK (on_call_split),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-transfer",
-                       G_CALLBACK (on_call_transfer),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-deflect",
-                       G_CALLBACK (on_call_deflect),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-get-privacy-mode",
-                       G_CALLBACK (on_call_get_privacy_mode),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-set-privacy-mode",
-                       G_CALLBACK (on_call_set_privacy_mode),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-get-status",
-                       G_CALLBACK (on_call_get_status),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-get-status-all",
-                       G_CALLBACK (on_call_get_status_all),
-                       ctx);
-
-
-       g_signal_connect (call,
-                       "handle-set-sound-path",
-                       G_CALLBACK (on_call_set_sound_path),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-get-sound-volume-level",
-                       G_CALLBACK (on_call_get_sound_volume_level),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-set-sound-volume-level",
-                       G_CALLBACK (on_call_set_sound_volume_level),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-get-sound-mute-status",
-                       G_CALLBACK (on_call_get_sound_mute_status),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-set-sound-mute-status",
-                       G_CALLBACK (on_call_set_sound_mute_status),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-set-sound-recording",
-                       G_CALLBACK (on_call_set_sound_recording),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-set-sound-equalization",
-                       G_CALLBACK (on_call_set_sound_equalization),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-set-sound-noise-reduction",
-                       G_CALLBACK (on_call_set_sound_noise_reduction),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-set-sound-clock-status",
-                       G_CALLBACK (on_call_set_sound_clock_status),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-set-preferred-voice-subscription",
-                       G_CALLBACK (on_call_set_preferred_voice_subscription),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-get-preferred-voice-subscription",
-                       G_CALLBACK (on_call_get_preferred_voice_subscription),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-modify",
-                       G_CALLBACK (on_call_modify),
-                       ctx);
-
-       g_signal_connect (call,
-                       "handle-confirm-modify",
-                       G_CALLBACK (on_call_confirm_modify),
-                       ctx);
+       g_signal_connect(call,
+               "handle-dial",
+               G_CALLBACK(on_call_dial), ctx);
 
-       return TRUE;
-}
+       g_signal_connect(call,
+               "handle-answer",
+               G_CALLBACK(on_call_answer), ctx);
 
-gboolean dbus_plugin_call_response(struct custom_data *ctx, UserRequest *ur, struct dbus_request_info *dbus_info, enum tcore_response_command command, unsigned int data_len, const void *data)
-{
-       int i = 0;
-       GSList *co_list;
-       CoreObject *co_call;
-       char *modem_name = NULL;
-       TcorePlugin *p = NULL;
-
-       modem_name = tcore_user_request_get_modem_name(ur);
-       if (!modem_name)
-               return FALSE;
+       g_signal_connect(call,
+               "handle-end",
+               G_CALLBACK(on_call_end), ctx);
 
-       p = tcore_server_find_plugin(ctx->server, modem_name);
-       free(modem_name);
-       if (!p)
-               return FALSE;
+       g_signal_connect(call,
+               "handle-start-cont-dtmf",
+               G_CALLBACK(on_call_start_cont_dtmf), ctx);
 
-       co_list = tcore_plugin_get_core_objects_bytype(p, CORE_OBJECT_TYPE_CALL);
-       if (!co_list) {
-               return FALSE;
-       }
+       g_signal_connect(call,
+               "handle-stop-cont-dtmf",
+               G_CALLBACK(on_call_stop_cont_dtmf), ctx);
 
-       co_call = (CoreObject *)co_list->data;
-       g_slist_free(co_list);
+       g_signal_connect(call,
+               "handle-send-burst-dtmf",
+               G_CALLBACK(on_call_send_burst_dtmf), ctx);
 
-       if (!co_call) {
-               return FALSE;
-       }
+       g_signal_connect(call,
+               "handle-active",
+               G_CALLBACK(on_call_active), ctx);
 
-       switch (command) {
-               case TRESP_CALL_DIAL: {
-                       struct tresp_call_dial *resp = (struct tresp_call_dial*)data;
+       g_signal_connect(call,
+               "handle-hold",
+               G_CALLBACK(on_call_hold), ctx);
 
-                       dbg("receive TRESP_CALL_DIAL (err[%d])", resp->err);
+       g_signal_connect(call,
+               "handle-swap",
+               G_CALLBACK(on_call_swap), ctx);
 
-                       telephony_call_complete_dial(dbus_info->interface_object, dbus_info->invocation, resp->err);
-               } break;
+       g_signal_connect(call,
+               "handle-join",
+               G_CALLBACK(on_call_join), ctx);
 
-               case TRESP_CALL_ANSWER: {
-                       struct tresp_call_answer *resp = (struct tresp_call_answer*)data;
+       g_signal_connect(call,
+               "handle-split",
+               G_CALLBACK(on_call_split), ctx);
 
-                       dbg("receive TRESP_CALL_ANSWER (err[%d] id[%d])", resp->err, resp->id);
+       g_signal_connect(call,
+               "handle-transfer",
+               G_CALLBACK(on_call_transfer), ctx);
 
-                       telephony_call_complete_answer(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->id );
+       g_signal_connect(call,
+               "handle-deflect",
+               G_CALLBACK(on_call_deflect), ctx);
 
-               } break;
+       g_signal_connect(call,
+               "handle-get-privacy-mode",
+               G_CALLBACK(on_call_get_privacy_mode), ctx);
 
-               case TRESP_CALL_END: {
-                       struct tresp_call_end *resp = (struct tresp_call_end*)data;
+       g_signal_connect(call,
+               "handle-set-privacy-mode",
+               G_CALLBACK(on_call_set_privacy_mode), ctx);
 
-                       dbg("receive TRESP_CALL_END (err[%d] id[%d] type[%d])", resp->err, resp->id, resp->type);
+       g_signal_connect(call,
+               "handle-get-status",
+               G_CALLBACK(on_call_get_status), ctx);
 
-                       telephony_call_complete_end(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->id, resp->type );
+       g_signal_connect(call,
+               "handle-get-status-all",
+               G_CALLBACK(on_call_get_status_all), ctx);
 
-               } break;
+       g_signal_connect(call,
+               "handle-set-sound-path",
+               G_CALLBACK(on_call_set_sound_path), ctx);
 
-               case TRESP_CALL_HOLD: {
-                       struct tresp_call_hold *resp = (struct tresp_call_hold*)data;
+       g_signal_connect(call,
+               "handle-get-sound-volume-level",
+               G_CALLBACK(on_call_get_sound_volume_level), ctx);
 
-                       dbg("receive TRESP_CALL_HOLD (err[%d] id[%d])", resp->err, resp->id);
+       g_signal_connect(call,
+               "handle-set-sound-volume-level",
+               G_CALLBACK(on_call_set_sound_volume_level), ctx);
 
-                       telephony_call_complete_hold(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->id );
+       g_signal_connect(call,
+               "handle-get-sound-mute-status",
+               G_CALLBACK(on_call_get_sound_mute_status), ctx);
 
-               } break;
+       g_signal_connect(call,
+               "handle-set-sound-mute-status",
+               G_CALLBACK(on_call_set_sound_mute_status), ctx);
 
-               case TRESP_CALL_ACTIVE: {
-                       struct tresp_call_active *resp = (struct tresp_call_active*)data;
+       g_signal_connect(call,
+               "handle-set-sound-recording",
+               G_CALLBACK(on_call_set_sound_recording), ctx);
 
-                       dbg("receive TRESP_CALL_ACTIVE (err[%d] id[%d])", resp->err, resp->id);
+       g_signal_connect(call,
+               "handle-set-sound-equalization",
+               G_CALLBACK(on_call_set_sound_equalization), ctx);
 
-                       telephony_call_complete_active(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->id );
+       g_signal_connect(call,
+               "handle-set-sound-noise-reduction",
+               G_CALLBACK(on_call_set_sound_noise_reduction), ctx);
 
-               } break;
+       g_signal_connect(call,
+               "handle-set-sound-clock-status",
+               G_CALLBACK(on_call_set_sound_clock_status), ctx);
 
-               case TRESP_CALL_SWAP: {
-                       struct tresp_call_swap *resp = (struct tresp_call_swap*)data;
+       g_signal_connect(call,
+               "handle-set-preferred-voice-subscription",
+               G_CALLBACK(on_call_set_preferred_voice_subscription), ctx);
 
-                       dbg("receive TRESP_CALL_SWAP (err[%d] id[%d])", resp->err, resp->id);
+       g_signal_connect(call,
+               "handle-get-preferred-voice-subscription",
+               G_CALLBACK(on_call_get_preferred_voice_subscription), ctx);
 
-                       telephony_call_complete_swap(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->id );
+       g_signal_connect(call,
+               "handle-modify",
+               G_CALLBACK(on_call_modify), ctx);
 
-               } break;
+       g_signal_connect(call,
+               "handle-confirm-modify",
+               G_CALLBACK(on_call_confirm_modify), ctx);
 
-               case TRESP_CALL_JOIN: {
-                       struct tresp_call_join *resp = (struct tresp_call_join*)data;
+       return TRUE;
+}
 
-                       dbg("receive TRESP_CALL_JOIN (err[%d] id[%d])", resp->err, resp->id);
+gboolean dbus_plugin_call_response(struct custom_data *ctx, UserRequest *ur, struct dbus_request_info *dbus_info, enum tcore_response_command command, unsigned int data_len, const void *data)
+{
+       char *cpname = dbus_info ? GET_CP_NAME(dbus_info->invocation) : "";
 
-                       telephony_call_complete_join(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->id );
+       switch (command) {
+       case TRESP_CALL_DIAL: {
+               struct tresp_call_dial *resp = (struct tresp_call_dial*)data;
 
-               } break;
+               dbg("[%s] DIAL (err[%d])", cpname, resp->err);
 
+               telephony_call_complete_dial(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               case TRESP_CALL_SPLIT: {
-                       struct tresp_call_split *resp = (struct tresp_call_split*)data;
+       case TRESP_CALL_ANSWER: {
+               struct tresp_call_answer *resp = (struct tresp_call_answer*)data;
 
-                       dbg("receive TRESP_CALL_SPLIT (err[%d] id[%d])", resp->err, resp->id);
+               dbg("[%s] ANSWER (err[%d] call_handle[%d])", cpname, resp->err, resp->handle);
 
-                       telephony_call_complete_split(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->id );
+               telephony_call_complete_answer(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->handle);
+       } break;
 
-               } break;
+       case TRESP_CALL_END: {
+               struct tresp_call_end *resp = (struct tresp_call_end*)data;
 
-               case TRESP_CALL_DEFLECT: {
-                       struct tresp_call_deflect *resp = (struct tresp_call_deflect*)data;
+               dbg("[%s] END (err[%d] call_handle[%d] type[%d])", cpname, resp->err, resp->handle, resp->type);
 
-                       dbg("receive TRESP_CALL_DEFLECT (err[%d] id[%d])", resp->err, resp->id);
+               telephony_call_complete_end(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->handle, resp->type);
+       } break;
 
-                       telephony_call_complete_deflect(dbus_info->interface_object, dbus_info->invocation, resp->err );
+       case TRESP_CALL_HOLD: {
+               struct tresp_call_hold *resp = (struct tresp_call_hold*)data;
 
-               } break;
+               dbg("[%s] HOLD (err[%d] call_handle[%d])", cpname, resp->err, resp->handle);
 
-               case TRESP_CALL_TRANSFER: {
-                       struct tresp_call_transfer *resp = (struct tresp_call_transfer*)data;
+               telephony_call_complete_hold(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->handle);
+       } break;
 
-                       dbg("receive TRESP_CALL_TRANSFER (err[%d] id[%d])", resp->err, resp->id);
+       case TRESP_CALL_ACTIVE: {
+               struct tresp_call_active *resp = (struct tresp_call_active*)data;
 
-                       telephony_call_complete_transfer(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->id );
+               dbg("[%s] ACTIVE (err[%d] call_handle[%d])", cpname, resp->err, resp->handle);
 
-               } break;
+               telephony_call_complete_active(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->handle);
+       } break;
 
-               case TRESP_CALL_START_CONT_DTMF: {
-                       struct tresp_call_dtmf *resp = (struct tresp_call_dtmf*)data;
+       case TRESP_CALL_SWAP: {
+               struct tresp_call_swap *resp = (struct tresp_call_swap*)data;
 
-                       dbg("receive TRESP_CALL_START_CONT_DTMF (err[%d])", resp->err);
+               dbg("[%s] SWAP (err[%d] call_handle[%d])", cpname, resp->err, resp->handle);
 
-                       telephony_call_complete_start_cont_dtmf(dbus_info->interface_object, dbus_info->invocation, resp->err);
-               } break;
+               telephony_call_complete_swap(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->handle);
+       } break;
 
-               case TRESP_CALL_STOP_CONT_DTMF: {
-                       struct tresp_call_dtmf *resp = (struct tresp_call_dtmf*)data;
+       case TRESP_CALL_JOIN: {
+               struct tresp_call_join *resp = (struct tresp_call_join*)data;
 
-                       dbg("receive TRESP_CALL_STOP_CONT_DTMF (err[%d])", resp->err);
+               dbg("[%s] JOIN (err[%d] call_handle[%d])", cpname, resp->err, resp->handle);
 
-                       telephony_call_complete_stop_cont_dtmf(dbus_info->interface_object, dbus_info->invocation, resp->err);
-               } break;
+               telephony_call_complete_join(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->handle);
+       } break;
 
-               case TRESP_CALL_SEND_BURST_DTMF: {
-                       struct tresp_call_dtmf *resp = (struct tresp_call_dtmf*)data;
+       case TRESP_CALL_SPLIT: {
+               struct tresp_call_split *resp = (struct tresp_call_split*)data;
 
-                       dbg("receive TRESP_CALL_SEND_BURST_DTMF (err[%d])", resp->err);
+               dbg("[%s] SPLIT (err[%d] call_handle[%d])", cpname, resp->err, resp->handle);
 
-                       telephony_call_complete_send_burst_dtmf(dbus_info->interface_object, dbus_info->invocation, resp->err);
-               } break;
+               telephony_call_complete_split(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->handle);
+       } break;
 
-               case TRESP_CALL_GET_PRIVACY_MODE: {
-                       struct tresp_call_get_voice_privacy_mode *resp = (struct tresp_call_get_voice_privacy_mode*)data;
+       case TRESP_CALL_DEFLECT: {
+               struct tresp_call_deflect *resp = (struct tresp_call_deflect*)data;
 
-                       dbg("receive TRESP_CALL_GET_PRIVACY_MODE (err[%d])", resp->err);
-                       dbg("Voice call privacy mode %d",resp->privacy_mode);
+               dbg("[%s] DEFLECT (err[%d] call_handle[%d])", cpname, resp->err, resp->handle);
 
-                       telephony_call_complete_get_privacy_mode(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->privacy_mode);
-               } break;
+               telephony_call_complete_deflect(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               case TRESP_CALL_SET_PRIVACY_MODE: {
-                       struct tresp_call_set_voice_privacy_mode *resp = (struct tresp_call_set_voice_privacy_mode *)data;
+       case TRESP_CALL_TRANSFER: {
+               struct tresp_call_transfer *resp = (struct tresp_call_transfer*)data;
 
-                       dbg("receive TRESP_CALL_SET_PRIVACY_MODE (err[%d])", resp->err);
+               dbg("[%s] TRANSFER (err[%d] call_handle[%d])", cpname, resp->err, resp->handle);
 
-                       telephony_call_complete_set_privacy_mode(dbus_info->interface_object, dbus_info->invocation, resp->err);
-               } break;
+               telephony_call_complete_transfer(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->handle);
+       } break;
 
-               case TRESP_CALL_SET_SOUND_PATH: {
-                       struct tresp_call_set_sound_path *resp = (struct tresp_call_set_sound_path*)data;
+       case TRESP_CALL_START_CONT_DTMF: {
+               struct tresp_call_dtmf *resp = (struct tresp_call_dtmf*)data;
 
-                       dbg("receive TRESP_CALL_SET_SOUND_PATH (err[%d])", resp->err);
+               dbg("[%s] START_CONT_DTMF (err[%d])", cpname, resp->err);
 
-                       telephony_call_complete_set_sound_path(dbus_info->interface_object, dbus_info->invocation, resp->err);
-               } break;
+               telephony_call_complete_start_cont_dtmf(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               case TRESP_CALL_SET_SOUND_VOLUME_LEVEL: {
-                       struct tresp_call_set_sound_volume_level *resp = (struct tresp_call_set_sound_volume_level*)data;
+       case TRESP_CALL_STOP_CONT_DTMF: {
+               struct tresp_call_dtmf *resp = (struct tresp_call_dtmf*)data;
 
-                       dbg("receive TRESP_CALL_SET_SOUND_VOLUME_LEVEL (err[%d])", resp->err);
+               dbg("[%s] STOP_CONT_DTMF (err[%d])", cpname, resp->err);
 
-                       telephony_call_complete_set_sound_volume_level(dbus_info->interface_object, dbus_info->invocation, resp->err);
-               } break;
+               telephony_call_complete_stop_cont_dtmf(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               case TRESP_CALL_GET_SOUND_VOLUME_LEVEL: {
-                       struct tresp_call_get_sound_volume_level *resp = (struct tresp_call_get_sound_volume_level*)data;
-                       GVariant *result = 0;
-                       GVariantBuilder b;
+       case TRESP_CALL_SEND_BURST_DTMF: {
+               struct tresp_call_dtmf *resp = (struct tresp_call_dtmf*)data;
 
-                       dbg("receive TRESP_CALL_GET_SOUND_VOLUME_LEVEL (err[%d])", resp->err);
+               dbg("[%s] SEND_BURST_DTMF (err[%d])", cpname, resp->err);
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+               telephony_call_complete_send_burst_dtmf(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+       case TRESP_CALL_GET_PRIVACY_MODE: {
+               struct tresp_call_get_voice_privacy_mode *resp = (struct tresp_call_get_voice_privacy_mode*)data;
 
-                       g_variant_builder_add(&b, "{sv}", "err", g_variant_new_int32(resp->err));
+               dbg("[%s] GET_PRIVACY_MODE (err[%d] mode[%d])", cpname, resp->err, resp->privacy_mode);
 
-                       if ( !resp->err ) {
+               telephony_call_complete_get_privacy_mode(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->privacy_mode);
+       } break;
 
-                               dbg("resp->record_num : [%d]", resp->record_num);
+       case TRESP_CALL_SET_PRIVACY_MODE: {
+               struct tresp_call_set_voice_privacy_mode *resp = (struct tresp_call_set_voice_privacy_mode *)data;
 
-                               for ( i=0; i<resp->record_num; i++ ) {
-                                       dbg("sound_type : [%d], level:[%d]", resp->record[i].sound, resp->record[i].volume);
-                                       g_variant_builder_add(&b, "{sv}", "type", g_variant_new_int32(resp->record[i].sound));
-                                       g_variant_builder_add(&b, "{sv}", "level", g_variant_new_int32(resp->record[i].volume));
-                               }
+               dbg("[%s] SET_PRIVACY_MODE (err[%d])", cpname, resp->err);
 
-                       }
+               telephony_call_complete_set_privacy_mode(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-                       g_variant_builder_close(&b);
+       case TRESP_CALL_SET_SOUND_PATH: {
+               struct tresp_call_set_sound_path *resp = (struct tresp_call_set_sound_path*)data;
 
-                       result = g_variant_builder_end(&b);
+               dbg("[%s] SET_SOUND_PATH (err[%d])", cpname, resp->err);
 
-                       telephony_call_complete_get_sound_volume_level(dbus_info->interface_object, dbus_info->invocation, result, resp->err );
+               telephony_call_complete_set_sound_path(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               } break;
+       case TRESP_CALL_SET_SOUND_VOLUME_LEVEL: {
+               struct tresp_call_set_sound_volume_level *resp = (struct tresp_call_set_sound_volume_level*)data;
 
-               case TRESP_CALL_SET_SOUND_MUTE_STATUS: {
-                       struct tresp_call_set_sound_mute_status *resp = (struct tresp_call_set_sound_mute_status*)data;
+               dbg("[%s] SET_SOUND_VOLUME_LEVEL (err[%d])", cpname, resp->err);
 
-                       dbg("receive TRESP_CALL_SET_SOUND_MUTE_STATUS (err[%d]", resp->err);
-                       telephony_call_complete_set_sound_mute_status(dbus_info->interface_object, dbus_info->invocation, resp->err);
-               } break;
+               telephony_call_complete_set_sound_volume_level(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               case TRESP_CALL_GET_SOUND_MUTE_STATUS: {
-                       struct tresp_call_get_sound_mute_status *resp = (struct tresp_call_get_sound_mute_status*)data;
+       case TRESP_CALL_GET_SOUND_VOLUME_LEVEL: {
+               struct tresp_call_get_sound_volume_level *resp = (struct tresp_call_get_sound_volume_level*)data;
+               GVariant *result = 0;
+               GVariantBuilder b;
+               int i = 0;
 
-                       dbg("receive TRESP_CALL_GET_SOUND_MUTE_STATUS (err[%d] path[%d] status[%d])",
-                               resp->err, resp->path, resp->status);
-                       telephony_call_complete_get_sound_mute_status(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->path, resp->status );
+               dbg("[%s] GET_SOUND_VOLUME_LEVEL (err[%d])", cpname, resp->err);
 
-               } break;
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-               case TRESP_CALL_SET_SOUND_RECORDING: {
-                       struct tresp_call_set_sound_recording *resp = (struct tresp_call_set_sound_recording*)data;
-                       telephony_call_complete_set_sound_recording(dbus_info->interface_object, dbus_info->invocation, resp->err );
+               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
 
-               } break;
+               g_variant_builder_add(&b, "{sv}", "err", g_variant_new_int32(resp->err));
 
-               case TRESP_CALL_SET_SOUND_EQUALIZATION: {
-                       struct tresp_call_set_sound_equalization *resp = (struct tresp_call_set_sound_equalization*)data;
-                       telephony_call_complete_set_sound_equalization(dbus_info->interface_object, dbus_info->invocation, resp->err );
+               if (!resp->err) {
+                       dbg("resp->record_num : [%d]", resp->record_num);
 
-               } break;
+                       for (i = 0; i < resp->record_num; i++) {
+                               dbg("sound_type : [%d], level:[%d]", resp->record[i].sound, resp->record[i].volume);
+                               g_variant_builder_add(&b, "{sv}", "type", g_variant_new_int32(resp->record[i].sound));
+                               g_variant_builder_add(&b, "{sv}", "level", g_variant_new_int32(resp->record[i].volume));
+                       }
+               }
 
-               case TRESP_CALL_SET_SOUND_NOISE_REDUCTION: {
-                       struct tresp_call_set_sound_noise_reduction *resp = (struct tresp_call_set_sound_noise_reduction*)data;
-                       telephony_call_complete_set_sound_noise_reduction(dbus_info->interface_object, dbus_info->invocation, resp->err );
+               g_variant_builder_close(&b);
 
-               } break;
+               result = g_variant_builder_end(&b);
+
+               telephony_call_complete_get_sound_volume_level(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
+
+       case TRESP_CALL_SET_SOUND_MUTE_STATUS: {
+               struct tresp_call_set_sound_mute_status *resp = (struct tresp_call_set_sound_mute_status*)data;
+
+               dbg("[%s] SET_SOUND_MUTE_STATUS (err[%d])", cpname, resp->err);
+               telephony_call_complete_set_sound_mute_status(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
+
+       case TRESP_CALL_GET_SOUND_MUTE_STATUS: {
+               struct tresp_call_get_sound_mute_status *resp = (struct tresp_call_get_sound_mute_status*)data;
+
+               dbg("[%s] GET_SOUND_MUTE_STATUS (err[%d] path[%d] status[%d])",
+                       cpname, resp->err, resp->path, resp->status);
+               telephony_call_complete_get_sound_mute_status(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->path, resp->status);
+
+       } break;
 
-               case TRESP_CALL_SET_SOUND_CLOCK_STATUS: {
-                       struct tresp_call_set_sound_clock_status *resp = (struct tresp_call_set_sound_clock_status*)data;
-                       telephony_call_complete_set_sound_clock_status(dbus_info->interface_object, dbus_info->invocation, resp->err );
+       case TRESP_CALL_SET_SOUND_RECORDING: {
+               struct tresp_call_set_sound_recording *resp = (struct tresp_call_set_sound_recording*)data;
+               telephony_call_complete_set_sound_recording(dbus_info->interface_object, dbus_info->invocation, resp->err);
 
-               } break;
+       } break;
 
-               case TRESP_CALL_SET_PREFERRED_VOICE_SUBSCRIPTION: {
-                       struct tresp_call_set_preferred_voice_subscription *resp = (struct tresp_call_set_preferred_voice_subscription*)data;
-                       telephony_call_complete_set_preferred_voice_subscription(dbus_info->interface_object, dbus_info->invocation, resp->err );
-               } break;
+       case TRESP_CALL_SET_SOUND_EQUALIZATION: {
+               struct tresp_call_set_sound_equalization *resp = (struct tresp_call_set_sound_equalization*)data;
+               telephony_call_complete_set_sound_equalization(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               case TRESP_CALL_GET_PREFERRED_VOICE_SUBSCRIPTION: {
-                       struct tresp_call_get_preferred_voice_subscription *resp = (struct tresp_call_get_preferred_voice_subscription*)data;
-                       telephony_call_complete_get_preferred_voice_subscription(dbus_info->interface_object, dbus_info->invocation,
-                               resp->preferred_subs, resp->err );
-               } break;
+       case TRESP_CALL_SET_SOUND_NOISE_REDUCTION: {
+               struct tresp_call_set_sound_noise_reduction *resp = (struct tresp_call_set_sound_noise_reduction*)data;
+               telephony_call_complete_set_sound_noise_reduction(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               case TRESP_CALL_MODIFY: {
-                       const struct tresp_call_modify *resp = data;
-                       telephony_call_complete_modify(dbus_info->interface_object,
-                               dbus_info->invocation, resp->err);
-               } break;
+       case TRESP_CALL_SET_SOUND_CLOCK_STATUS: {
+               struct tresp_call_set_sound_clock_status *resp = (struct tresp_call_set_sound_clock_status*)data;
+               telephony_call_complete_set_sound_clock_status(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               case TRESP_CALL_CONFIRM_MODIFY: {
-                       const struct tresp_call_confirm_modify *resp = data;
-                       telephony_call_complete_confirm_modify(dbus_info->interface_object,
-                               dbus_info->invocation, resp->err);
-               } break;
+       case TRESP_CALL_SET_PREFERRED_VOICE_SUBSCRIPTION: {
+               struct tresp_call_set_preferred_voice_subscription *resp = (struct tresp_call_set_preferred_voice_subscription*)data;
+               telephony_call_complete_set_preferred_voice_subscription(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               default:
-                       dbg("not handled command[%d]", command);
-               break;
+       case TRESP_CALL_GET_PREFERRED_VOICE_SUBSCRIPTION: {
+               struct tresp_call_get_preferred_voice_subscription *resp = (struct tresp_call_get_preferred_voice_subscription*)data;
+               telephony_call_complete_get_preferred_voice_subscription(dbus_info->interface_object, dbus_info->invocation,
+                       resp->preferred_subs, resp->err);
+       } break;
 
+       case TRESP_CALL_MODIFY: {
+               const struct tresp_call_modify *resp = data;
+               telephony_call_complete_modify(dbus_info->interface_object,
+                       dbus_info->invocation, resp->err);
+       } break;
+
+       case TRESP_CALL_CONFIRM_MODIFY: {
+               const struct tresp_call_confirm_modify *resp = data;
+               telephony_call_complete_confirm_modify(dbus_info->interface_object,
+                       dbus_info->invocation, resp->err);
+       } break;
+
+       default:
+               dbg("not handled command[%d]", command);
+       break;
        }
 
        return TRUE;
@@ -1686,309 +1638,305 @@ gboolean dbus_plugin_call_notification(struct custom_data *ctx, CoreObject *sour
                return FALSE;
        }
        cp_name = (char *)tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-                               command, cp_name);
 
        call = telephony_object_peek_call(TELEPHONY_OBJECT(object));
+       if (call == NULL) {
+               err("call object is NULL!!!");
+               return FALSE;
+       }
 
        switch (command) {
-               case TNOTI_CALL_STATUS_IDLE: {
-                       struct tnoti_call_status_idle *idle = (struct tnoti_call_status_idle*)data;
-
-                       if ( idle->type != CALL_TYPE_VIDEO ) {
-                               dbg("[ check ] call status : idle (voice call)");
-                               telephony_call_emit_voice_call_status_idle( call, idle->id, idle->cause, 0, 0 );
-                       } else {
-                               dbg("[ check ] call status : idle (video call)");
-                               telephony_call_emit_video_call_status_idle( call, idle->id, idle->cause, 0, 0 );
-                       }
+       case TNOTI_CALL_STATUS_IDLE: {
+               struct tnoti_call_status_idle *idle = (struct tnoti_call_status_idle*)data;
 
-               } break;
-               case TNOTI_CALL_STATUS_DIALING: {
-                       struct tnoti_call_status_dialing *dialing = (struct tnoti_call_status_dialing*)data;
+               if (idle->type != CALL_TYPE_VIDEO) {
+                       dbg("[%s][ call status ]: idle (voice call)", cp_name);
+                       telephony_call_emit_voice_call_status_idle(call, idle->handle, idle->cause, 0, 0);
+               } else {
+                       dbg("[%s][ call status ]: idle (video call)", cp_name);
+                       telephony_call_emit_video_call_status_idle(call, idle->handle, idle->cause, 0, 0);
+               }
+       } break;
 
-                       if ( dialing->type != CALL_TYPE_VIDEO ) {
-                               dbg("[ check ] call status : dialing (type[%d] id[%d]) (voice call)", dialing->type, dialing->id);
-                               telephony_call_emit_voice_call_status_dialing( call, dialing->id );
-                       } else {
-                               dbg("[ check ] call status : dialing (type[%d] id[%d]) (video call)", dialing->type, dialing->id);
-                               telephony_call_emit_video_call_status_dialing( call, dialing->id );
-                       }
+       case TNOTI_CALL_STATUS_DIALING: {
+               struct tnoti_call_status_dialing *dialing = (struct tnoti_call_status_dialing*)data;
 
-               } break;
-               case TNOTI_CALL_STATUS_ALERT: {
-                       struct tnoti_call_status_alert *alert = (struct tnoti_call_status_alert*)data;
+               if (dialing->type != CALL_TYPE_VIDEO) {
+                       dbg("[%s][ call status ]: dialing (type[%d] call_handle[%d]) (voice call)", cp_name, dialing->type, dialing->handle);
+                       telephony_call_emit_voice_call_status_dialing(call, dialing->handle);
+               } else {
+                       dbg("[%s][ call status ]: dialing (type[%d] call_handle[%d]) (video call)", cp_name, dialing->type, dialing->handle);
+                       telephony_call_emit_video_call_status_dialing(call, dialing->handle);
+               }
+       } break;
 
-                       if ( alert->type != CALL_TYPE_VIDEO ) {
-                               dbg("[ check ] call status : alert (voice call)");
-                               telephony_call_emit_voice_call_status_alert( call, alert->id );
-                       } else {
-                               dbg("[ check ] call status : alert (video call)");
-                               telephony_call_emit_video_call_status_alert( call, alert->id );
-                       }
+       case TNOTI_CALL_STATUS_ALERT: {
+               struct tnoti_call_status_alert *alert = (struct tnoti_call_status_alert*)data;
 
-               } break;
-               case TNOTI_CALL_STATUS_ACTIVE: {
-                       struct tnoti_call_status_active *active = (struct tnoti_call_status_active*)data;
+               if (alert->type != CALL_TYPE_VIDEO) {
+                       dbg("[%s][ call status ]: alert (voice call) call_handle[%d]", cp_name, alert->handle);
+                       telephony_call_emit_voice_call_status_alert(call, alert->handle);
+               } else {
+                       dbg("[%s][ call status ]: alert (video call) call_handle[%d]", cp_name, alert->handle);
+                       telephony_call_emit_video_call_status_alert(call, alert->handle);
+               }
+       } break;
 
-                       if ( active->type != CALL_TYPE_VIDEO ) {
-                               dbg("[ check ] call status : active (voice call)");
-                               telephony_call_emit_voice_call_status_active( call, active->id );
-                       } else {
-                               dbg("[ check ] call status : active (video call)");
-                               telephony_call_emit_video_call_status_active( call, active->id );
-                       }
+       case TNOTI_CALL_STATUS_ACTIVE: {
+               struct tnoti_call_status_active *active = (struct tnoti_call_status_active*)data;
 
-               } break;
-               case TNOTI_CALL_STATUS_HELD: {
-                       struct tnoti_call_status_held *held = (struct tnoti_call_status_held*)data;
+               if (active->type != CALL_TYPE_VIDEO) {
+                       dbg("[%s][ call status ]: active (voice call) call_handle[%d]", cp_name, active->handle);
+                       telephony_call_emit_voice_call_status_active(call, active->handle);
+               } else {
+                       dbg("[%s][ call status ]: active (video call) call_handle[%d]", cp_name, active->handle);
+                       telephony_call_emit_video_call_status_active(call, active->handle);
+               }
+       } break;
 
-                       dbg("[ check ] call status : held");
-                       telephony_call_emit_voice_call_status_held( call, held->id );
+       case TNOTI_CALL_STATUS_HELD: {
+               struct tnoti_call_status_held *held = (struct tnoti_call_status_held*)data;
 
-               } break;
-               case TNOTI_CALL_STATUS_INCOMING: {
-                       thread_cb_data *cb_data;
+               dbg("[%s][ call status ]: held, call_handle[%d]", cp_name, held->handle);
+               telephony_call_emit_voice_call_status_held(call, held->handle);
+       } break;
 
-                       dbg("[ check ] call status : incoming");
-                       cb_data = g_try_malloc0(sizeof(thread_cb_data));
+       case TNOTI_CALL_STATUS_INCOMING: {
+               const struct tnoti_call_status_incoming *incoming_data = data;
+#ifdef TIZEN_PLATFORM_ALLOW_LAUNCH_CALLAPP /* do not allow to launch call app. Let call-manager do this */
+               thread_cb_data *cb_data;
 
-                       if (!cb_data){
-                               err("Memory allocation failed");
-                               return FALSE;
-                       }
-                       cb_data->slot_id = get_sim_slot_id_by_cp_name(cp_name);
-                       cb_data->incoming = g_try_malloc0(sizeof(struct tnoti_call_status_incoming));
+               cb_data = g_try_malloc0(sizeof(thread_cb_data));
+               if (!cb_data) {
+                       err("Memory allocation failed");
+                       return FALSE;
+               }
+               cb_data->slot_id = get_sim_slot_id_by_cp_name(cp_name);
+               cb_data->incoming = g_try_malloc0(sizeof(struct tnoti_call_status_incoming));
 
-                       if (!cb_data->incoming){
-                               err("Memory allocation failed");
+               if (!cb_data->incoming) {
+                       err("Memory allocation failed");
+                       g_free(cb_data);
+                       return FALSE;
+               }
+               memcpy(cb_data->incoming, incoming_data, sizeof(struct tnoti_call_status_incoming));
+#endif
+               if (incoming_data->type != CALL_TYPE_VIDEO) {
+                       dbg("[%s][ call status ]: incoming (voice call) call_handle[%d]", cp_name, incoming_data->handle);
+                       telephony_call_emit_voice_call_status_incoming(call,
+                               incoming_data->handle,
+                               incoming_data->cli.mode,
+                               incoming_data->cli.no_cli_cause,
+                               incoming_data->cli.number,
+                               incoming_data->forward,
+                               incoming_data->active_line,
+                               incoming_data->cna.name);
+
+#ifdef TIZEN_PLATFORM_ALLOW_LAUNCH_CALLAPP /* do not allow to launch call app. Let call-manager do this */
+                       if (FALSE == __dispatch_on_new_thread("Voice Call",
+                                       _launch_voice_call, cb_data)) {
+                               err("Failed to launch Voice Call App");
+                               g_free(cb_data->incoming);
                                g_free(cb_data);
-                               return FALSE;
                        }
-                       memcpy(cb_data->incoming, data, sizeof(struct tnoti_call_status_incoming));
-
-                       if ( ((struct tnoti_call_status_incoming *)data)->type != CALL_TYPE_VIDEO ) {
-                               dbg("[ check ] call status : incoming (voice call)");
-                               telephony_call_emit_voice_call_status_incoming( call,
-                                               cb_data->incoming->id,
-                                               cb_data->incoming->cli.mode,
-                                               cb_data->incoming->cli.no_cli_cause,
-                                               cb_data->incoming->cli.number,
-                                               cb_data->incoming->forward,
-                                               cb_data->incoming->active_line,
-                                               cb_data->incoming->cna.name );
-
-                               if (FALSE == __dispatch_on_new_thread("Voice Call", _launch_voice_call, cb_data))       {
-                                       err("Failed to launch Voice Call App");
-                                       g_free(cb_data->incoming);
-                                       g_free(cb_data);
-                               }
-
-                       } else {
-                               dbg("[ check ] call status : incoming (video call)");
-                               telephony_call_emit_video_call_status_incoming( call, ((struct tnoti_call_status_incoming *)data)->id );
-
-                               if (FALSE == __dispatch_on_new_thread("Video Call", _launch_video_call, cb_data)) {
-                                       err("Failed to launch Video call App");
-                                       g_free(cb_data->incoming);
-                                       g_free(cb_data);
-                               }
+#endif
+               } else {
+                       dbg("[%s][ call status ]: incoming (video call) call_handle[%d]", cp_name, incoming_data->handle);
+                       telephony_call_emit_video_call_status_incoming(call,
+                               incoming_data->handle,
+                               incoming_data->cli.mode,
+                               incoming_data->cli.no_cli_cause,
+                               incoming_data->cli.number,
+                               incoming_data->forward,
+                               incoming_data->active_line,
+                               incoming_data->cna.name);
+
+#ifdef TIZEN_PLATFORM_ALLOW_LAUNCH_CALLAPP /* do not allow to launch call app. Let call-manager do this */
+                       if (FALSE == __dispatch_on_new_thread("Video Call",
+                                       _launch_video_call, cb_data)) {
+                               err("Failed to launch Video call App");
+                               g_free(cb_data->incoming);
+                               g_free(cb_data);
                        }
-               } break;
-
-               case TNOTI_CALL_INFO_WAITING: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_WAITING : (%d)", *id);
-                       telephony_call_emit_waiting( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_FORWARDED: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_FORWARDED : (%d)", *id);
-                       telephony_call_emit_forwarded( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_FORWARDED_CALL: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_FORWARDED_CALL : (%d)", *id);
-                       telephony_call_emit_forwarded_call( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_BARRED_INCOMING: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_BARRED_INCOMING : (%d)", *id);
-                       telephony_call_emit_barred_incoming( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_BARRED_OUTGOING: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_BARRED_OUTGOING : (%d)", *id);
-                       telephony_call_emit_barred_outgoing( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_FORWARD_CONDITIONAL: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_FORWARD_CONDITIONAL : (%d)", *id);
-                       telephony_call_emit_forward_conditional( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_FORWARD_UNCONDITIONAL: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_FORWARD_UNCONDITIONAL : (%d)", *id);
-                       telephony_call_emit_forward_unconditional( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_HELD: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_HELD : (%d)", *id);
-                       telephony_call_emit_call_held( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_ACTIVE: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_ACTIVE : (%d)", *id);
-                       telephony_call_emit_call_active( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_JOINED: {
-                       int *id = (int*)data;
-
-                       dbg("[ check ] TNOTI_CALL_INFO_JOINED : (%d)", *id);
-                       telephony_call_emit_call_joined( call, (gint)*id );
-
-               } break;
-
-               case TNOTI_CALL_INFO_PRIVACY_MODE: {
-                       struct tnoti_call_info_voice_privacy_mode *privacy_info = (struct tnoti_call_info_voice_privacy_mode*)data;
+#endif
+               }
+       } break;
 
-                       dbg("[ check ] TNOTI_CALL_INFO_PRIVACY_MODE : privacy mode ", privacy_info->privacy_mode);
-                       telephony_call_emit_call_privacy_mode( call, privacy_info->privacy_mode );
+       case TNOTI_CALL_INFO_WAITING: {
+               int *id = (int*)data;
 
-               } break;
+               dbg("[%s] CALL_INFO_WAITING : (%d)", cp_name, *id);
+               telephony_call_emit_waiting(call, (gint)*id);
+       } break;
 
-               case TNOTI_CALL_OTASP_STATUS: {
-                       struct tnoti_call_otasp_status  *otasp = (struct tnoti_call_otasp_status *)data;
+       case TNOTI_CALL_INFO_FORWARDED: {
+               int *id = (int*)data;
 
-                       dbg("[ check ] TNOTI_CALL_OTASP_STATUS : (%d)", otasp->otasp_status);
-                       telephony_call_emit_call_otasp_status( call, otasp->otasp_status );
+               dbg("[%s] CALL_INFO_FORWARDED : (%d)", cp_name, *id);
+               telephony_call_emit_forwarded(call, (gint)*id);
+       } break;
 
-               } break;
+       case TNOTI_CALL_INFO_FORWARDED_CALL: {
+               int *id = (int*)data;
 
-               case TNOTI_CALL_OTAPA_STATUS: {
-                       struct tnoti_call_otapa_status  *otapa = (struct tnoti_call_otapa_status *)data;
+               dbg("[%s] CALL_INFO_FORWARDED_CALL : (%d)", cp_name, *id);
+               telephony_call_emit_forwarded_call(call, (gint)*id);
+       } break;
 
-                       dbg("[ check ] TNOTI_CALL_OTAPA_STATUS : (%d)", otapa->otapa_status);
-                       telephony_call_emit_call_otapa_status( call, otapa->otapa_status );
+       case TNOTI_CALL_INFO_BARRED_INCOMING: {
+               int *id = (int*)data;
 
-               } break;
+               dbg("[%s] CALL_INFO_BARRED_INCOMING : (%d)", cp_name, *id);
+               telephony_call_emit_barred_incoming(call, (gint)*id);
+       } break;
 
-               case TNOTI_CALL_SIGNAL_INFO: {
+       case TNOTI_CALL_INFO_BARRED_OUTGOING: {
+               int *id = (int*)data;
 
-                       struct tnoti_call_signal_info *sig_info = (struct tnoti_call_signal_info *)data;
-                       unsigned int signal;
-                       if (sig_info->signal_type == CALL_SIGNAL_TYPE_TONE) {
-                               signal = sig_info->signal.sig_tone_type;
-                       } else if(sig_info->signal_type == CALL_SIGNAL_TYPE_ISDN_ALERTING) {
-                               signal = sig_info->signal.sig_isdn_alert_type;
-                       } else if(sig_info->signal_type == CALL_SIGNAL_TYPE_IS54B_ALERTING) {
-                               signal = sig_info->signal.sig_is54b_alert_type;
-                       } else {
-                               err("Unknown Signal type");
-                               return FALSE;
-                       }
-                       dbg("[ check ] TNOTI_CALL_SIGNAL_INFO : Signal type (%d), Pitch type (%d), Signal %d", sig_info->signal_type, sig_info->pitch_type, signal);
-                       telephony_call_emit_call_signal_info( call, sig_info->signal_type, sig_info->pitch_type, signal);
-
-               } break;
-
-               case TNOTI_CALL_INFO_REC: {
-                               struct tnoti_call_info_rec *noti = (struct tnoti_call_info_rec *)data;
-                               gchar *param = NULL;
-                               if (noti->rec_info.type == CALL_REC_NAME_INFO) {
-                                       param = g_strdup(noti->rec_info.data.name);
-                               } else if (noti->rec_info.type == CALL_REC_NUMBER_INFO) {
-                                       param = g_strdup(noti->rec_info.data.number);
-                               } else {
-                                       err("Unknown rec info type (%d)", noti->rec_info.type);
-                                       return FALSE;
-                               }
-                               dbg("[ check ] TNOTI_CALL_INFO_REC : id:(%d) type:(%d), param:(%s)",
-                                       noti->rec_info.id, noti->rec_info.type, param);
-                               telephony_call_emit_call_info_rec( call, noti->rec_info.id, noti->rec_info.type, param);
-                               g_free(param);
-                       } break;
+               dbg("[%s] CALL_INFO_BARRED_OUTGOING : (%d)", cp_name, *id);
+               telephony_call_emit_barred_outgoing(call, (gint)*id);
+       } break;
 
-               case TNOTI_CALL_SOUND_PATH: {
-                       struct tnoti_call_sound_path *noti = (struct tnoti_call_sound_path*)data;
-                       telephony_call_emit_call_sound_path( call, noti->path );
+       case TNOTI_CALL_INFO_FORWARD_CONDITIONAL: {
+               int *id = (int*)data;
 
+               dbg("[%s] CALL_INFO_FORWARD_CONDITIONAL : (%d)", cp_name, *id);
+               telephony_call_emit_forward_conditional(call, (gint)*id);
+       } break;
 
-               } break;
+       case TNOTI_CALL_INFO_FORWARD_UNCONDITIONAL: {
+               int *id = (int*)data;
 
-               case TNOTI_CALL_SOUND_RINGBACK_TONE: {
-                       struct tnoti_call_sound_ringback_tone *noti = (struct tnoti_call_sound_ringback_tone*)data;
-                       telephony_call_emit_call_sound_ringback_tone( call, (gint)noti->status );
+               dbg("[%s] CALL_INFO_FORWARD_UNCONDITIONAL : (%d)", cp_name, *id);
+               telephony_call_emit_forward_unconditional(call, (gint)*id);
+       } break;
 
-               } break;
+       case TNOTI_CALL_INFO_HELD: {
+               int *id = (int*)data;
 
-               case TNOTI_CALL_SOUND_WBAMR: {
-                       struct tnoti_call_sound_wbamr *noti = (struct tnoti_call_sound_wbamr*)data;
-                       telephony_call_emit_call_sound_wbamr( call, (gint)noti->status );
+               dbg("[%s] CALL_INFO_HELD : (%d)", cp_name, *id);
+               telephony_call_emit_call_held(call, (gint)*id);
+       } break;
 
-               } break;
+       case TNOTI_CALL_INFO_ACTIVE: {
+               int *id = (int*)data;
 
-               case TNOTI_CALL_SOUND_EQUALIZATION: {
-                       struct tnoti_call_sound_equalization *noti = (struct tnoti_call_sound_equalization*)data;
-                       telephony_call_emit_call_sound_equalization( call, (gint)noti->mode, (gint)noti->direction );
+               dbg("[%s] CALL_INFO_ACTIVE : (%d)", cp_name, *id);
+               telephony_call_emit_call_active(call, (gint)*id);
+       } break;
 
-               } break;
+       case TNOTI_CALL_INFO_JOINED: {
+               int *id = (int*)data;
 
-               case TNOTI_CALL_SOUND_NOISE_REDUCTION: {
-                       struct tnoti_call_sound_noise_reduction *noti = (struct tnoti_call_sound_noise_reduction*)data;
-                       telephony_call_emit_call_sound_noise_reduction( call, (gint)noti->status );
+               dbg("[%s] CALL_INFO_JOINED : (%d)", cp_name, *id);
+               telephony_call_emit_call_joined(call, (gint)*id);
+       } break;
 
-               } break;
+       case TNOTI_CALL_INFO_PRIVACY_MODE: {
+               struct tnoti_call_info_voice_privacy_mode *privacy_info = (struct tnoti_call_info_voice_privacy_mode*)data;
 
-               case TNOTI_CALL_SOUND_CLOCK_STATUS: {
-                       struct tnoti_call_sound_clock_status *noti = (struct tnoti_call_sound_clock_status*)data;
-                       telephony_call_emit_call_sound_clock_status( call, noti->status );
+               dbg("[%s] CALL_INFO_PRIVACY_MODE : privacy mode(%d) ", cp_name, privacy_info->privacy_mode);
+               telephony_call_emit_call_privacy_mode(call, privacy_info->privacy_mode);
+       } break;
 
-               } break;
+       case TNOTI_CALL_OTASP_STATUS: {
+               struct tnoti_call_otasp_status  *otasp = (struct tnoti_call_otasp_status *)data;
 
-               case TNOTI_CALL_PREFERRED_VOICE_SUBSCRIPTION: {
-                       struct tnoti_call_preferred_voice_subscription *noti = (struct tnoti_call_preferred_voice_subscription*)data;
-                       telephony_call_emit_call_preferred_voice_subscription( call, noti->preferred_subs );
+               dbg("[%s] CALL_OTASP_STATUS : status(%d)", cp_name, otasp->otasp_status);
+               telephony_call_emit_call_otasp_status(call, otasp->otasp_status);
+       } break;
 
-               } break;
+       case TNOTI_CALL_OTAPA_STATUS: {
+               struct tnoti_call_otapa_status  *otapa = (struct tnoti_call_otapa_status *)data;
 
-               case TNOTI_CALL_MODIFY_REQUEST: {
-                       const struct tnoti_call_modify_request *noti = data;
-                       telephony_call_emit_call_modify_request(call, noti->id, noti->call_type);
-               } break;
+               dbg("[%s] CALL_OTAPA_STATUS : status(%d)", cp_name, otapa->otapa_status);
+               telephony_call_emit_call_otapa_status(call, otapa->otapa_status);
+       } break;
 
-               default:
-                       dbg("not handled command[%d]", command);
-               break;
+       case TNOTI_CALL_SIGNAL_INFO: {
+               struct tnoti_call_signal_info *sig_info = (struct tnoti_call_signal_info *)data;
+               unsigned int signal;
+               if (sig_info->signal_type == CALL_SIGNAL_TYPE_TONE) {
+                       signal = sig_info->signal.sig_tone_type;
+               } else if (sig_info->signal_type == CALL_SIGNAL_TYPE_ISDN_ALERTING) {
+                       signal = sig_info->signal.sig_isdn_alert_type;
+               } else if (sig_info->signal_type == CALL_SIGNAL_TYPE_IS54B_ALERTING) {
+                       signal = sig_info->signal.sig_is54b_alert_type;
+               } else {
+                       err("Unknown Signal type");
+                       return FALSE;
+               }
+               dbg("[%s] CALL_SIGNAL_INFO : Signal type (%d), Pitch type (%d), Signal (%d)",
+                       cp_name, sig_info->signal_type, sig_info->pitch_type, signal);
+               telephony_call_emit_call_signal_info(call, sig_info->signal_type, sig_info->pitch_type, signal);
+       } break;
+
+       case TNOTI_CALL_INFO_REC: {
+               struct tnoti_call_info_rec *noti = (struct tnoti_call_info_rec *)data;
+               gchar *param = NULL;
+               if (noti->rec_info.type == CALL_REC_NAME_INFO) {
+                       param = g_strdup(noti->rec_info.data.name);
+               } else if (noti->rec_info.type == CALL_REC_NUMBER_INFO) {
+                       param = g_strdup(noti->rec_info.data.number);
+               } else {
+                       err("Unknown rec info type (%d)", noti->rec_info.type);
+                       return FALSE;
+               }
+               dbg("[%s] CALL_INFO_REC : id:(%d) type:(%d), param:(%s)",
+                       cp_name, noti->rec_info.handle, noti->rec_info.type, param);
+               telephony_call_emit_call_info_rec(call, noti->rec_info.handle, noti->rec_info.type, param);
+               g_free(param);
+       } break;
+
+       case TNOTI_CALL_SOUND_PATH: {
+               struct tnoti_call_sound_path *noti = (struct tnoti_call_sound_path*)data;
+               telephony_call_emit_call_sound_path(call, noti->path);
+       } break;
+
+       case TNOTI_CALL_SOUND_RINGBACK_TONE: {
+               struct tnoti_call_sound_ringback_tone *noti = (struct tnoti_call_sound_ringback_tone*)data;
+               telephony_call_emit_call_sound_ringback_tone(call, (gint)noti->status);
+       } break;
+
+       case TNOTI_CALL_SOUND_WBAMR: {
+               struct tnoti_call_sound_wbamr *noti = (struct tnoti_call_sound_wbamr*)data;
+               telephony_call_emit_call_sound_wbamr(call, (gint)noti->status);
+       } break;
+
+       case TNOTI_CALL_SOUND_EQUALIZATION: {
+               struct tnoti_call_sound_equalization *noti = (struct tnoti_call_sound_equalization*)data;
+               telephony_call_emit_call_sound_equalization(call, (gint)noti->mode, (gint)noti->direction);
+       } break;
+
+       case TNOTI_CALL_SOUND_NOISE_REDUCTION: {
+               struct tnoti_call_sound_noise_reduction *noti = (struct tnoti_call_sound_noise_reduction*)data;
+               telephony_call_emit_call_sound_noise_reduction(call, (gint)noti->status);
+       } break;
+
+       case TNOTI_CALL_SOUND_CLOCK_STATUS: {
+               struct tnoti_call_sound_clock_status *noti = (struct tnoti_call_sound_clock_status*)data;
+               telephony_call_emit_call_sound_clock_status(call, noti->status);
+       } break;
+
+       case TNOTI_CALL_PREFERRED_VOICE_SUBSCRIPTION: {
+               struct tnoti_call_preferred_voice_subscription *noti = (struct tnoti_call_preferred_voice_subscription*)data;
+               telephony_call_emit_call_preferred_voice_subscription(call, noti->preferred_subs);
+       } break;
+
+       case TNOTI_CALL_MODIFY_REQUEST: {
+               const struct tnoti_call_modify_request *noti = data;
+               telephony_call_emit_call_modify_request(call, noti->handle, noti->call_type);
+       } break;
+
+       case TNOTI_CALL_INFO_FALLBACK:{
+               struct tnoti_call_fallback* noti = (struct tnoti_call_fallback*)data;
+               telephony_call_emit_call_fallback(call, noti->handle, noti->fallback_to);
+       } break;
+
+       default:
+               dbg("not handled command[%d]", command);
+       break;
        }
 
        return TRUE;
 }
-
old mode 100755 (executable)
new mode 100644 (file)
index 6d35c7a..0e66b9a
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <dbus/dbus.h>
 
 #include <tcore.h>
 #include <plugin.h>
@@ -59,9 +58,8 @@ char *dbus_plugin_get_cp_name_by_object_path(const char *object_path)
        if (!object_path)
                return NULL;
 
-       if (!g_str_has_prefix(object_path, MY_DBUS_PATH)) {
+       if (!g_str_has_prefix(object_path, MY_DBUS_PATH))
                return NULL;
-       }
 
        return (char *)object_path + strlen(MY_DBUS_PATH) + 1;
 }
@@ -73,11 +71,13 @@ UserRequest *dbus_plugin_macro_user_request_new(struct custom_data *ctx, void *o
        struct dbus_request_info *dbus_info;
 
        cp_name = GET_CP_NAME(invocation);
-       dbg("cp_name = [%s]", cp_name);
 
        ur = tcore_user_request_new(ctx->comm, cp_name);
 
        dbus_info = calloc(1, sizeof(struct dbus_request_info));
+       if (!dbus_info)
+               return NULL;
+
        dbus_info->interface_object = object;
        dbus_info->invocation = invocation;
 
@@ -87,7 +87,7 @@ UserRequest *dbus_plugin_macro_user_request_new(struct custom_data *ctx, void *o
        return ur;
 }
 
-gboolean check_access_control (cynara *p_cynara, GDBusMethodInvocation *invoc, const char *label, const char *perm)
+gboolean check_access_control(cynara *p_cynara, GDBusMethodInvocation *invoc, const char *label, const char *perm)
 {
        GDBusConnection *conn;
        const char *sender_unique_name;
@@ -101,62 +101,60 @@ gboolean check_access_control (cynara *p_cynara, GDBusMethodInvocation *invoc, c
        const char *privilege = NULL;
 
        if (!p_cynara) {
-               warn ("access control denied (fail to get cynara handle)");
+               warn("access control denied (fail to get cynara handle)");
                goto OUT;
        }
 
-       conn = g_dbus_method_invocation_get_connection (invoc);
+       conn = g_dbus_method_invocation_get_connection(invoc);
        if (!conn) {
-               warn ("access control denied (no connection info)");
+               warn("access control denied (no connection info)");
                goto OUT;
        }
 
-       sender_unique_name = g_dbus_method_invocation_get_sender (invoc);
+       sender_unique_name = g_dbus_method_invocation_get_sender(invoc);
 
        /* Get PID */
        ret = cynara_creds_gdbus_get_pid(conn, sender_unique_name, &pid);
        if (ret != CYNARA_API_SUCCESS) {
-               warn ("access control denied (fail to get pid). ret = %d", ret);
+               warn("access control denied (fail to get pid). ret = %d", ret);
                goto OUT;
        }
 
        /* Get UID */
        ret = cynara_creds_gdbus_get_user(conn, sender_unique_name, USER_METHOD_DEFAULT, &uid_string);
        if (ret != CYNARA_API_SUCCESS) {
-               warn ("access control denied (fail to get uid for cynara). ret = %d", ret);
+               warn("access control denied (fail to get uid for cynara). ret = %d", ret);
                goto OUT;
        }
 
        /* Get Smack label */
        ret = cynara_creds_gdbus_get_client(conn, sender_unique_name, CLIENT_METHOD_DEFAULT, &client_smack);
        if (ret != CYNARA_API_SUCCESS) {
-               warn ("access control denied (fail to get smack for cynara). ret = %d", ret);
+               warn("access control denied (fail to get smack for cynara). ret = %d", ret);
                goto OUT;
        }
 
-       dbg ("sender: %s pid = %u uid = %s smack = %s", sender_unique_name, pid, uid_string, client_smack);
+       dbg("sender: %s pid = %u uid = %s smack = %s", sender_unique_name, pid, uid_string, client_smack);
 
        client_session = cynara_session_from_pid(pid);
        if (!client_session) {
-               warn ("access control denied (fail to get cynara client session)");
+               warn("access control denied (fail to get cynara client session)");
                goto OUT;
        }
 
-       if (g_strrstr(perm, PERM_WRITE) == NULL && g_strrstr(perm, PERM_EXECUTE) == NULL) {
+       if (g_strrstr(perm, PERM_WRITE) == NULL && g_strrstr(perm, PERM_EXECUTE) == NULL)
                privilege = TELEPHONY_PRIVILEGE;
-       } else {
+       else
                privilege = TELEPHONY_ADMIN_PRIVILEGE;
-       }
 
        ret = cynara_check(p_cynara, client_smack, client_session, uid_string, privilege);
-       if (ret != CYNARA_API_ACCESS_ALLOWED) {
-               warn ("pid(%u) access (%s - %s) denied(%d)", pid, label, perm, ret);
-       }
+       if (ret != CYNARA_API_ACCESS_ALLOWED)
+               warn("pid(%u) access (%s - %s) denied(%d)", pid, label, perm, ret);
        else
                result = TRUE;
 OUT:
        if (result == FALSE) {
-               g_dbus_method_invocation_return_error (invoc,
+               g_dbus_method_invocation_return_error(invoc,
                                G_DBUS_ERROR,
                                G_DBUS_ERROR_ACCESS_DENIED,
                                "No access rights");
@@ -170,13 +168,12 @@ OUT:
 
 enum dbus_tapi_sim_slot_id get_sim_slot_id_by_cp_name(char *cp_name)
 {
-       if(g_str_has_suffix(cp_name , "0")){
+       if (g_str_has_suffix(cp_name , "0"))
                return SIM_SLOT_PRIMARY;
-       } else if (g_str_has_suffix(cp_name , "1")){
+       else if (g_str_has_suffix(cp_name , "1"))
                return SIM_SLOT_SECONDARY;
-       } else if(g_str_has_suffix(cp_name , "2")){
+       else if (g_str_has_suffix(cp_name , "2"))
                return SIM_SLOT_TERTIARY;
-       }
        return SIM_SLOT_PRIMARY;
 }
 
@@ -195,7 +192,7 @@ gboolean dbus_plugin_util_load_xml(char *docname, char *groupname, void **i_doc,
                        if (0 == xmlStrcmp((*root_node)->name, (const xmlChar *) groupname)) {
                                *root_node = (*root_node)->xmlChildrenNode;
                                return TRUE;
-                       } 
+                       }
                        *root_node = NULL;
                }
        }
old mode 100755 (executable)
new mode 100644 (file)
index fc8609f..c085818
 #include "generated-code.h"
 #include "common.h"
 
+static void initialize_properties(CoreObject *source,
+       TelephonyObjectSkeleton *object)
+{
+       TelephonyNetwork *network;
+       TelephonyModem *modem;
+       TelephonySim *sim;
+
+       if (!object) {
+               err("object is NULL");
+               return;
+       }
+
+       /* initialize network dbus properties */
+       network = telephony_object_peek_network(TELEPHONY_OBJECT(object));
+       if (network == NULL) {
+               err("Network object is NULL!!!");
+       } else {
+               telephony_network_set_access_technology(network, NETWORK_ACT_UNKNOWN);
+               telephony_network_set_cell_id(network, 0);
+               telephony_network_set_ims_voice_status(network, NETWORK_IMS_VOICE_UNKNOWN);
+               telephony_network_set_circuit_status(network, NETWORK_SERVICE_DOMAIN_STATUS_NO);
+               telephony_network_set_lac(network, 0);
+               telephony_network_set_name_option(network, NETWORK_NAME_OPTION_NONE);
+               telephony_network_set_packet_status(network, NETWORK_SERVICE_DOMAIN_STATUS_NO);
+               telephony_network_set_sig_dbm(network, 0);
+               telephony_network_set_roaming_status(network, FALSE);
+               telephony_network_set_ps_type(network, TELEPHONY_HSDPA_OFF);
+               telephony_network_set_service_type(network, NETWORK_SERVICE_TYPE_UNKNOWN);
+               telephony_network_set_sig_level(network, 0);
+               telephony_network_set_plmn(network, NULL);
+               telephony_network_set_spn_name(network, NULL);
+               telephony_network_set_network_name(network, NULL);
+       }
+
+       /* initialize modem dbus properties */
+       modem = telephony_object_peek_modem(TELEPHONY_OBJECT(object));
+       if (modem == NULL) {
+               err("Modem object is NULL!!!");
+       } else {
+               telephony_modem_set_dongle_status(modem, 0);
+               telephony_modem_set_dongle_login(modem, 0);
+               telephony_modem_set_power(modem, MODEM_STATE_UNKNOWN);
+       }
+
+       /* initialize sim dbus properties */
+       sim = telephony_object_peek_sim(TELEPHONY_OBJECT(object));
+       if (sim == NULL)
+               err("Sim object is NULL!!!");
+       else
+               telephony_sim_set_cf_state(sim, FALSE);
+}
+
 static void add_modem(struct custom_data *ctx, TcorePlugin *p)
 {
        TelephonyObjectSkeleton *object;
@@ -55,8 +107,6 @@ static void add_modem(struct custom_data *ctx, TcorePlugin *p)
        GSList *co_list;
        const char *cp_name;
 
-       dbg("Entry");
-
        /* Get CP Name */
        cp_name = tcore_server_get_cp_name_by_plugin(p);
        if (cp_name == NULL) {
@@ -65,16 +115,20 @@ static void add_modem(struct custom_data *ctx, TcorePlugin *p)
        }
 
        path = g_strdup_printf("%s/%s", MY_DBUS_PATH, cp_name);
-       dbg("PATH: [%s]", path);
 
        object = g_hash_table_lookup(ctx->objects, path);
        if (object) {
-               dbg("DBUS interface object already created (object: %p)", object);
+               dbg("DBUS interface object(%p) already created (path: %s)", object, path);
                goto OUT;
        }
 
        object = telephony_object_skeleton_new(path);
-       dbg("New DBUS object created (object: [%p])", object);
+       if (object == NULL) {
+               err("New DBUS object is NULL");
+               goto OUT;
+       }
+
+       info("New DBUS object(%p) created (path: %s)", object, path);
        g_hash_table_insert(ctx->objects, g_strdup(path), object);
 
        /* Add interfaces */
@@ -139,7 +193,7 @@ static void add_modem(struct custom_data *ctx, TcorePlugin *p)
        }
        dbus_plugin_setup_oem_interface(object, ctx);
        /* Export the Object to Manager */
-       g_dbus_object_manager_server_export (ctx->manager, G_DBUS_OBJECT_SKELETON (object));
+       g_dbus_object_manager_server_export(ctx->manager, G_DBUS_OBJECT_SKELETON(object));
 
 
 OUT:
@@ -178,80 +232,78 @@ static TReturn send_response(Communicator *comm, UserRequest *ur, enum tcore_res
        struct dbus_request_info *dbus_info;
        gboolean ret = FALSE;
 
-       dbg("Response Command = [0x%x], data_len = %d", command, data_len);
-
-
        ctx = tcore_communicator_ref_user_data(comm);
        if (!ctx) {
-               dbg("user_data is NULL");
+               err("user_data is NULL");
                return TCORE_RETURN_EINVAL;
        }
 
        dbus_info = (struct dbus_request_info *)tcore_user_request_ref_user_info(ur);
        if (!dbus_info) {
-               dbg("dbus_info is NULL");
+               err("dbus_info is NULL");
                return TCORE_RETURN_EINVAL;
        }
 
        if (!data) {
-               g_dbus_method_invocation_return_error (dbus_info->invocation,
-                               G_DBUS_ERROR,
-                               G_DBUS_ERROR_FAILED,
-                               "Request failed");
+               err("data is NULL");
+               g_dbus_method_invocation_return_error(dbus_info->invocation,
+                       G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Request failed");
                return TCORE_RETURN_SUCCESS;
        }
 
+       dbg("cmd[0x%x] len[%d]", command, data_len);
+
        switch (command & (TCORE_RESPONSE | 0x0FF00000)) {
-               case TRESP_CALL:
-                       ret = dbus_plugin_call_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_CALL:
+               ret = dbus_plugin_call_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_SS:
-                       ret = dbus_plugin_ss_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_SS:
+               ret = dbus_plugin_ss_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_PS:
-                       break;
+       case TRESP_PS:
+               break;
 
-               case TRESP_SIM:
-                       ret = dbus_plugin_sim_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_SIM:
+               ret = dbus_plugin_sim_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_SAP:
-                       ret = dbus_plugin_sap_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_SAP:
+               ret = dbus_plugin_sap_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_PHONEBOOK:
-                       ret = dbus_plugin_phonebook_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_PHONEBOOK:
+               ret = dbus_plugin_phonebook_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_MODEM:
-                       ret = dbus_plugin_modem_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_MODEM:
+               ret = dbus_plugin_modem_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_SMS:
-                       ret = dbus_plugin_sms_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_SMS:
+               ret = dbus_plugin_sms_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_SAT:
-                       ret = dbus_plugin_sat_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_SAT:
+               ret = dbus_plugin_sat_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_CUSTOM:
-                       ret = dbus_plugin_oem_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_CUSTOM:
+               ret = dbus_plugin_oem_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_NETWORK:
-                       ret = dbus_plugin_network_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_NETWORK:
+               ret = dbus_plugin_network_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               case TRESP_GPS:
-                       ret = dbus_plugin_gps_response(ctx, ur, dbus_info, command, data_len, data);
-                       break;
+       case TRESP_GPS:
+               ret = dbus_plugin_gps_response(ctx, ur, dbus_info, command, data_len, data);
+               break;
 
-               default:
-                       warn("unknown command (0x%x)", command);
-                       break;
+       default:
+               warn("unknown command (0x%x)", command);
+               break;
        }
 
        if (ret == TRUE)
@@ -280,15 +332,15 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
         *      Module notifications
         */
        if (noti == TNOTI_SERVER) {
-               dbg("Server (System) Notification");
+               dbg("Server (System) Notification (0x%x)", command);
 
                switch (command) {
                case TNOTI_SERVER_ADDED_MODEM_PLUGIN: {
                        const char *cp_name;
 
-                       cp_name = tcore_server_get_cp_name_by_plugin((TcorePlugin*)data);
+                       cp_name = tcore_server_get_cp_name_by_plugin((TcorePlugin *)data);
                        dbg("Modem Plug-in (%s) is added... Exporting interfaces for the modem", cp_name);
-                       add_modem(ctx, (TcorePlugin*)data);
+                       add_modem(ctx, (TcorePlugin *)data);
 
                        ret = TRUE;
                        break;
@@ -334,25 +386,58 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
 #endif
                                        }
                                }
-                               dbg("Bus acquired...[%s]", (ctx->name_acquired)?"YES":"NO" );
+                               dbg("Bus acquired...[%s]", (ctx->name_acquired) ? "YES" : "NO");
                        }
                        ret = TRUE;
                        break;
                }
+               case TNOTI_SERVER_REMOVED_MODEM_PLUGIN: {
+                       TcorePlugin *plugin = tcore_communicator_ref_plugin(comm);
+                       TelephonyObjectSkeleton *object;
+                       const char *cp_name;
+                       char *path;
+
+                       dbg("plugin: [%p]", plugin);
+                       cp_name = tcore_server_get_cp_name_by_plugin((TcorePlugin *)data);
+                       if (cp_name == NULL) {
+                               warn("CP name is NULL. cmd:(0x%x)", command);
+                               return TCORE_RETURN_FAILURE;
+                       }
 
+                       path = g_strdup_printf("%s/%s", MY_DBUS_PATH, cp_name);
+
+                       /* Look-up Hash table for Object */
+                       object = g_hash_table_lookup(ctx->objects, path);
+
+                       initialize_properties(source, object);
+
+                       g_free(path);
+                       break;
+               }
+               case TNOTI_SERVER_RUN:
+                       dbg("TNOTI_SERVER_RUN");
+                       break;
+               case TNOTI_SERVER_ADDED_PLUGIN:
+                       dbg("TNOTI_SERVER_ADDED_PLUGIN");
+                       break;
+               case TNOTI_SERVER_ADDED_COMMUNICATOR:
+                       dbg("TNOTI_SERVER_ADDED_COMMUNICATOR");
+                       break;
+               case TNOTI_SERVER_ADDED_HAL:
+                       dbg("TNOTI_SERVER_ADDED_HAL");
+                       break;
                default:
                        warn("Unsupported System notification: (0x%x)", command);
                        break;
                }
-       }
-       else {
+       } else {
                TelephonyObjectSkeleton *object;
                const char *cp_name;
                char *path;
 
                cp_name = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
                if (cp_name == NULL) {
-                       err("CP name is NULL");
+                       warn("CP name is NULL. cmd:(0x%x)", command);
                        return TCORE_RETURN_FAILURE;
                }
 
@@ -361,8 +446,7 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
                /* Look-up Hash table for Object */
                object = g_hash_table_lookup(ctx->objects, path);
 
-               dbg("[%s]:(cmd[0x%x] data[%p] len[%d] obj[%p])",
-                       cp_name, command, data, data_len, object);
+               dbg("[%s]:(cmd[0x%x] len[%d])", cp_name, command, data_len);
 
                g_free(path);
                if (object == NULL) {
@@ -379,8 +463,8 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
                        ret = dbus_plugin_ss_notification(ctx, source, object, command, data_len, data);
                        break;
 
-               case TNOTI_PS:
-                       warn("PS Notification (0x%x)... Not handled!!!", noti);
+               case TNOTI_PS:
+                       /* dbg("PS Notification (0x%x)... Not handled!!!", noti); */
                        break;
 
                case TNOTI_SIM:
@@ -416,12 +500,10 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
                        break;
 
                default:
-                       if ((command & (TCORE_NOTIFICATION | 0x0F000000)) == (TNOTI_CUSTOM)) {
-                               dbg("Custom Notification: [0x%x]", command);
+                       if ((command & (TCORE_NOTIFICATION | 0x0F000000)) == TNOTI_CUSTOM)
                                ret = dbus_plugin_oem_notification(ctx, source, object, command, data_len, data);
-                       } else {
+                       else
                                warn("Unknown/Unhandled Notification: [0x%x]", command);
-                       }
 
                        break;
                }
@@ -435,7 +517,7 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
 
 
 static gboolean
-on_manager_getmodems (TelephonyManager *mgr,
+on_manager_getmodems(TelephonyManager *mgr,
                GDBusMethodInvocation  *invocation,
                gpointer                user_data)
 {
@@ -444,7 +526,6 @@ on_manager_getmodems (TelephonyManager *mgr,
        gchar **list;
        const char *name = NULL;
        int count;
-       dbg("Entry");
 
        cp_name_list = tcore_server_get_cp_name_list(ctx->server);
        if (cp_name_list == NULL) {
@@ -454,6 +535,14 @@ on_manager_getmodems (TelephonyManager *mgr,
 
        count = g_slist_length(cp_name_list);
        list = g_try_malloc0(sizeof(gchar *) * (count+1));
+       if (list == NULL) {
+               err("Failed to allocate list");
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+
+               /* Freeing the received list of CP names */
+               g_slist_free_full(cp_name_list, g_free);
+               return TRUE;
+       }
 
        count = 0;
        for ( ; cp_name_list ; cp_name_list = cp_name_list->next) {
@@ -466,7 +555,7 @@ on_manager_getmodems (TelephonyManager *mgr,
        telephony_manager_complete_get_modems(mgr, invocation, (const gchar **)list);
 
        /* Free memory */
-       for (;count >= 0; count--)
+       for (; count >= 0; count--)
                g_free(list[count]);
 
        g_free(list);
@@ -527,14 +616,14 @@ static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer u
 
        /* Add interface to default object path */
        ctx->mgr = telephony_manager_skeleton_new();
-       g_signal_connect (ctx->mgr,
+       g_signal_connect(ctx->mgr,
                        "handle-get-modems",
-                       G_CALLBACK (on_manager_getmodems),
+                       G_CALLBACK(on_manager_getmodems),
                        ctx); /* user_data */
 
        g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(ctx->mgr), conn, MY_DBUS_PATH, NULL);
 
-       g_dbus_object_manager_server_set_connection (ctx->manager, conn);
+       g_dbus_object_manager_server_set_connection(ctx->manager, conn);
 
        dbg("Aquire DBUS - COMPLETE");
 
@@ -574,9 +663,8 @@ static gboolean on_init(TcorePlugin *p)
        }
 
        data = calloc(1, sizeof(struct custom_data));
-       if (!data) {
+       if (!data)
                return FALSE;
-       }
 
        data->p_cynara = p_cynara;
        data->plugin = p;
@@ -592,7 +680,7 @@ static gboolean on_init(TcorePlugin *p)
 
        dbg("data = %p", data);
 
-       id = g_bus_own_name (G_BUS_TYPE_SYSTEM,
+       id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                        MY_DBUS_SERVICE,
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
                        on_bus_acquired,
@@ -603,7 +691,7 @@ static gboolean on_init(TcorePlugin *p)
        data->owner_id = id;
        dbg("owner id=[%d]", data->owner_id);
 
-       data->manager = g_dbus_object_manager_server_new (MY_DBUS_PATH);
+       data->manager = g_dbus_object_manager_server_new(MY_DBUS_PATH);
        refresh_object(data);
 
        return TRUE;
@@ -630,10 +718,6 @@ static void on_unload(TcorePlugin *p)
        if (!data)
                return;
 
-       if(data->owner_id > 0) {
-               g_bus_unown_name(data->owner_id);
-       }
-
        g_hash_table_destroy(data->objects);
 
        for (list = data->cached_data; list; list = list->next) {
@@ -657,8 +741,7 @@ static void on_unload(TcorePlugin *p)
        tcore_server_remove_communicator(s, comm);
 }
 
-EXPORT_API struct tcore_plugin_define_desc plugin_define_desc =
-{
+EXPORT_API struct tcore_plugin_define_desc plugin_define_desc = {
        .name = "NEW_DBUS_COMMUNICATOR",
        .priority = TCORE_PLUGIN_PRIORITY_HIGH,
        .version = PLUGIN_VERSION,
old mode 100755 (executable)
new mode 100644 (file)
index 5568ddc..72d7029
--- a/src/gps.c
+++ b/src/gps.c
@@ -23,7 +23,7 @@
 #include "common.h"
 
 static gboolean
-on_gps_set_frequency_aiding (TelephonyGps *gps,
+on_gps_set_frequency_aiding(TelephonyGps *gps,
                GDBusMethodInvocation *invocation,
                guchar data,
                gpointer user_data)
@@ -31,19 +31,19 @@ on_gps_set_frequency_aiding (TelephonyGps *gps,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_GPS, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_GPS, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, gps, invocation);
-       dbg("data=%d",data);
+       dbg("data=%d", data);
 
        tcore_user_request_set_data(ur, sizeof(data), (const char*)&data);
        tcore_user_request_set_command(ur, TREQ_GPS_SET_FREQUENCY_AIDING);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -51,7 +51,7 @@ on_gps_set_frequency_aiding (TelephonyGps *gps,
 }
 
 static gboolean
-on_gps_confirm_measure_pos (TelephonyGps *gps,
+on_gps_confirm_measure_pos(TelephonyGps *gps,
                GDBusMethodInvocation *invocation,
                const gchar *data,
                gpointer user_data)
@@ -62,9 +62,9 @@ on_gps_confirm_measure_pos (TelephonyGps *gps,
        gboolean result = TRUE;
        guchar *decoded_data = NULL;
        gsize length;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_GPS, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_GPS, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, gps, invocation);
@@ -75,7 +75,7 @@ on_gps_confirm_measure_pos (TelephonyGps *gps,
        tcore_user_request_set_command(ur, TREQ_GPS_CONFIRM_MEASURE_POS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
                g_free(decoded_data);
                return TRUE;
@@ -95,9 +95,9 @@ on_enable_smart_assistant(TelephonyGps *gps,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_GPS, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_GPS, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, gps, invocation);
@@ -105,7 +105,7 @@ on_enable_smart_assistant(TelephonyGps *gps,
        tcore_user_request_set_command(ur, TREQ_ENABLE_SMART_ASSISTANT);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -120,9 +120,9 @@ on_disable_smart_assistant(TelephonyGps *gps,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_GPS, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_GPS, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, gps, invocation);
@@ -130,7 +130,7 @@ on_disable_smart_assistant(TelephonyGps *gps,
        tcore_user_request_set_command(ur, TREQ_DISABLE_SMART_ASSISTANT);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -148,7 +148,7 @@ on_sync_smart_assistant_area_list(TelephonyGps *gps,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        GVariantIter *iter = NULL;
        GVariant *b = NULL;
@@ -156,11 +156,11 @@ on_sync_smart_assistant_area_list(TelephonyGps *gps,
        gint item1, item2;
        dbg("enter count=%d", count);
 
-       if (!check_access_control (p_cynara, invocation, AC_GPS, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_GPS, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, gps, invocation);
-       memset(&req,0,sizeof(struct tel_smart_assistant_area_list));
+       memset(&req, 0, sizeof(struct tel_smart_assistant_area_list));
 
        dbg("count=%d", count);
        if (count > SMART_ASSISTANT_AREA_LIST_MAX)
@@ -168,11 +168,11 @@ on_sync_smart_assistant_area_list(TelephonyGps *gps,
 
        req.count = count;
 
-       g_variant_get (gv, "v", &b);
-       g_variant_unref (gv);
+       g_variant_get(gv, "v", &b);
+       g_variant_unref(gv);
 
-       g_variant_get (b, "a(ii)", &iter);
-       while(g_variant_iter_loop(iter,"(ii)",&item1, &item2)){
+       g_variant_get(b, "a(ii)", &iter);
+       while (g_variant_iter_loop(iter, "(ii)", &item1, &item2)) {
                req.area[i].index = item1;
                req.area[i].mode_state = item2;
                i++;
@@ -185,7 +185,7 @@ on_sync_smart_assistant_area_list(TelephonyGps *gps,
        tcore_user_request_set_command(ur, TREQ_SYNC_SMART_ASSISTANT_AREA_LIST);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -203,18 +203,18 @@ on_del_smart_assistant_area_list(TelephonyGps *gps,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        GVariantIter *iter = NULL;
        GVariant *b = NULL;
        int i = 0;
        gint item1, item2;
 
-       if (!check_access_control (p_cynara, invocation, AC_GPS, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_GPS, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, gps, invocation);
-       memset(&req,0,sizeof(struct tel_smart_assistant_area_list));
+       memset(&req, 0, sizeof(struct tel_smart_assistant_area_list));
 
        dbg("count=%d", count);
        if (count > SMART_ASSISTANT_AREA_LIST_MAX)
@@ -222,11 +222,11 @@ on_del_smart_assistant_area_list(TelephonyGps *gps,
 
        req.count = count;
 
-       g_variant_get (gv, "v", &b);
-       g_variant_unref (gv);
+       g_variant_get(gv, "v", &b);
+       g_variant_unref(gv);
 
-       g_variant_get (b, "a(ii)", &iter);
-       while(g_variant_iter_loop(iter,"(ii)",&item1, &item2)){
+       g_variant_get(b, "a(ii)", &iter);
+       while (g_variant_iter_loop(iter, "(ii)", &item1, &item2)) {
                req.area[i].index = item1;
                req.area[i].mode_state = item2;
                i++;
@@ -239,7 +239,7 @@ on_del_smart_assistant_area_list(TelephonyGps *gps,
        tcore_user_request_set_command(ur, TREQ_DEL_SMART_ASSISTANT_AREA_LIST);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -257,21 +257,21 @@ on_add_smart_assistant_area(TelephonyGps *gps,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_GPS, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_GPS, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, gps, invocation);
        req.index = fn_index;
        req.mode_state = mode_state;
-       dbg("index=%d, mode_state=%d",req.index, req.mode_state);
+       dbg("index=%d, mode_state=%d", req.index, req.mode_state);
 
        tcore_user_request_set_data(ur, sizeof(struct tel_smart_assistant_area), &req);
        tcore_user_request_set_command(ur, TREQ_ADD_SMART_ASSISTANT_AREA);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -288,21 +288,21 @@ on_modify_smart_assistant_area(TelephonyGps *gps,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_GPS, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_GPS, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, gps, invocation);
        req.index = fn_index;
        req.mode_state = mode_state;
-       dbg("index=%d, mode_state=%d",req.index, req.mode_state);
+       dbg("index=%d, mode_state=%d", req.index, req.mode_state);
 
        tcore_user_request_set_data(ur, sizeof(struct tel_smart_assistant_area), &req);
        tcore_user_request_set_command(ur, TREQ_MODIFY_SMART_ASSISTANT_AREA);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -320,21 +320,21 @@ on_set_smart_assistant_info(TelephonyGps *gps,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_GPS, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_GPS, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, gps, invocation);
        req.index = fn_index;
        req.lpp_state = lpp_state;
-       dbg("index=%d, lpp_state=%d",req.index, req.lpp_state);
+       dbg("index=%d, lpp_state=%d", req.index, req.lpp_state);
 
        tcore_user_request_set_data(ur, sizeof(struct treq_set_smart_assistant_info), &req);
        tcore_user_request_set_command(ur, TREQ_SET_SMART_ASSISTANT_INFO);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -352,50 +352,41 @@ gboolean dbus_plugin_setup_gps_interface(TelephonyObjectSkeleton *object, struct
 
        dbg("gps = %p", gps);
 
-       g_signal_connect (gps,
-                       "handle-set-frequency-aiding",
-                       G_CALLBACK (on_gps_set_frequency_aiding),
-                       ctx);
-
-       g_signal_connect (gps,
-                       "handle-confirm-measure-pos",
-                       G_CALLBACK (on_gps_confirm_measure_pos),
-                       ctx);
-
-       g_signal_connect (gps,
-                       "handle-enable-smart-assistant",
-                       G_CALLBACK (on_enable_smart_assistant),
-                       ctx);
-
-       g_signal_connect (gps,
-                       "handle-disable-smart-assistant",
-                       G_CALLBACK (on_disable_smart_assistant),
-                       ctx);
-
-       g_signal_connect (gps,
-                       "handle-sync-smart-assistant-area-list",
-                       G_CALLBACK (on_sync_smart_assistant_area_list),
-                       ctx);
-
-       g_signal_connect (gps,
-                       "handle-del-smart-assistant-area-list",
-                       G_CALLBACK (on_del_smart_assistant_area_list),
-                       ctx);
-
-       g_signal_connect (gps,
-                       "handle-add-smart-assistant-area",
-                       G_CALLBACK (on_add_smart_assistant_area),
-                       ctx);
-
-       g_signal_connect (gps,
-                       "handle-modify-smart-assistant-area",
-                       G_CALLBACK (on_modify_smart_assistant_area),
-                       ctx);
-
-       g_signal_connect (gps,
-                       "handle-set-smart-assistant-info",
-                       G_CALLBACK (on_set_smart_assistant_info),
-                       ctx);
+       g_signal_connect(gps,
+               "handle-set-frequency-aiding",
+               G_CALLBACK(on_gps_set_frequency_aiding), ctx);
+
+       g_signal_connect(gps,
+               "handle-confirm-measure-pos",
+               G_CALLBACK(on_gps_confirm_measure_pos), ctx);
+
+       g_signal_connect(gps,
+               "handle-enable-smart-assistant",
+               G_CALLBACK(on_enable_smart_assistant), ctx);
+
+       g_signal_connect(gps,
+               "handle-disable-smart-assistant",
+               G_CALLBACK(on_disable_smart_assistant), ctx);
+
+       g_signal_connect(gps,
+               "handle-sync-smart-assistant-area-list",
+               G_CALLBACK(on_sync_smart_assistant_area_list), ctx);
+
+       g_signal_connect(gps,
+               "handle-del-smart-assistant-area-list",
+               G_CALLBACK(on_del_smart_assistant_area_list), ctx);
+
+       g_signal_connect(gps,
+               "handle-add-smart-assistant-area",
+               G_CALLBACK(on_add_smart_assistant_area), ctx);
+
+       g_signal_connect(gps,
+               "handle-modify-smart-assistant-area",
+               G_CALLBACK(on_modify_smart_assistant_area), ctx);
+
+       g_signal_connect(gps,
+               "handle-set-smart-assistant-info",
+               G_CALLBACK(on_set_smart_assistant_info), ctx);
 
        return TRUE;
 }
@@ -420,61 +411,59 @@ gboolean dbus_plugin_gps_response(struct custom_data *ctx, UserRequest *ur, stru
                return FALSE;
 
        co_list = tcore_plugin_get_core_objects_bytype(p, CORE_OBJECT_TYPE_GPS);
-       if (!co_list) {
+       if (!co_list)
                return FALSE;
-       }
 
        co_gps = (CoreObject *)co_list->data;
        g_slist_free(co_list);
 
-       if (!co_gps) {
+       if (!co_gps)
                return FALSE;
-       }
 
        switch (command) {
-               case TRESP_GPS_SET_FREQUENCY_AIDING:
-                       dbg("TRESP_GPS_SET_FREQUENCY_AIDING result=%d", resp_gps_frequency_aiding->result);
-                       telephony_gps_complete_set_frequency_aiding(dbus_info->interface_object, dbus_info->invocation, resp_gps_frequency_aiding->result);
-                       break;
-
-               case TRESP_ENABLE_SMART_ASSISTANT:
-                       dbg("TRESP_ENABLE_SMART_ASSISTANT result=%d", resp_smart_assistant_result->result);
-                       telephony_gps_complete_enable_smart_assistant(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
-                       break;
-
-               case TRESP_DISABLE_SMART_ASSISTANT:
-                       dbg("TRESP_ENABLE_SMART_ASSISTANT result=%d", resp_smart_assistant_result->result);
-                       telephony_gps_complete_disable_smart_assistant(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
-                       break;
-
-               case TRESP_SYNC_SMART_ASSISTANT_AREA_LIST:
-                       dbg("TRESP_SYNC_SMART_ASSISTANT_AREA_LIST result=%d", resp_smart_assistant_result->result);
-                       telephony_gps_complete_sync_smart_assistant_area_list(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
-                       break;
-
-               case TRESP_DEL_SMART_ASSISTANT_AREA_LIST:
-                       dbg("TRESP_DEL_SMART_ASSISTANT_AREA_LIST result=%d", resp_smart_assistant_result->result);
-                       telephony_gps_complete_del_smart_assistant_area_list(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
-                       break;
-
-               case TRESP_ADD_SMART_ASSISTANT_AREA:
-                       dbg("TRESP_ADD_SMART_ASSISTANT_AREA result=%d", resp_smart_assistant_result->result);
-                       telephony_gps_complete_add_smart_assistant_area(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
-                       break;
-
-               case TRESP_MODIFY_SMART_ASSISTANT_AREA:
-                       dbg("TRESP_MODIFY_SMART_ASSISTANT_AREA result=%d", resp_smart_assistant_result->result);
-                       telephony_gps_complete_modify_smart_assistant_area(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
-                       break;
-
-               case TRESP_SET_SMART_ASSISTANT_INFO:
-                       dbg("TRESP_SET_SMART_ASSISTANT_INFO result=%d", resp_smart_assistant_result->result);
-                       telephony_gps_complete_set_smart_assistant_info(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
-                       break;
-
-               default:
-                       dbg("not handled cmd[0x%x]", command);
-                       break;
+       case TRESP_GPS_SET_FREQUENCY_AIDING:
+               dbg("TRESP_GPS_SET_FREQUENCY_AIDING result=%d", resp_gps_frequency_aiding->result);
+               telephony_gps_complete_set_frequency_aiding(dbus_info->interface_object, dbus_info->invocation, resp_gps_frequency_aiding->result);
+               break;
+
+       case TRESP_ENABLE_SMART_ASSISTANT:
+               dbg("TRESP_ENABLE_SMART_ASSISTANT result=%d", resp_smart_assistant_result->result);
+               telephony_gps_complete_enable_smart_assistant(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
+               break;
+
+       case TRESP_DISABLE_SMART_ASSISTANT:
+               dbg("TRESP_ENABLE_SMART_ASSISTANT result=%d", resp_smart_assistant_result->result);
+               telephony_gps_complete_disable_smart_assistant(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
+               break;
+
+       case TRESP_SYNC_SMART_ASSISTANT_AREA_LIST:
+               dbg("TRESP_SYNC_SMART_ASSISTANT_AREA_LIST result=%d", resp_smart_assistant_result->result);
+               telephony_gps_complete_sync_smart_assistant_area_list(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
+               break;
+
+       case TRESP_DEL_SMART_ASSISTANT_AREA_LIST:
+               dbg("TRESP_DEL_SMART_ASSISTANT_AREA_LIST result=%d", resp_smart_assistant_result->result);
+               telephony_gps_complete_del_smart_assistant_area_list(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
+               break;
+
+       case TRESP_ADD_SMART_ASSISTANT_AREA:
+               dbg("TRESP_ADD_SMART_ASSISTANT_AREA result=%d", resp_smart_assistant_result->result);
+               telephony_gps_complete_add_smart_assistant_area(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
+               break;
+
+       case TRESP_MODIFY_SMART_ASSISTANT_AREA:
+               dbg("TRESP_MODIFY_SMART_ASSISTANT_AREA result=%d", resp_smart_assistant_result->result);
+               telephony_gps_complete_modify_smart_assistant_area(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
+               break;
+
+       case TRESP_SET_SMART_ASSISTANT_INFO:
+               dbg("TRESP_SET_SMART_ASSISTANT_INFO result=%d", resp_smart_assistant_result->result);
+               telephony_gps_complete_set_smart_assistant_info(dbus_info->interface_object, dbus_info->invocation, resp_smart_assistant_result->result);
+               break;
+
+       default:
+               dbg("not handled cmd[0x%x]", command);
+               break;
        }
 
        return TRUE;
@@ -488,67 +477,69 @@ gboolean dbus_plugin_gps_notification(struct custom_data *ctx, CoreObject *sourc
                dbg("object is NULL");
                return FALSE;
        }
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-                               command, tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source)));
 
        gps = telephony_object_peek_gps(TELEPHONY_OBJECT(object));
-       switch (command) {
-               case TNOTI_GPS_ASSIST_DATA:
-               {
-                       gchar *encoded_data = NULL;
-                       dbg("gps(%p) TNOTI_GPS_ASSIST_DATA. data=%p, data_len=%d", gps, data, data_len);
-                       encoded_data = g_base64_encode((const guchar*)data, data_len);
-                       telephony_gps_emit_assist_data(gps, encoded_data);
-                       g_free(encoded_data);
-               }
-                       break;
-
-               case TNOTI_GPS_MEASURE_POSITION:
-               {
-                       gchar *encoded_data = NULL;
-                       dbg("gps(%p) TNOTI_GPS_MEASURE_POSITION. data=%p, data_len=%d", gps, data, data_len);
-                       encoded_data = g_base64_encode((const guchar*)data, data_len);
-                       telephony_gps_emit_measure_position(gps, encoded_data);
-                       g_free(encoded_data);
-               }
-                       break;
-
-               case TNOTI_GPS_RESET_ASSIST_DATA:
-                       dbg("gps(%p) TNOTI_GPS_RESET_ASSIST_DATA", gps);
-                       telephony_gps_emit_reset_assist_data(gps);
-                       break;
+       if (gps == NULL) {
+               err("gps object is NULL!!!");
+               return FALSE;
+       }
 
-               case TNOTI_GPS_FREQUENCY_AIDING_DATA:
-               {
-                       gchar *encoded_data = NULL;
-                       dbg("gps(%p) TNOTI_GPS_FREQUENCY_AIDING_DATA. data=%p, data_len=%d", gps, data, data_len);
-                       encoded_data = g_base64_encode((const guchar*)data, data_len);
-                       telephony_gps_emit_frequency_aiding(gps, encoded_data);
-                       g_free(encoded_data);
-               }
-                       break;
+       switch (command) {
+       case TNOTI_GPS_ASSIST_DATA:
+       {
+               gchar *encoded_data = NULL;
+               dbg("gps(%p) TNOTI_GPS_ASSIST_DATA. data=%p, data_len=%d", gps, data, data_len);
+               encoded_data = g_base64_encode((const guchar*)data, data_len);
+               telephony_gps_emit_assist_data(gps, encoded_data);
+               g_free(encoded_data);
+       }
+               break;
+
+       case TNOTI_GPS_MEASURE_POSITION:
+       {
+               gchar *encoded_data = NULL;
+               dbg("gps(%p) TNOTI_GPS_MEASURE_POSITION. data=%p, data_len=%d", gps, data, data_len);
+               encoded_data = g_base64_encode((const guchar*)data, data_len);
+               telephony_gps_emit_measure_position(gps, encoded_data);
+               g_free(encoded_data);
+       }
+               break;
+
+       case TNOTI_GPS_RESET_ASSIST_DATA:
+               dbg("gps(%p) TNOTI_GPS_RESET_ASSIST_DATA", gps);
+               telephony_gps_emit_reset_assist_data(gps);
+               break;
+
+       case TNOTI_GPS_FREQUENCY_AIDING_DATA:
+       {
+               gchar *encoded_data = NULL;
+               dbg("gps(%p) TNOTI_GPS_FREQUENCY_AIDING_DATA. data=%p, data_len=%d", gps, data, data_len);
+               encoded_data = g_base64_encode((const guchar*)data, data_len);
+               telephony_gps_emit_frequency_aiding(gps, encoded_data);
+               g_free(encoded_data);
+       }
+               break;
 
-               case TNOTI_SMART_ASSISTANT_AREA_STATUS:
-               {
-                       const struct tnoti_smart_assistant_area_status *noti = data;
-                       dbg("gps(%p) TNOTI_SMART_ASSISTANT_AREA_STATUS", gps);
-                       telephony_gps_emit_area_status(gps, noti->area_status, noti->index);
-               }
-                       break;
+       case TNOTI_SMART_ASSISTANT_AREA_STATUS:
+       {
+               const struct tnoti_smart_assistant_area_status *noti = data;
+               dbg("gps(%p) TNOTI_SMART_ASSISTANT_AREA_STATUS", gps);
+               telephony_gps_emit_area_status(gps, noti->area_status, noti->index);
+       }
+               break;
 
-               case TNOTI_SMART_ASSISTANT_SYNC_STATUS:
-               {
-                       const struct tnoti_smart_assistant_sync_status *noti = data;
-                       dbg("gps(%p) TNOTI_SMART_ASSISTANT_SYNC_STATUS", gps);
-                       telephony_gps_emit_sync_status(gps, noti->init_status, noti->init_fail_cause);
-               }
-                       break;
+       case TNOTI_SMART_ASSISTANT_SYNC_STATUS:
+       {
+               const struct tnoti_smart_assistant_sync_status *noti = data;
+               dbg("gps(%p) TNOTI_SMART_ASSISTANT_SYNC_STATUS", gps);
+               telephony_gps_emit_sync_status(gps, noti->init_status, noti->init_fail_cause);
+       }
+               break;
 
-               default:
-                       dbg("not handled cmd[0x%x]", command);
-                       break;
+       default:
+               dbg("not handled cmd[0x%x]", command);
+               break;
        }
 
        return TRUE;
 }
-
index 3685d40..254ccbc 100644 (file)
 
 
 static gboolean
-on_modem_set_power (TelephonyModem *modem, GDBusMethodInvocation *invocation,
+on_modem_set_power(TelephonyModem *modem, GDBusMethodInvocation *invocation,
        gint mode, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        enum tcore_request_command command;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_MODEM, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_MODEM, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, modem, invocation);
@@ -84,23 +84,23 @@ on_modem_set_power (TelephonyModem *modem, GDBusMethodInvocation *invocation,
        return TRUE;
 
 ERR:
-       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
        tcore_user_request_unref(ur);
 
        return TRUE;
 }
 
 static gboolean
-on_modem_set_flight_mode (TelephonyModem *modem, GDBusMethodInvocation *invocation,
+on_modem_set_flight_mode(TelephonyModem *modem, GDBusMethodInvocation *invocation,
        gboolean enable, gpointer user_data)
 {
        struct treq_modem_set_flightmode data;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_MODEM, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_MODEM, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, modem, invocation);
@@ -108,33 +108,33 @@ on_modem_set_flight_mode (TelephonyModem *modem, GDBusMethodInvocation *invocati
                goto ERR;
 
        data.enable = enable;
-       if (TCORE_RETURN_SUCCESS != tcore_user_request_set_data (ur, sizeof(data), &data))
+       if (TCORE_RETURN_SUCCESS != tcore_user_request_set_data(ur, sizeof(data), &data))
                goto ERR;
-       tcore_user_request_set_command (ur, TREQ_MODEM_SET_FLIGHTMODE);
+       tcore_user_request_set_command(ur, TREQ_MODEM_SET_FLIGHTMODE);
 
-       ret = tcore_communicator_dispatch_request (ctx->comm, ur);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS)
                goto ERR;
 
        return TRUE;
 
 ERR:
-       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
        tcore_user_request_unref(ur);
 
        return TRUE;
 }
 
 static gboolean
-on_modem_get_flight_mode (TelephonyModem *modem, GDBusMethodInvocation *invocation,
+on_modem_get_flight_mode(TelephonyModem *modem, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_MODEM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, modem, invocation);
@@ -150,22 +150,22 @@ on_modem_get_flight_mode (TelephonyModem *modem, GDBusMethodInvocation *invocati
        return TRUE;
 
 ERR:
-       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
        tcore_user_request_unref(ur);
 
        return TRUE;
 }
 
 static gboolean
-on_modem_get_version (TelephonyModem *modem, GDBusMethodInvocation *invocation,
+on_modem_get_version(TelephonyModem *modem, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_MODEM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, modem, invocation);
@@ -180,22 +180,22 @@ on_modem_get_version (TelephonyModem *modem, GDBusMethodInvocation *invocation,
        return TRUE;
 
 ERR:
-       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
        tcore_user_request_unref(ur);
 
        return TRUE;
 }
 
 static gboolean
-on_modem_get_serial_number (TelephonyModem *modem, GDBusMethodInvocation *invocation,
+on_modem_get_serial_number(TelephonyModem *modem, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_MODEM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, modem, invocation);
@@ -210,22 +210,22 @@ on_modem_get_serial_number (TelephonyModem *modem, GDBusMethodInvocation *invoca
        return TRUE;
 
 ERR:
-       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
        tcore_user_request_unref(ur);
 
        return TRUE;
 }
 
 static gboolean
-on_modem_get_imei (TelephonyModem *modem, GDBusMethodInvocation *invocation,
+on_modem_get_imei(TelephonyModem *modem, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_MODEM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, modem, invocation);
@@ -240,22 +240,22 @@ on_modem_get_imei (TelephonyModem *modem, GDBusMethodInvocation *invocation,
        return TRUE;
 
 ERR:
-       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
        tcore_user_request_unref(ur);
 
        return TRUE;
 }
 
-static gboolean on_modem_set_dun_pin_ctrl (TelephonyModem *modem, GDBusMethodInvocation *invocation,
+static gboolean on_modem_set_dun_pin_ctrl(TelephonyModem *modem, GDBusMethodInvocation *invocation,
        gint arg_signal, gboolean arg_status, gpointer user_data)
 {
        struct treq_modem_set_dun_pin_control data;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_MODEM, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_MODEM, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, modem, invocation);
@@ -275,7 +275,37 @@ static gboolean on_modem_set_dun_pin_ctrl (TelephonyModem *modem, GDBusMethodInv
        return TRUE;
 
 ERR:
-       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+       tcore_user_request_unref(ur);
+
+       return TRUE;
+}
+
+static gboolean on_modem_get_device_info(TelephonyModem *modem,
+       GDBusMethodInvocation *invocation,
+       gpointer user_data)
+{
+       struct custom_data *ctx = user_data;
+       UserRequest *ur = NULL;
+       TReturn ret;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
+
+       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
+               return TRUE;
+
+       ur = MAKE_UR(ctx, modem, invocation);
+       if (ur == NULL)
+               goto ERR;
+
+       tcore_user_request_set_command(ur, TREQ_MODEM_GET_DEVICE_INFO);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS)
+               goto ERR;
+
+       return TRUE;
+
+ERR:
+       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
        tcore_user_request_unref(ur);
 
        return TRUE;
@@ -291,40 +321,37 @@ gboolean dbus_plugin_setup_modem_interface(TelephonyObjectSkeleton *object, stru
 
        dbg("modem: [%p]", modem);
 
-       g_signal_connect (modem,
-                       "handle-set-power",
-                       G_CALLBACK (on_modem_set_power),
-                       ctx);
-
-       g_signal_connect (modem,
-                       "handle-set-flight-mode",
-                       G_CALLBACK (on_modem_set_flight_mode),
-                       ctx);
-
-       g_signal_connect (modem,
-                       "handle-get-flight-mode",
-                       G_CALLBACK (on_modem_get_flight_mode),
-                       ctx);
-
-       g_signal_connect (modem,
-                       "handle-get-version",
-                       G_CALLBACK (on_modem_get_version),
-                       ctx);
-
-       g_signal_connect (modem,
-                       "handle-get-serial-number",
-                       G_CALLBACK (on_modem_get_serial_number),
-                       ctx);
-
-       g_signal_connect (modem,
-                       "handle-get-imei",
-                       G_CALLBACK (on_modem_get_imei),
-                       ctx);
-
-       g_signal_connect (modem,
-                       "handle-set-dun-pin-ctrl",
-                       G_CALLBACK (on_modem_set_dun_pin_ctrl),
-                       ctx);
+       g_signal_connect(modem,
+               "handle-set-power",
+               G_CALLBACK(on_modem_set_power), ctx);
+
+       g_signal_connect(modem,
+               "handle-set-flight-mode",
+               G_CALLBACK(on_modem_set_flight_mode), ctx);
+
+       g_signal_connect(modem,
+               "handle-get-flight-mode",
+               G_CALLBACK(on_modem_get_flight_mode), ctx);
+
+       g_signal_connect(modem,
+               "handle-get-version",
+               G_CALLBACK(on_modem_get_version), ctx);
+
+       g_signal_connect(modem,
+               "handle-get-serial-number",
+               G_CALLBACK(on_modem_get_serial_number), ctx);
+
+       g_signal_connect(modem,
+               "handle-get-imei",
+               G_CALLBACK(on_modem_get_imei), ctx);
+
+       g_signal_connect(modem,
+               "handle-set-dun-pin-ctrl",
+               G_CALLBACK(on_modem_set_dun_pin_ctrl), ctx);
+
+       g_signal_connect(modem,
+               "handle-get-device-info",
+               G_CALLBACK(on_modem_get_device_info), ctx);
 
        telephony_modem_set_power(modem, MODEM_STATE_UNKNOWN);
 
@@ -335,32 +362,29 @@ gboolean dbus_plugin_modem_response(struct custom_data *ctx, UserRequest *ur,
        struct dbus_request_info *dbus_info, enum tcore_response_command command,
        unsigned int data_len, const void *data)
 {
-       dbg("Response!!! Command: [0x%x] CP Name: [%s]",
-               command, GET_CP_NAME(dbus_info->invocation));
+       char *cpname = dbus_info ? GET_CP_NAME(dbus_info->invocation) : "";
 
        switch (command) {
        case TRESP_MODEM_SET_FLIGHTMODE: {
                const struct tresp_modem_set_flightmode *resp_set_flight_mode = data;
                int info_set_flight_mode = 3;   /* TAPI_POWER_FLIGHT_MODE_RESP_FAIL */
 
-               dbg("TRESP_MODEM_SET_FLIGHTMODE - Result: [%s]",
-                       (resp_set_flight_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
-
                if (resp_set_flight_mode->result == TCORE_RETURN_SUCCESS) {
                        const struct treq_modem_set_flightmode *treq_data;
                        treq_data = tcore_user_request_ref_data(ur, NULL);
                        if (treq_data == NULL) {
                                warn("No Request data!!!");
                                info_set_flight_mode = 3;       /* TAPI_POWER_FLIGHT_MODE_RESP_FAIL */
-                       }
-                       else if (treq_data->enable == TRUE) {
+                       } else if (treq_data->enable == TRUE) {
                                info_set_flight_mode = 1;       /* TAPI_POWER_FLIGHT_MODE_RESP_ON */
                        } else {
                                info_set_flight_mode = 2;       /* TAPI_POWER_FLIGHT_MODE_RESP_OFF */
                        }
                }
-               dbg("Set Flight mode: [%s]", (info_set_flight_mode == 1 ? "ON"
-                       : (info_set_flight_mode == 2 ? "OFF" : "Request FAIL")));
+
+               dbg("[%s] SET_FLIGHTMODE - [%s] [%s]",
+                       cpname, (resp_set_flight_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
+                       (info_set_flight_mode == 1 ? "ON" : (info_set_flight_mode == 2 ? "OFF" : "Request FAIL")));
 
                telephony_modem_complete_set_flight_mode(dbus_info->interface_object, dbus_info->invocation,
                        info_set_flight_mode);
@@ -370,8 +394,7 @@ gboolean dbus_plugin_modem_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_MODEM_GET_FLIGHTMODE: {
                const struct tresp_modem_get_flightmode *resp_get_flight_mode = data;
 
-               dbg("TRESP_MODEM_GET_FLIGHTMODE - Result: [%s]",
-                       (resp_get_flight_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_FLIGHTMODE - [%s]", cpname, (resp_get_flight_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_modem_complete_get_flight_mode(dbus_info->interface_object, dbus_info->invocation,
                        resp_get_flight_mode->enable, resp_get_flight_mode->result);
@@ -382,13 +405,12 @@ gboolean dbus_plugin_modem_response(struct custom_data *ctx, UserRequest *ur,
                const struct tresp_modem_power_on *resp_modem_power_on = data;
                int result = 0;
 
-               dbg("TRESP_MODEM_POWER_ON - Result: [%s]",
-                       (resp_modem_power_on->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] POWER_ON - [%s]", cpname, (resp_modem_power_on->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                /*TBD: value should be defined in TAPI*/
-               if(resp_modem_power_on->result == TCORE_RETURN_EALREADY)
+               if (resp_modem_power_on->result == TCORE_RETURN_EALREADY)
                        result = 1;
-               else if(resp_modem_power_on->result == TCORE_RETURN_OPERATION_ABORTED)
+               else if (resp_modem_power_on->result == TCORE_RETURN_OPERATION_ABORTED)
                        result = 2;
 
                telephony_modem_complete_set_power(dbus_info->interface_object, dbus_info->invocation, result);
@@ -396,21 +418,21 @@ gboolean dbus_plugin_modem_response(struct custom_data *ctx, UserRequest *ur,
        break;
 
        case TRESP_MODEM_POWER_OFF: {
-               dbg("TRESP_MODEM_POWER_OFF");
+               dbg("[%s] POWER_OFF", cpname);
 
                telephony_modem_complete_set_power(dbus_info->interface_object, dbus_info->invocation, 0);
        }
        break;
 
        case TRESP_MODEM_POWER_RESET: {
-               dbg("TRESP_MODEM_POWER_RESET");
+               dbg("[%s] POWER_RESET", cpname);
 
                telephony_modem_complete_set_power(dbus_info->interface_object, dbus_info->invocation, 0);
        }
        break;
 
        case TRESP_MODEM_POWER_LOW: {
-               dbg("TRESP_MODEM_POWER_LOW");
+               dbg("[%s] POWER_LOW", cpname);
 
                telephony_modem_complete_set_power(dbus_info->interface_object, dbus_info->invocation, 0);
        }
@@ -419,8 +441,7 @@ gboolean dbus_plugin_modem_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_MODEM_GET_IMEI: {
                const struct tresp_modem_get_imei *resp_get_imei = data;
 
-               dbg("TRESP_MODEM_GET_IMEI - Result: [%s]",
-                       (resp_get_imei->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_IMEI - [%s]", cpname, (resp_get_imei->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_modem_complete_get_imei(dbus_info->interface_object, dbus_info->invocation,
                        resp_get_imei->result, resp_get_imei->imei);
@@ -430,8 +451,7 @@ gboolean dbus_plugin_modem_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_MODEM_GET_SN: {
                const struct tresp_modem_get_sn *resp_get_sn = data;
 
-               dbg("TRESP_MODEM_GET_SN - Result: [%s]",
-                       (resp_get_sn->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_SN - [%s]", cpname, (resp_get_sn->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_modem_complete_get_serial_number(dbus_info->interface_object, dbus_info->invocation,
                        resp_get_sn->result, resp_get_sn->sn, resp_get_sn->meid, resp_get_sn->imei, resp_get_sn->imeisv);
@@ -441,8 +461,7 @@ gboolean dbus_plugin_modem_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_MODEM_GET_VERSION: {
                const struct tresp_modem_get_version *resp_get_version = data;
 
-               dbg("TRESP_MODEM_GET_VERSION - Result: [%s]",
-                       (resp_get_version->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_VERSION - [%s]", cpname, (resp_get_version->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_modem_complete_get_version(dbus_info->interface_object, dbus_info->invocation,
                                resp_get_version->result,
@@ -458,14 +477,25 @@ gboolean dbus_plugin_modem_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_MODEM_SET_DUN_PIN_CONTROL: {
                const struct tresp_modem_set_dun_pin_control *resp_dun_pin_ctrl = data;
 
-               dbg("TRESP_MODEM_SET_DUN_PIN_CONTROL - Result: [%s]",
-                       (resp_dun_pin_ctrl->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] SET_DUN_PIN_CONTROL - [%s]", cpname, (resp_dun_pin_ctrl->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_modem_complete_set_dun_pin_ctrl(dbus_info->interface_object, dbus_info->invocation,
                        resp_dun_pin_ctrl->result);
        }
        break;
 
+       case TRESP_MODEM_GET_DEVICE_INFO: {
+               const struct tresp_modem_get_device_info *resp_get_device_info = data;
+
+               dbg("[%s] TGET_DEVICE_INFO - Vendor[%s] Device[%s]", cpname, resp_get_device_info->vendor_name, resp_get_device_info->device_name);
+
+               telephony_modem_complete_get_device_info(dbus_info->interface_object, dbus_info->invocation,
+                               resp_get_device_info->result,
+                               resp_get_device_info->vendor_name,
+                               resp_get_device_info->device_name);
+       }
+       break;
+
        default:
                err("Unhandled/Unknown Response!!!");
        break;
@@ -479,22 +509,24 @@ gboolean dbus_plugin_modem_notification(struct custom_data *ctx, CoreObject *sou
        unsigned int data_len, const void *data)
 {
        TelephonyModem *modem;
+       const char *cp_name;
+       cp_name = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
 
        if (!object) {
                dbg("object is NULL");
                return FALSE;
        }
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-               command, tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source)));
-
        modem = telephony_object_peek_modem(TELEPHONY_OBJECT(object));
-       dbg("modem: [%p]", modem);
+       if (modem == NULL) {
+               err("modem object is NULL!!!");
+               return FALSE;
+       }
 
        switch (command) {
        case TNOTI_MODEM_POWER: {
                const struct tnoti_modem_power *info = data;
 
-               dbg("TNOTI_MODEM_POWER - Modem state: [%d]", info->state);
+               dbg("[%s] MODEM_POWER:[%d]", cp_name, info->state);
 
                if (info->state > MODEM_STATE_MAX)
                        break;
@@ -507,19 +539,29 @@ gboolean dbus_plugin_modem_notification(struct custom_data *ctx, CoreObject *sou
        case TNOTI_MODEM_DUN_PIN_CONTROL: {
                const struct tnoti_modem_dun_pin_control *pin = data;
 
-               dbg("TNOTI_MODEM_DUN_PIN_CONTROL - Signal: [0x%2x] Status: [0x%2x]", pin->signal, pin->status);
+               dbg("[%s] MODEM_DUN_PIN_CONTROL (Signal: [0x%2x] Status: [0x%2x])", cp_name, pin->signal, pin->status);
 
                telephony_modem_emit_dun_pin_ctrl(modem, pin->signal, pin->status);
        }
        break;
 
        case TNOTI_MODEM_DUN_EXTERNAL_CALL: {
-               dbg("TNOTI_MODEM_DUN_EXTERNAL_CALL");
+               dbg("[%s] MODEM_DUN_EXTERNAL_CALL", cp_name);
 
                telephony_modem_emit_dun_external_call(modem, TRUE);
        }
        break;
 
+       case TNOTI_MODEM_DONGLE_STATUS:
+               dbg("[%s] MODEM_DONGLE_STATUS (state:[%d])", cp_name, *(int *)data);
+               telephony_modem_set_dongle_status(modem,  *(int *)data);
+       break;
+
+       case TNOTI_MODEM_DONGLE_LOGIN:
+               dbg("[%s] MODEM_DONGLE_LOGIN (login state:[%d])", cp_name, *(int *)data);
+               telephony_modem_set_dongle_login(modem,  *(int *)data);
+       break;
+
        default:
                err("Unhandled/Unknown Notification!!!");
        break;
old mode 100755 (executable)
new mode 100644 (file)
index f39b3fc..f138a5a
@@ -140,15 +140,15 @@ static int __convert_name_priority_to_option(enum tcore_network_name_priority pr
 {
        switch (priority) {
        case TCORE_NETWORK_NAME_PRIORITY_SPN:
-               return 1; // NETWORK_NAME_OPTION_SPN
+               return 1; /* NETWORK_NAME_OPTION_SPN */
        case TCORE_NETWORK_NAME_PRIORITY_NETWORK:
-               return 2; // NETWORK_NAME_OPTION_OPERATOR
+               return 2; /* NETWORK_NAME_OPTION_OPERATOR */
        case TCORE_NETWORK_NAME_PRIORITY_ANY:
-               return 3; // NETWORK_NAME_OPTION_ANY
+               return 3; /* NETWORK_NAME_OPTION_ANY */
        default:
-       break;
+               break;
        }
-       return 0; // NETWORK_NAME_OPTION_NONE
+       return 0; /* NETWORK_NAME_OPTION_NONE */
 }
 
 static void __get_current_network_status(CoreObject *o,
@@ -159,33 +159,29 @@ static void __get_current_network_status(CoreObject *o,
 
        if (req_type & NET_PROP_SVC_TYPE) {
                enum telephony_network_service_type svc_type;
-               tcore_network_get_service_type (o, &svc_type);
+               tcore_network_get_service_type(o, &svc_type);
                current->svc_type = svc_type;
        }
 
-       if (req_type & NET_PROP_ROAM) {
+       if (req_type & NET_PROP_ROAM)
                current->roaming = tcore_network_get_roaming_state(o);
-       }
 
-       if (req_type & NET_PROP_PLMN) {
+       if (req_type & NET_PROP_PLMN)
                current->plmn = tcore_network_get_plmn(o);
-       }
 
        if (req_type & NET_PROP_NAME_OPTION) {
                enum tcore_network_name_priority priority = TCORE_NETWORK_NAME_PRIORITY_UNKNOWN;
-               tcore_network_get_network_name_priority (o, &priority);
+               tcore_network_get_network_name_priority(o, &priority);
                current->name_option = __convert_name_priority_to_option(priority);
        }
 
-       if (req_type & NET_PROP_SPN) {
+       if (req_type & NET_PROP_SPN)
                current->spn = tcore_network_get_network_name(o, TCORE_NETWORK_NAME_TYPE_SPN);
-       }
 
        if (req_type & NET_PROP_NWNAME) {
                char *nwname = tcore_network_get_network_name(o, TCORE_NETWORK_NAME_TYPE_FULL);
-               if (!nwname || strlen(nwname) == 0) {
+               if (!nwname || strlen(nwname) == 0)
                        nwname = tcore_network_get_network_name(o, TCORE_NETWORK_NAME_TYPE_SHORT);
-               }
                current->nwname = nwname;
        }
 
@@ -203,7 +199,7 @@ static void __get_current_network_status(CoreObject *o,
 
        if (req_type & NET_PROP_ACT) {
                enum telephony_network_access_technology act = NETWORK_ACT_UNKNOWN;
-               tcore_network_get_access_technology (o, &act);
+               tcore_network_get_access_technology(o, &act);
                current->act = __convert_act_to_systemtype(act);
        }
 }
@@ -219,66 +215,57 @@ static int __check_property_change(TelephonyNetwork *network, CoreObject *o,
        __get_current_network_status(o, current, req_type);
 
        if (req_type & NET_PROP_SVC_TYPE) {
-               if (telephony_network_get_service_type(network) != current->svc_type) {
+               if (telephony_network_get_service_type(network) != current->svc_type)
                        changed_type |= NET_PROP_SVC_TYPE;
-               }
        }
 
        if (req_type & NET_PROP_ROAM) {
-               if (telephony_network_get_roaming_status(network) != current->roaming) {
+               if (telephony_network_get_roaming_status(network) != current->roaming)
                        changed_type |= NET_PROP_ROAM;
-               }
        }
 
        if (req_type & NET_PROP_PLMN) {
                const gchar *prev_plmn = telephony_network_get_plmn(network);
                if (current->plmn) {
-                       if (!prev_plmn || strcmp(prev_plmn,current->plmn) !=0) {
+                       if (!prev_plmn || strcmp(prev_plmn, current->plmn) != 0)
                                changed_type |= NET_PROP_PLMN;
-                       }
                }
        }
 
        if (req_type & NET_PROP_NAME_OPTION) {
-               if (telephony_network_get_name_option(network) != current->name_option) {
+               if (telephony_network_get_name_option(network) != current->name_option)
                        changed_type |= NET_PROP_NAME_OPTION;
-               }
        }
 
        if (req_type & NET_PROP_SPN) {
                const gchar *prev_spn = telephony_network_get_spn_name(network);
                if (current->spn) {
-                       if (!prev_spn || strcmp(prev_spn,current->spn) !=0) {
+                       if (!prev_spn || strcmp(prev_spn, current->spn) != 0)
                                changed_type |= NET_PROP_SPN;
-                       }
                }
        }
 
        if (req_type & NET_PROP_NWNAME) {
                const gchar *prev_nwname = telephony_network_get_network_name(network);
                if (current->nwname) {
-                       if (!prev_nwname || strcmp(prev_nwname,current->nwname) !=0) {
+                       if (!prev_nwname || strcmp(prev_nwname, current->nwname) != 0)
                                changed_type |= NET_PROP_NWNAME;
-                       }
                }
        }
 
        if (req_type & NET_PROP_CS) {
-               if (telephony_network_get_circuit_status(network) != current->cs) {
+               if (telephony_network_get_circuit_status(network) != current->cs)
                        changed_type |= NET_PROP_CS;
-               }
        }
 
        if (req_type & NET_PROP_PS) {
-               if (telephony_network_get_packet_status(network) != current->ps) {
+               if (telephony_network_get_packet_status(network) != current->ps)
                        changed_type |= NET_PROP_PS;
-               }
        }
 
        if (req_type & NET_PROP_ACT) {
-               if (telephony_network_get_access_technology(network) != current->act) {
+               if (telephony_network_get_access_technology(network) != current->act)
                        changed_type |= NET_PROP_ACT;
-               }
        }
 
        return changed_type;
@@ -292,49 +279,40 @@ static void __update_network_properties(TelephonyNetwork *network,
 
        if (update_type & NET_PROP_SVC_TYPE) {
                telephony_network_set_service_type(network, current->svc_type);
-               if (current->svc_type != NETWORK_SERVICE_TYPE_3G) {
-                       telephony_network_set_ps_type (network, TELEPHONY_HSDPA_OFF);
-               }
+               if (current->svc_type != NETWORK_SERVICE_TYPE_3G)
+                       telephony_network_set_ps_type(network, TELEPHONY_HSDPA_OFF);
        }
 
-       if (update_type & NET_PROP_ROAM) {
+       if (update_type & NET_PROP_ROAM)
                telephony_network_set_roaming_status(network, current->roaming);
-       }
 
-       if (update_type & NET_PROP_PLMN) {
+       if (update_type & NET_PROP_PLMN)
                telephony_network_set_plmn(network, current->plmn);
-       }
 
-       if (update_type & NET_PROP_NAME_OPTION) {
+       if (update_type & NET_PROP_NAME_OPTION)
                telephony_network_set_name_option(network, current->name_option);
-       }
 
-       if (update_type & NET_PROP_SPN) {
+       if (update_type & NET_PROP_SPN)
                telephony_network_set_spn_name(network, current->spn);
-       }
 
-       if (update_type & NET_PROP_NWNAME) {
+       if (update_type & NET_PROP_NWNAME)
                telephony_network_set_network_name(network, current->nwname);
-       }
 
-       if (update_type & NET_PROP_CS) {
+       if (update_type & NET_PROP_CS)
                telephony_network_set_circuit_status(network, current->cs);
-       }
 
-       if (update_type & NET_PROP_PS) {
+       if (update_type & NET_PROP_PS)
                telephony_network_set_packet_status(network, current->ps);
-       }
 
-       if (update_type & NET_PROP_ACT) {
+       if (update_type & NET_PROP_ACT)
                telephony_network_set_access_technology(network, current->act);
-       }
 }
 
 static int __add_default_property_type(TelephonyNetwork *network, CoreObject *o, int req_type)
 {
        /* If SVC_TYPE was changed, another properties (ACT,OPTION,SPN,NWNAME) may be changed together */
        if (req_type & NET_PROP_SVC_TYPE) {
-               struct network_prop_info current = {0,-1,-1, 0,-1,-1,-1,-1,NULL,NULL,NULL};
+               struct network_prop_info current = {0, -1, -1, 0, -1, -1, -1, -1, NULL, NULL, NULL};
                if (__check_property_change(network, o, &current, NET_PROP_SVC_TYPE)) {
                        /* If SVC_TYPE was really changed, we should add anothers to default checking value */
                        req_type |= (NET_PROP_ACT|NET_PROP_NAME_OPTION|NET_PROP_SPN|NET_PROP_NWNAME);
@@ -343,7 +321,7 @@ static int __add_default_property_type(TelephonyNetwork *network, CoreObject *o,
 
        /* If PLMN was changed, Another properties (ROAM,OPTION,SPN,NWNAME) may be changed together */
        if (req_type & NET_PROP_PLMN) {
-               struct network_prop_info current = {0,-1,-1, 0,-1,-1,-1,-1,NULL,NULL,NULL};
+               struct network_prop_info current = {0, -1, -1, 0, -1, -1, -1, -1, NULL, NULL, NULL};
                if (__check_property_change(network, o, &current, NET_PROP_PLMN)) {
                        /* If PLMN was really changed, we should add anothers to default checking value */
                        req_type |= (NET_PROP_ROAM|NET_PROP_NAME_OPTION|NET_PROP_SPN|NET_PROP_NWNAME);
@@ -353,34 +331,27 @@ static int __add_default_property_type(TelephonyNetwork *network, CoreObject *o,
        return req_type;
 }
 
-static void __check_network_properties (TelephonyNetwork *network, CoreObject *o,
+static void __check_network_properties(TelephonyNetwork *network, CoreObject *o,
        const char *cp_name, int req_type)
 {
        int changed_type = NET_PROP_NONE;
        int emit_type = NET_PROP_NONE;
-       struct network_prop_info current = {0,-1,-1, 0,-1,-1,-1,-1,NULL,NULL,NULL};
+       struct network_prop_info current = {0, -1, -1, 0, -1, -1, -1, -1, NULL, NULL, NULL};
 
        req_type = __add_default_property_type(network, o, req_type);
        changed_type = __check_property_change(network, o, &current, req_type);
 
-       if (changed_type) {
+       if (changed_type)
                __update_network_properties(network, cp_name, &current, changed_type);
-       }
 
        emit_type = (changed_type & NET_PROP_EMIT);
        if (emit_type) {
-               info("[DBUSINFO][%s][PROPTYPE:%04x] svc[%d] roam[%d] plmn[%s] prio[%d] spn[%s] nwname[%s]",
-                       cp_name, emit_type, current.svc_type,current.roaming, current.plmn,
+               info("[%s][PROPTYPE:%04x] svc[%d] roam[%d] plmn[%s] prio[%d] spn[%s] nwname[%s]",
+                       cp_name, emit_type, current.svc_type, current.roaming, current.plmn,
                        current.name_option, current.spn, current.nwname);
-               telephony_network_emit_property_info(network,
-                               emit_type,
-                               current.svc_type,
-                               current.roaming,
-                               current.name_option,
-                               current.plmn,
-                               current.spn,
-                               current.nwname
-                       );
+               telephony_network_emit_property_info(network, emit_type,
+                       current.svc_type, current.roaming, current.name_option,
+                       current.plmn, current.spn, current.nwname);
        }
        g_free(current.plmn);
        g_free(current.spn);
@@ -407,7 +378,7 @@ static enum tcore_hook_return on_hook_ps_protocol_status(Server *s,
                return TCORE_HOOK_RETURN_CONTINUE;
        }
 
-       info("[DBUSINFO][%s] PS_PROTOCOL_STATUS (status:[%d])", cp_name, protocol_status->status);
+       info("[%s] PS_PROTOCOL_STATUS (status:[%d])", cp_name, protocol_status->status);
 
        path = g_strdup_printf("%s/%s", MY_DBUS_PATH, cp_name);
 
@@ -420,11 +391,21 @@ static enum tcore_hook_return on_hook_ps_protocol_status(Server *s,
        }
 
        network = telephony_object_peek_network(TELEPHONY_OBJECT(object));
+       if (network == NULL) {
+               err("Network object is NULL!!!");
+               return TCORE_HOOK_RETURN_CONTINUE;
+       }
 
+       /*
+        * Do not check service_type.
+        * In case of +CGREG is invoked before +CREG(Z1 device),
+        * ps_type is not set because service_type is unknown yet.
+        *
        if (telephony_network_get_service_type (network) < NETWORK_SERVICE_TYPE_2G) {
                telephony_network_set_ps_type(network, TELEPHONY_HSDPA_OFF);
                return TCORE_HOOK_RETURN_CONTINUE;
        }
+       */
 
        switch (protocol_status->status) {
        case TELEPHONY_HSDPA_OFF:
@@ -448,26 +429,24 @@ static enum tcore_hook_return on_hook_ps_protocol_status(Server *s,
                break;
        default:
                err("Unhandled protocol status!");
-       break;
+               break;
        }
 
-       /* Check and Set - To avoid double update */
-       if (telephony_network_get_ps_type(network) != (gint)ps_protocol_status)
-               telephony_network_set_ps_type(network, ps_protocol_status);
+       telephony_network_set_ps_type(network, ps_protocol_status);
 
        return TCORE_HOOK_RETURN_CONTINUE;
 }
 
 static gboolean
-on_network_search (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_search(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -475,7 +454,7 @@ on_network_search (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        tcore_user_request_set_command(ur, TREQ_NETWORK_SEARCH);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -483,15 +462,15 @@ on_network_search (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
 }
 
 static gboolean
-on_network_search_cancel (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_search_cancel(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -499,7 +478,7 @@ on_network_search_cancel (TelephonyNetwork *network, GDBusMethodInvocation *invo
        tcore_user_request_set_command(ur, TREQ_NETWORK_SET_CANCEL_MANUAL_SEARCH);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -507,15 +486,15 @@ on_network_search_cancel (TelephonyNetwork *network, GDBusMethodInvocation *invo
 }
 
 static gboolean
-on_network_get_selection_mode (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_get_selection_mode(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -523,7 +502,7 @@ on_network_get_selection_mode (TelephonyNetwork *network, GDBusMethodInvocation
        tcore_user_request_set_command(ur, TREQ_NETWORK_GET_PLMN_SELECTION_MODE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -531,30 +510,28 @@ on_network_get_selection_mode (TelephonyNetwork *network, GDBusMethodInvocation
 }
 
 static gboolean
-on_network_set_selection_mode (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_set_selection_mode(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
                gint mode, const gchar *plmn, gint act, gpointer user_data)
 {
        struct treq_network_set_plmn_selection_mode req;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
                return TRUE;
 
        memset(&req, 0, sizeof(struct treq_network_set_plmn_selection_mode));
 
        if (mode == 0) {        /* Automatic */
                req.mode = NETWORK_SELECT_MODE_AUTOMATIC;
-       }
-       else if (mode == 1) {   /* Manual */
+       } else if (mode == 1) { /* Manual */
                req.mode = NETWORK_SELECT_MODE_MANUAL;
                snprintf(req.plmn, 7, "%s", plmn);
                req.act = act;
-       }
-       else {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       } else {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return TRUE;
        }
        dbg("Mode: [%d] PLMN: [%s] AcT: [%d]", req.mode, req.plmn, req.act);
@@ -565,7 +542,7 @@ on_network_set_selection_mode (TelephonyNetwork *network, GDBusMethodInvocation
        tcore_user_request_set_command(ur, TREQ_NETWORK_SET_PLMN_SELECTION_MODE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -574,16 +551,16 @@ on_network_set_selection_mode (TelephonyNetwork *network, GDBusMethodInvocation
 
 
 static gboolean
-on_network_set_service_domain (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_set_service_domain(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gint domain, gpointer user_data)
 {
        struct treq_network_set_service_domain req;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -594,7 +571,7 @@ on_network_set_service_domain (TelephonyNetwork *network, GDBusMethodInvocation
        tcore_user_request_set_command(ur, TREQ_NETWORK_SET_SERVICE_DOMAIN);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -602,15 +579,15 @@ on_network_set_service_domain (TelephonyNetwork *network, GDBusMethodInvocation
 }
 
 static gboolean
-on_network_get_service_domain (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_get_service_domain(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -618,7 +595,7 @@ on_network_get_service_domain (TelephonyNetwork *network, GDBusMethodInvocation
        tcore_user_request_set_command(ur, TREQ_NETWORK_GET_SERVICE_DOMAIN);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -626,16 +603,16 @@ on_network_get_service_domain (TelephonyNetwork *network, GDBusMethodInvocation
 }
 
 static gboolean
-on_network_set_band (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_set_band(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gint band, gint mode, gpointer user_data)
 {
        struct treq_network_set_band req;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -647,7 +624,7 @@ on_network_set_band (TelephonyNetwork *network, GDBusMethodInvocation *invocatio
        tcore_user_request_set_command(ur, TREQ_NETWORK_SET_BAND);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -655,15 +632,15 @@ on_network_set_band (TelephonyNetwork *network, GDBusMethodInvocation *invocatio
 }
 
 static gboolean
-on_network_get_band (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_get_band(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -671,7 +648,7 @@ on_network_get_band (TelephonyNetwork *network, GDBusMethodInvocation *invocatio
        tcore_user_request_set_command(ur, TREQ_NETWORK_GET_BAND);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -679,16 +656,16 @@ on_network_get_band (TelephonyNetwork *network, GDBusMethodInvocation *invocatio
 }
 
 static gboolean
-on_network_set_mode (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_set_mode(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gint mode, gpointer user_data)
 {
        struct treq_network_set_mode req;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -699,7 +676,7 @@ on_network_set_mode (TelephonyNetwork *network, GDBusMethodInvocation *invocatio
        tcore_user_request_set_command(ur, TREQ_NETWORK_SET_MODE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -707,15 +684,15 @@ on_network_set_mode (TelephonyNetwork *network, GDBusMethodInvocation *invocatio
 }
 
 static gboolean
-on_network_get_mode (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
-       gpointer user_data)
+on_network_get_mode(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -723,7 +700,7 @@ on_network_get_mode (TelephonyNetwork *network, GDBusMethodInvocation *invocatio
        tcore_user_request_set_command(ur, TREQ_NETWORK_GET_MODE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -731,16 +708,16 @@ on_network_get_mode (TelephonyNetwork *network, GDBusMethodInvocation *invocatio
 }
 
 static gboolean
-on_network_set_preferred_plmn (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_set_preferred_plmn(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gint mode, gint ef_index, gint act, const gchar *plmn, gpointer user_data)
 {
        struct treq_network_set_preferred_plmn req;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -751,15 +728,14 @@ on_network_set_preferred_plmn (TelephonyNetwork *network, GDBusMethodInvocation
 
        memcpy(req.plmn, plmn, 6);
 
-       if (strlen(plmn) <= 5) {
+       if (strlen(plmn) <= 5)
                req.plmn[5] = '#';
-       }
 
        tcore_user_request_set_data(ur, sizeof(struct treq_network_set_preferred_plmn), &req);
        tcore_user_request_set_command(ur, TREQ_NETWORK_SET_PREFERRED_PLMN);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -767,15 +743,15 @@ on_network_set_preferred_plmn (TelephonyNetwork *network, GDBusMethodInvocation
 }
 
 static gboolean
-on_network_get_preferred_plmn (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_get_preferred_plmn(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -783,7 +759,7 @@ on_network_get_preferred_plmn (TelephonyNetwork *network, GDBusMethodInvocation
        tcore_user_request_set_command(ur, TREQ_NETWORK_GET_PREFERRED_PLMN);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -791,15 +767,15 @@ on_network_get_preferred_plmn (TelephonyNetwork *network, GDBusMethodInvocation
 }
 
 static gboolean
-on_network_get_serving_network (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_get_serving_network(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -807,7 +783,7 @@ on_network_get_serving_network (TelephonyNetwork *network, GDBusMethodInvocation
        tcore_user_request_set_command(ur, TREQ_NETWORK_GET_SERVING_NETWORK);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -815,15 +791,15 @@ on_network_get_serving_network (TelephonyNetwork *network, GDBusMethodInvocation
 }
 
 static gboolean
-on_network_get_neighboring_cell_info (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_get_neighboring_cell_info(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -831,7 +807,7 @@ on_network_get_neighboring_cell_info (TelephonyNetwork *network, GDBusMethodInvo
        tcore_user_request_set_command(ur, TREQ_NETWORK_GET_NEIGHBORING_CELL_INFO);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -839,15 +815,15 @@ on_network_get_neighboring_cell_info (TelephonyNetwork *network, GDBusMethodInvo
 }
 
 static gboolean
-on_network_set_default_data_subscription (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_set_default_data_subscription(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -855,7 +831,7 @@ on_network_set_default_data_subscription (TelephonyNetwork *network, GDBusMethod
        tcore_user_request_set_command(ur, TREQ_NETWORK_SET_DEFAULT_DATA_SUBSCRIPTION);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -863,23 +839,23 @@ on_network_set_default_data_subscription (TelephonyNetwork *network, GDBusMethod
 }
 
 static gboolean
-on_network_get_default_data_subscription (TelephonyNetwork *network, GDBusMethodInvocation *invocation,
+on_network_get_default_data_subscription(TelephonyNetwork *network, GDBusMethodInvocation *invocation,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
 
-       tcore_user_request_set_command( ur, TREQ_NETWORK_GET_DEFAULT_DATA_SUBSCRIPTION );
+       tcore_user_request_set_command(ur, TREQ_NETWORK_GET_DEFAULT_DATA_SUBSCRIPTION);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -892,17 +868,17 @@ static gboolean on_network_set_default_subs(TelephonyNetwork *network, GDBusMeth
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
 
-       tcore_user_request_set_command( ur, TREQ_NETWORK_SET_DEFAULT_SUBSCRIPTION );
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       tcore_user_request_set_command(ur, TREQ_NETWORK_SET_DEFAULT_SUBSCRIPTION);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -916,17 +892,17 @@ static gboolean on_network_get_default_subs(TelephonyNetwork *network, GDBusMeth
        struct custom_data *ctx = user_data;
        UserRequest *ur;
        TReturn ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
 
-       tcore_user_request_set_command( ur, TREQ_NETWORK_GET_DEFAULT_SUBSCRIPTION );
-       ret = tcore_communicator_dispatch_request( ctx->comm, ur );
-       if ( ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       tcore_user_request_set_command(ur, TREQ_NETWORK_GET_DEFAULT_SUBSCRIPTION);
+       ret = tcore_communicator_dispatch_request(ctx->comm, ur);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -935,18 +911,18 @@ static gboolean on_network_get_default_subs(TelephonyNetwork *network, GDBusMeth
 }
 
 static gboolean
-on_network_set_emergency_callback_mode (TelephonyNetwork *network,
-               GDBusMethodInvocation *invocation,
-               gint mode,
-               gpointer user_data)
+on_network_set_emergency_callback_mode(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation,
+       gint mode,
+       gpointer user_data)
 {
        struct treq_network_set_emergency_callback_mode req;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -957,7 +933,7 @@ on_network_set_emergency_callback_mode (TelephonyNetwork *network,
        tcore_user_request_set_command(ur, TREQ_NETWORK_SET_EMERGENCY_CALLBACK_MODE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -965,18 +941,18 @@ on_network_set_emergency_callback_mode (TelephonyNetwork *network,
 }
 
 static gboolean
-on_network_set_roaming_preference (TelephonyNetwork *network,
-               GDBusMethodInvocation *invocation,
-               gint roam_pref,
-               gpointer user_data)
+on_network_set_roaming_preference(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation,
+       gint roam_pref,
+       gpointer user_data)
 {
        struct treq_network_set_roaming_preference req;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -987,7 +963,7 @@ on_network_set_roaming_preference (TelephonyNetwork *network,
        tcore_user_request_set_command(ur, TREQ_NETWORK_SET_ROAMING_PREFERENCE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -995,16 +971,16 @@ on_network_set_roaming_preference (TelephonyNetwork *network,
 }
 
 static gboolean
-on_network_get_roaming_preference (TelephonyNetwork *network,
-               GDBusMethodInvocation *invocation,
-               gpointer user_data)
+on_network_get_roaming_preference(TelephonyNetwork *network,
+       GDBusMethodInvocation *invocation,
+       gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_NETWORK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, network, invocation);
@@ -1012,7 +988,7 @@ on_network_get_roaming_preference (TelephonyNetwork *network,
        tcore_user_request_set_command(ur, TREQ_NETWORK_GET_ROAMING_PREFERENCE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -1027,110 +1003,89 @@ gboolean dbus_plugin_setup_network_interface(TelephonyObjectSkeleton *object, st
        telephony_object_skeleton_set_network(object, network);
        g_object_unref(network);
 
-       g_signal_connect (network,
-                       "handle-search",
-                       G_CALLBACK (on_network_search),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-search-cancel",
-                       G_CALLBACK (on_network_search_cancel),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-set-selection-mode",
-                       G_CALLBACK (on_network_set_selection_mode),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-selection-mode",
-                       G_CALLBACK (on_network_get_selection_mode),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-set-service-domain",
-                       G_CALLBACK (on_network_set_service_domain),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-service-domain",
-                       G_CALLBACK (on_network_get_service_domain),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-set-band",
-                       G_CALLBACK (on_network_set_band),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-band",
-                       G_CALLBACK (on_network_get_band),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-set-mode",
-                       G_CALLBACK (on_network_set_mode),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-mode",
-                       G_CALLBACK (on_network_get_mode),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-set-preferred-plmn",
-                       G_CALLBACK (on_network_set_preferred_plmn),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-preferred-plmn",
-                       G_CALLBACK (on_network_get_preferred_plmn),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-serving-network",
-                       G_CALLBACK (on_network_get_serving_network),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-ngbr-cell-info",
-                       G_CALLBACK (on_network_get_neighboring_cell_info),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-set-default-data-subscription",
-                       G_CALLBACK (on_network_set_default_data_subscription),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-default-data-subscription",
-                       G_CALLBACK (on_network_get_default_data_subscription),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-set-default-subscription",
-                       G_CALLBACK (on_network_set_default_subs),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-default-subscription",
-                       G_CALLBACK (on_network_get_default_subs),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-set-emergency-callback-mode",
-                       G_CALLBACK (on_network_set_emergency_callback_mode),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-set-roaming-preference",
-                       G_CALLBACK (on_network_set_roaming_preference),
-                       ctx);
-
-       g_signal_connect (network,
-                       "handle-get-roaming-preference",
-                       G_CALLBACK (on_network_get_roaming_preference),
-                       ctx);
+       g_signal_connect(network,
+               "handle-search",
+               G_CALLBACK(on_network_search), ctx);
+
+       g_signal_connect(network,
+               "handle-search-cancel",
+               G_CALLBACK(on_network_search_cancel), ctx);
+
+       g_signal_connect(network,
+               "handle-set-selection-mode",
+               G_CALLBACK(on_network_set_selection_mode), ctx);
+
+       g_signal_connect(network,
+               "handle-get-selection-mode",
+               G_CALLBACK(on_network_get_selection_mode), ctx);
+
+       g_signal_connect(network,
+               "handle-set-service-domain",
+               G_CALLBACK(on_network_set_service_domain), ctx);
+
+       g_signal_connect(network,
+               "handle-get-service-domain",
+               G_CALLBACK(on_network_get_service_domain), ctx);
+
+       g_signal_connect(network,
+               "handle-set-band",
+               G_CALLBACK(on_network_set_band), ctx);
+
+       g_signal_connect(network,
+               "handle-get-band",
+               G_CALLBACK(on_network_get_band), ctx);
+
+       g_signal_connect(network,
+               "handle-set-mode",
+               G_CALLBACK(on_network_set_mode), ctx);
+
+       g_signal_connect(network,
+               "handle-get-mode",
+               G_CALLBACK(on_network_get_mode), ctx);
+
+       g_signal_connect(network,
+               "handle-set-preferred-plmn",
+               G_CALLBACK(on_network_set_preferred_plmn), ctx);
+
+       g_signal_connect(network,
+               "handle-get-preferred-plmn",
+               G_CALLBACK(on_network_get_preferred_plmn), ctx);
+
+       g_signal_connect(network,
+               "handle-get-serving-network",
+               G_CALLBACK(on_network_get_serving_network), ctx);
+
+       g_signal_connect(network,
+               "handle-get-ngbr-cell-info",
+               G_CALLBACK(on_network_get_neighboring_cell_info), ctx);
+
+       g_signal_connect(network,
+               "handle-set-default-data-subscription",
+               G_CALLBACK(on_network_set_default_data_subscription), ctx);
+
+       g_signal_connect(network,
+               "handle-get-default-data-subscription",
+               G_CALLBACK(on_network_get_default_data_subscription), ctx);
+
+       g_signal_connect(network,
+               "handle-set-default-subscription",
+               G_CALLBACK(on_network_set_default_subs), ctx);
+
+       g_signal_connect(network,
+               "handle-get-default-subscription",
+               G_CALLBACK(on_network_get_default_subs), ctx);
+
+       g_signal_connect(network,
+               "handle-set-emergency-callback-mode",
+               G_CALLBACK(on_network_set_emergency_callback_mode), ctx);
+
+       g_signal_connect(network,
+               "handle-set-roaming-preference",
+               G_CALLBACK(on_network_set_roaming_preference), ctx);
+
+       g_signal_connect(network,
+               "handle-get-roaming-preference",
+               G_CALLBACK(on_network_get_roaming_preference), ctx);
 
        /* initialize dbus properties */
        telephony_network_set_access_technology(network, NETWORK_ACT_UNKNOWN);
@@ -1160,8 +1115,7 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        struct dbus_request_info *dbus_info, enum tcore_response_command command,
        unsigned int data_len, const void *data)
 {
-       dbg("Response!!! Command: [0x%x] CP Name: [%s]",
-               command, GET_CP_NAME(dbus_info->invocation));
+       char *cpname = dbus_info ? GET_CP_NAME(dbus_info->invocation) : "";
 
        switch (command) {
        case TRESP_NETWORK_SEARCH: {
@@ -1170,8 +1124,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
                GVariantBuilder b;
                int i = 0;
 
-               dbg("TRESP_NETWORK_SEARCH - Result: [%s] Count: [%d]",
-                       (resp_network_search->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
+               info("[%s] SEARCH - [%s] Count: [%d]",
+                       cpname, (resp_network_search->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
                        resp_network_search->list_count);
 
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
@@ -1195,8 +1149,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_SET_PLMN_SELECTION_MODE: {
                const struct tresp_network_set_plmn_selection_mode *resp_set_plmn_selection_mode = data;
 
-               dbg("TRESP_SET_PLMN_SELECTION_MODE - Result: [%s]",
-                       (resp_set_plmn_selection_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               info("[%s] SET_PLMN_SELECTION_MODE - [%s]",
+                       cpname, (resp_set_plmn_selection_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_network_complete_set_selection_mode(dbus_info->interface_object, dbus_info->invocation,
                        resp_set_plmn_selection_mode->result);
@@ -1206,8 +1160,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_GET_PLMN_SELECTION_MODE: {
                const struct tresp_network_get_plmn_selection_mode *resp_get_plmn_selection_mode = data;
 
-               dbg("TRESP_GET_PLMN_SELECTION_MODE - Result: [%s] Mode: [%s]",
-                       (resp_get_plmn_selection_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
+               info("[%s] GET_PLMN_SELECTION_MODE - [%s] Mode: [%s]",
+                       cpname, (resp_get_plmn_selection_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
                        (resp_get_plmn_selection_mode->mode == NETWORK_SELECT_MODE_AUTOMATIC ? "Auto" :
                        (resp_get_plmn_selection_mode->mode == NETWORK_SELECT_MODE_MANUAL ? "Manual" :
                        "Unknown")));
@@ -1234,8 +1188,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_SET_SERVICE_DOMAIN: {
                const struct tresp_network_set_service_domain *resp_set_service_domain = data;
 
-               dbg("TRESP_NETWORK_SET_SERVICE_DOMAIN - Result: [%s]",
-                       (resp_set_service_domain->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] SET_SERVICE_DOMAIN - [%s]",
+                       cpname, (resp_set_service_domain->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_network_complete_set_service_domain(dbus_info->interface_object, dbus_info->invocation,
                        resp_set_service_domain->result);
@@ -1245,8 +1199,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_GET_SERVICE_DOMAIN: {
                const struct tresp_network_get_service_domain *resp_get_service_domain = data;
 
-               dbg("TRESP_NETWORK_GET_SERVICE_DOMAIN - Result: [%s] Domain: [%d]",
-                       (resp_get_service_domain->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_SERVICE_DOMAIN - [%s] Domain: [%d]",
+                       cpname, (resp_get_service_domain->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
                        resp_get_service_domain->domain);
 
                telephony_network_complete_get_service_domain(dbus_info->interface_object, dbus_info->invocation,
@@ -1257,8 +1211,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_SET_BAND: {
                const struct tresp_network_set_band *resp_set_band = data;
 
-               dbg("TRESP_NETWORK_SET_BAND - Result: [%s]",
-                       (resp_set_band->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] SET_BAND - [%s]",
+                       cpname, (resp_set_band->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_network_complete_set_band(dbus_info->interface_object, dbus_info->invocation,
                        resp_set_band->result);
@@ -1268,8 +1222,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_GET_BAND: {
                const struct tresp_network_get_band *resp_get_band = data;
 
-               dbg("TRESP_NETWORK_GET_BAND - Result: [%s] Mode: [%s] Band: [%d]",
-                       (resp_get_band->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_BAND - [%s] Mode: [%s] Band: [%d]",
+                       cpname, (resp_get_band->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
                        (resp_get_band->mode == NETWORK_BAND_MODE_PREFERRED ? "Preferred" :
                        (resp_get_band->mode == NETWORK_BAND_MODE_ONLY ? "Only" :
                        "Unknown")), resp_get_band->band);
@@ -1282,8 +1236,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_SET_MODE: {
                const struct tresp_network_set_mode *resp_set_mode = data;
 
-               dbg("TRESP_NETWORK_SET_MODE - Result: [%s]",
-                       (resp_set_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] SET_MODE - [%s]",
+                       cpname, (resp_set_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_network_complete_set_mode(dbus_info->interface_object, dbus_info->invocation,
                        resp_set_mode->result);
@@ -1293,8 +1247,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_GET_MODE: {
                const struct tresp_network_get_mode *resp_get_mode = data;
 
-               dbg("TRESP_NETWORK_GET_MODE - Result: [%s] Mode: [%d]",
-                       (resp_get_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_MODE - [%s] Mode: [%d]",
+                       cpname, (resp_get_mode->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
                        resp_get_mode->mode);
 
                telephony_network_complete_get_mode(dbus_info->interface_object, dbus_info->invocation,
@@ -1310,8 +1264,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
                enum telephony_network_access_technology act;
                int i = 0;
 
-               dbg("TRESP_NETWORK_GET_NEIGHBORING_CELL_INFO - Result: [%s]",
-                       (resp_get_ngbr_cell_info->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_NEIGHBORING_CELL_INFO - [%s]",
+                       cpname, (resp_get_ngbr_cell_info->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                act = resp_get_ngbr_cell_info->info.serving.act;
 
@@ -1336,9 +1290,7 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "g_serving", value);
                        g_variant_builder_close(&b);
-
-               }
-               else if (act >= NETWORK_ACT_UMTS && act <= NETWORK_ACT_GSM_UTRAN) {
+               } else if (act >= NETWORK_ACT_UMTS && act <= NETWORK_ACT_GSM_UTRAN) {
                        value = g_variant_new("(iiiii)",
                                        resp_get_ngbr_cell_info->info.serving.cell.umts.cell_id,
                                        resp_get_ngbr_cell_info->info.serving.cell.umts.lac,
@@ -1348,8 +1300,7 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "u_serving", value);
                        g_variant_builder_close(&b);
-               }
-               else if (act == NETWORK_ACT_LTE) {
+               } else if (act == NETWORK_ACT_LTE) {
                        value = g_variant_new("(iiiii)",
                                        resp_get_ngbr_cell_info->info.serving.cell.lte.cell_id,
                                        resp_get_ngbr_cell_info->info.serving.cell.lte.lac,
@@ -1359,15 +1310,14 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "l_serving", value);
                        g_variant_builder_close(&b);
-               }
-               else if(act >= NETWORK_ACT_IS95A && act <= NETWORK_ACT_EHRPD) {
+               } else if (act >= NETWORK_ACT_IS95A && act <= NETWORK_ACT_EHRPD) {
                        value = g_variant_new("(uuuuii)",
-                                       resp_get_ngbr_cell_info->info.serving.cell.cdma.sid,
-                                       resp_get_ngbr_cell_info->info.serving.cell.cdma.nid,
-                                       resp_get_ngbr_cell_info->info.serving.cell.cdma.base_id,
-                                       resp_get_ngbr_cell_info->info.serving.cell.cdma.refpn,
-                                       resp_get_ngbr_cell_info->info.serving.cell.cdma.base_lat,
-                                       resp_get_ngbr_cell_info->info.serving.cell.cdma.base_long);
+                               resp_get_ngbr_cell_info->info.serving.cell.cdma.sid,
+                               resp_get_ngbr_cell_info->info.serving.cell.cdma.nid,
+                               resp_get_ngbr_cell_info->info.serving.cell.cdma.base_id,
+                               resp_get_ngbr_cell_info->info.serving.cell.cdma.refpn,
+                               resp_get_ngbr_cell_info->info.serving.cell.cdma.base_lat,
+                               resp_get_ngbr_cell_info->info.serving.cell.cdma.base_long);
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "c_serving", value);
                        g_variant_builder_close(&b);
@@ -1408,8 +1358,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_SET_PREFERRED_PLMN: {
                const struct tresp_network_set_preferred_plmn *resp_set_preferred_plmn = data;
 
-               dbg("TRESP_NETWORK_SET_PREFERRED_PLMN - Result: [%s]",
-                       (resp_set_preferred_plmn->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] SET_PREFERRED_PLMN - [%s]",
+                       cpname, (resp_set_preferred_plmn->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_network_complete_set_preferred_plmn(dbus_info->interface_object, dbus_info->invocation,
                        resp_set_preferred_plmn->result);
@@ -1422,8 +1372,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
                GVariantBuilder b;
                int i = 0;
 
-               dbg("TRESP_NETWORK_GET_PREFERRED_PLMN - Result: [%s] Count: [%d]",
-                       (resp_get_preferred_plmn->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_PREFERRED_PLMN - [%s] Count: [%d]",
+                       cpname, (resp_get_preferred_plmn->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
                        resp_get_preferred_plmn->list_count);
 
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
@@ -1449,8 +1399,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_SET_CANCEL_MANUAL_SEARCH: {
                const struct tresp_network_set_cancel_manual_search *resp_set_cancel_manual_search = data;
 
-               dbg("TRESP_NETWORK_SET_CANCEL_MANUAL_SEARCH - Result: [%s]",
-                       (resp_set_cancel_manual_search->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
+               info("[%s] SET_CANCEL_MANUAL_SEARCH - [%s]",
+                       cpname, (resp_set_cancel_manual_search->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_network_complete_search_cancel(dbus_info->interface_object, dbus_info->invocation,
                        resp_set_cancel_manual_search->result);
@@ -1465,8 +1415,8 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
 
                enum telephony_network_access_technology act;
 
-               dbg("TRESP_NETWORK_GET_SERVING_NETWORK - Result: [%s] AcT: [%d] PLMN: [%s] LAC: [%d])",
-                       (resp_get_serving_network->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_SERVING_NETWORK - [%s] AcT: [%d] PLMN: [%s] LAC: [%d])",
+                       cpname, (resp_get_serving_network->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
                        resp_get_serving_network->act, resp_get_serving_network->plmn, resp_get_serving_network->gsm.lac);
 
                act = resp_get_serving_network->act;
@@ -1483,8 +1433,7 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
                        value = g_variant_new("(i)",
                                        resp_get_serving_network->gsm.lac);
                        g_variant_builder_add(&b, "{sv}", "g_serving", value);
-               }
-               else if(act >= NETWORK_ACT_IS95A && act <= NETWORK_ACT_EHRPD) {
+               } else if (act >= NETWORK_ACT_IS95A && act <= NETWORK_ACT_EHRPD) {
                        dbg("carrier:[%d] sid:[%d] nid:[%d] bs_id:[%d] bs_lat:[%d] bs_long:[%d] reg_zone:[%d] pilot_pn:[%d]",
                                resp_get_serving_network->cdma.carrier,
                                resp_get_serving_network->cdma.sid,
@@ -1515,7 +1464,7 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_SET_DEFAULT_DATA_SUBSCRIPTION: {
                const struct tresp_network_set_default_data_subscription *resp_set_default_data_subs = data;
 
-               dbg("TRESP_NETWORK_SET_DEFAULT_DATA_SUBSCRIPTION - Result: [%s]",
+               info("SET_DEFAULT_DATA_SUBSCRIPTION - [%s]",
                        (resp_set_default_data_subs->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_network_complete_set_default_data_subscription(dbus_info->interface_object, dbus_info->invocation,
@@ -1526,7 +1475,7 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_GET_DEFAULT_DATA_SUBSCRIPTION: {
                const struct tresp_network_get_default_data_subs *resp_get_default_data_subs = data;
 
-               dbg("TRESP_NETWORK_GET_DEFAULT_DATA_SUBSCRIPTION - Result: [%s] 'default' Data subscription: [%s]",
+               dbg("GET_DEFAULT_DATA_SUBSCRIPTION - [%s] 'default' Data subscription: [%s]",
                        (resp_get_default_data_subs->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
                        (resp_get_default_data_subs->default_subs == NETWORK_DEFAULT_DATA_SUBS_SIM1 ? "SIM1" :
                        (resp_get_default_data_subs->default_subs == NETWORK_DEFAULT_DATA_SUBS_SIM2 ? "SIM2" :
@@ -1540,31 +1489,31 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_SET_DEFAULT_SUBSCRIPTION: {
                const struct tresp_network_set_default_subs *resp_set_default_subs = data;
 
-               dbg("TRESP_NETWORK_SET_DEFAULT_SUBSCRIPTION - Result: [%s]",
+               info("SET_DEFAULT_SUBSCRIPTION - [%s]",
                        (resp_set_default_subs->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"));
 
                telephony_network_complete_set_default_subscription(dbus_info->interface_object, dbus_info->invocation,
-                       resp_set_default_subs->result );
+                       resp_set_default_subs->result);
        }
        break;
 
        case TRESP_NETWORK_GET_DEFAULT_SUBSCRIPTION: {
                const struct tresp_network_get_default_subs *resp_get_default_subs = data;
 
-               dbg("TRESP_NETWORK_GET_DEFAULT_SUBSCRIPTION - Result: [%s] 'default' subscription: [%s]",
+               dbg("GET_DEFAULT_SUBSCRIPTION - [%s] 'default' subscription: [%s]",
                        (resp_get_default_subs->result == TCORE_RETURN_SUCCESS ? "Success" : "Fail"),
                        (resp_get_default_subs->default_subs == NETWORK_DEFAULT_SUBS_SIM1 ? "SIM1" :
                        (resp_get_default_subs->default_subs == NETWORK_DEFAULT_SUBS_SIM2 ? "SIM2" :
                        "Unknown")));
 
                telephony_network_complete_get_default_subscription(dbus_info->interface_object, dbus_info->invocation,
-                       resp_get_default_subs->default_subs, resp_get_default_subs->result );
+                       resp_get_default_subs->default_subs, resp_get_default_subs->result);
        }
        break;
 
        case TRESP_NETWORK_SET_EMERGENCY_CALLBACK_MODE: {
                const struct tresp_network_set_emergency_callback_mode *resp_set_emergency_callback_mode = data;
-               dbg("TRESP_NETWORK_SET_EMERGENCY_CALLBACK_MODE (result:[%d])", resp_set_emergency_callback_mode->result);
+               info("SET_EMERGENCY_CALLBACK_MODE (result:[%d])", resp_set_emergency_callback_mode->result);
                telephony_network_complete_set_emergency_callback_mode(dbus_info->interface_object, dbus_info->invocation,
                                resp_set_emergency_callback_mode->result);
        }
@@ -1573,7 +1522,7 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_SET_ROAMING_PREFERENCE: {
                const struct tresp_network_set_roaming_preference *resp_set_roam_pref = data;
 
-               dbg("TRESP_NETWORK_SET_ROAMING_PREFERENCE (result:[%d])", resp_set_roam_pref->result);
+               info("SET_ROAMING_PREFERENCE (result:[%d])", resp_set_roam_pref->result);
 
                telephony_network_complete_set_roaming_preference(dbus_info->interface_object, dbus_info->invocation, resp_set_roam_pref->result);
        }
@@ -1582,7 +1531,7 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_NETWORK_GET_ROAMING_PREFERENCE: {
                const struct tresp_network_get_roaming_preference *resp_get_roam_pref = data;
 
-               dbg("TRESP_NETWORK_GET_ROAMING_PREFERENCE (roam_pref:[%d])", resp_get_roam_pref->roam_pref);
+               dbg("GET_ROAMING_PREFERENCE (roam_pref:[%d])", resp_get_roam_pref->roam_pref);
 
                telephony_network_complete_get_roaming_preference(dbus_info->interface_object, dbus_info->invocation,
                        resp_get_roam_pref->roam_pref, resp_get_roam_pref->result);
@@ -1615,17 +1564,17 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx, CoreObject *s
        }
 
        cp_name = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
-
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-               command, cp_name);
-
        network = telephony_object_peek_network(TELEPHONY_OBJECT(object));
+       if (network == NULL) {
+               err("Network object is NULL!!!");
+               return FALSE;
+       }
 
        switch (command) {
        case TNOTI_NETWORK_REGISTRATION_STATUS: {
                const struct tnoti_network_registration_status *reg = data;
 
-               info("[DBUSINFO][%s] NET_REGI_STATUS. (cs:[%d] ps:[%d] svc:[%d] roam:[%d])",
+               info("[%s] NET_REGI_STATUS (cs:[%d] ps:[%d] svc:[%d] roam:[%d])",
                        cp_name, reg->cs_domain_status, reg->ps_domain_status, reg->service_type, reg->roaming_status);
 
 #ifdef ENABLE_KPI_LOGS
@@ -1653,7 +1602,7 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx, CoreObject *s
        case TNOTI_NETWORK_CHANGE: {
                const struct tnoti_network_change *change = data;
 
-               info("[DBUSINFO][%s] NET_CHANGE. (plmn:[%s] lac:[%d])",
+               info("[%s] NET_CHANGE. (plmn:[%s] lac:[%d])",
                        cp_name, change->plmn, change->gsm.lac);
 
                __check_network_properties(network, source, cp_name, NET_PROP_PLMN);
@@ -1668,7 +1617,7 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx, CoreObject *s
        case TNOTI_NETWORK_TIMEINFO: {
                const struct tnoti_network_timeinfo *time_info = data;
 
-               info("[DBUSINFO][%s] NET_TIMEINFO", cp_name);
+               info("[%s] NET_TIMEINFO", cp_name);
 
                /* Emit signal */
                telephony_network_emit_time_info(network,
@@ -1691,8 +1640,8 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx, CoreObject *s
 
                /* Update property */
                if (icon_info->type & NETWORK_ICON_INFO_RSSI) {
-                       info("[DBUSINFO][%s] NET_ICON_INFO (Ant:[%d])", cp_name, icon_info->rssi);
-                       telephony_network_set_sig_level (network, icon_info->rssi);
+                       info("[%s] NET_ICON_INFO (Ant:[%d])", cp_name, icon_info->rssi);
+                       telephony_network_set_sig_level(network, icon_info->rssi);
                }
        }
        break;
@@ -1700,7 +1649,7 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx, CoreObject *s
        case TNOTI_NETWORK_IDENTITY: {
                const struct tnoti_network_identity *identity = data;
 
-               info("[DBUSINFO][%s] NET_IDENTITY (long:[%s] short:[%s] plmn:[%s])",
+               info("[%s] NET_IDENTITY (long:[%s] short:[%s] plmn:[%s])",
                        cp_name, identity->full_name, identity->short_name, identity->plmn);
 
                __check_network_properties(network, source, cp_name,
@@ -1717,12 +1666,12 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx, CoreObject *s
        case TNOTI_NETWORK_LOCATION_CELLINFO: {
                const struct tnoti_network_location_cellinfo *location = data;
 
-               info("[DBUSINFO][%s] NET_LOCATION_CELLINFO (lac:[%d] cell_id:[%d])",
+               info("[%s] NET_LOCATION_CELLINFO (lac:[0x%x] cell_id:[0x%x])",
                        cp_name, location->lac, location->cell_id);
 
                /* Update properties */
-               telephony_network_set_lac (network, location->lac);
-               telephony_network_set_cell_id (network, location->cell_id);
+               telephony_network_set_lac(network, location->lac);
+               telephony_network_set_cell_id(network, location->cell_id);
 
                /* Emit signal */
                telephony_network_emit_cell_info(network,
@@ -1734,10 +1683,10 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx, CoreObject *s
        case TNOTI_NETWORK_SIGNAL_STRENGTH: {
                const struct tnoti_network_signal_strength *signal_strength = data;
 
-               info("[DBUSINFO][%s] NET_SIGNAL_STRENGTH (dbm:[%d])", cp_name, signal_strength->dbm);
+               info("[%s] NET_SIGNAL_STRENGTH (dbm:[%d])", cp_name, signal_strength->dbm);
 
                /* Update properties */
-               telephony_network_set_sig_dbm (network, signal_strength->dbm);
+               telephony_network_set_sig_dbm(network, signal_strength->dbm);
 
                /* Emit signal */
                telephony_network_emit_signal_strength(network,
@@ -1748,7 +1697,7 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx, CoreObject *s
        case TNOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION: {
                const struct tnoti_network_default_data_subs *default_data_subs_info = data;
 
-               info("[DBUSINFO][%s] NET_DEFAULT_DATA_SUBSCRIPTION (default:[%d])", cp_name, default_data_subs_info->default_subs);
+               info("[%s] NET_DEFAULT_DATA_SUBSCRIPTION (default:[%d])", cp_name, default_data_subs_info->default_subs);
 
                /* Emit signal */
                telephony_network_emit_default_data_subscription(network,
@@ -1759,7 +1708,7 @@ gboolean dbus_plugin_network_notification(struct custom_data *ctx, CoreObject *s
        case TNOTI_NETWORK_DEFAULT_SUBSCRIPTION: {
                const struct tnoti_network_default_subs *default_subs_info = data;
 
-               info("[DBUSINFO][%s] NET_DEFAULT_SUBSCRIPTION (default:[%d])", cp_name, default_subs_info->default_subs);
+               info("[%s] NET_DEFAULT_SUBSCRIPTION (default:[%d])", cp_name, default_subs_info->default_subs);
 
                /* Emit signal */
                telephony_network_emit_default_subscription(network,
index a0a6ead..9c8ed5c 100644 (file)
--- a/src/oem.c
+++ b/src/oem.c
@@ -31,11 +31,10 @@ static void _emit_oem_response(struct dbus_request_info *dbus_info, int oem_id,
 
        if (dbus_info->interface_object) {
                gchar *encoded_data = g_base64_encode((const guchar*)data, data_len);
-               if (dbus_info->invocation) {
+               if (dbus_info->invocation)
                        telephony_oem_complete_send_oem_data_with_response(dbus_info->interface_object, dbus_info->invocation, oem_id, encoded_data);
-               } else {
+               else
                        telephony_oem_emit_oem_data(dbus_info->interface_object, oem_id, encoded_data);
-               }
                g_free(encoded_data);
        }
 }
@@ -45,7 +44,7 @@ static void _emit_oem_notification(TelephonyOEM *oem, int oem_id, const void *da
        gchar *encoded_data = NULL;
 
        if (!oem || !oem_id || !data || !data_len) {
-               dbg("Invalid Data! oem=%p, oem_id=0x%x, data=%p, data_len=%d", oem, oem_id, data, data_len);
+               dbg("Invalid Data! oem_id=0x%x, data=%p, data_len=%d", oem_id, data, data_len);
                return ;
        }
 
@@ -68,9 +67,9 @@ send_oem_data(TelephonyOEM *oem,
        gint result = 1;
        guchar *decoded_data = NULL;
        gsize length;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_MODEM, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_MODEM, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, oem, invocation);
@@ -83,7 +82,7 @@ send_oem_data(TelephonyOEM *oem,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
                return TRUE;
        }
@@ -99,7 +98,7 @@ send_oem_data(TelephonyOEM *oem,
 }
 
 static gboolean
-on_send_oem_data (TelephonyOEM *oem,
+on_send_oem_data(TelephonyOEM *oem,
        GDBusMethodInvocation *invocation,
        gint arg_oem_id,
        const gchar *arg_data,
@@ -109,7 +108,7 @@ on_send_oem_data (TelephonyOEM *oem,
 }
 
 static gboolean
-on_send_oem_data_with_response (TelephonyOEM *oem,
+on_send_oem_data_with_response(TelephonyOEM *oem,
        GDBusMethodInvocation *invocation,
        gint arg_oem_id,
        const gchar *arg_data,
@@ -129,15 +128,13 @@ gboolean dbus_plugin_setup_oem_interface(TelephonyObjectSkeleton *object, struct
 
        dbg("oem = %p", oem);
 
-       g_signal_connect (oem,
-                       "handle-send-oem-data",
-                       G_CALLBACK (on_send_oem_data),
-                       ctx);
+       g_signal_connect(oem,
+               "handle-send-oem-data",
+               G_CALLBACK(on_send_oem_data), ctx);
 
-       g_signal_connect (oem,
-                       "handle-send-oem-data-with-response",
-                       G_CALLBACK (on_send_oem_data_with_response),
-                       ctx);
+       g_signal_connect(oem,
+               "handle-send-oem-data-with-response",
+               G_CALLBACK(on_send_oem_data_with_response), ctx);
 
        return TRUE;
 }
@@ -145,7 +142,7 @@ gboolean dbus_plugin_setup_oem_interface(TelephonyObjectSkeleton *object, struct
 gboolean dbus_plugin_oem_response(struct custom_data *ctx, UserRequest *ur, struct dbus_request_info *dbus_info, enum tcore_response_command command, unsigned int data_len, const void *data)
 {
        _emit_oem_response(dbus_info, GET_OEM_ID(command), data, data_len);
-       return TRUE;
+       return TRUE;
 }
 
 gboolean dbus_plugin_oem_notification(struct custom_data *ctx, CoreObject *source, TelephonyObjectSkeleton *object, enum tcore_notification_command command, unsigned int data_len, const void *data)
old mode 100755 (executable)
new mode 100644 (file)
index f6c45af..e9ea6b5
@@ -50,40 +50,52 @@ static const char* dbg_dbus_pb_ton_name[] = { "PB_TON_UNKNOWN", "PB_TON_INTERNAT
                "PB_TON_ALPHA_NUMERIC", "PB_TON_ABBREVIATED_NUMBER",
                "PB_TON_RESERVED_FOR_EXT", };
 
+#define DBUS_PBM_GET_COPBM(invocation, co_pbm, server) { \
+       co_pbm = __get_pbm_co_by_cp_name(server, GET_CP_NAME(invocation)); \
+       if (!co_pbm) { \
+               err("[%s] PBM Core object is NULL", GET_CP_NAME(invocation)); \
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED); \
+               return TRUE; \
+       } \
+}
+
+static CoreObject *__get_pbm_co_by_cp_name(Server *server, char *cp_name)
+{
+       TcorePlugin *plugin = NULL;
+
+       if (!server) {
+               err("server is NULL");
+               return NULL;
+       }
+
+       plugin = tcore_server_find_plugin(server, cp_name);
+       return tcore_plugin_ref_core_object(plugin, CORE_OBJECT_TYPE_PHONEBOOK);
+}
+
 static gboolean on_phonebook_get_init_status(TelephonyPhonebook *phonebook, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        gboolean pb_status = FALSE;
        struct tel_phonebook_support_list *list = NULL;
-       GSList *co_list = NULL;
        CoreObject *co_pb = NULL;
-       TcorePlugin *plugin = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_PHONEBOOK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
                return TRUE;
 
-       plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
-       co_list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_PHONEBOOK);
-       if (!co_list) {
-               dbg("error- co_list is NULL");
-               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
-               return TRUE;
-       }
-       co_pb = (CoreObject *)co_list->data;
-       g_slist_free(co_list);
+       DBUS_PBM_GET_COPBM(invocation, co_pb, ctx->server);
+
+       pb_status = tcore_phonebook_get_status(co_pb);
+       list = tcore_phonebook_get_support_list(co_pb);
 
-       if (!co_pb) {
-               dbg("error- co_pb is NULL");
+       if (!list) {
+               err("Supported phonebook list is NULL");
                FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return TRUE;
        }
 
-       pb_status = tcore_phonebook_get_status(co_pb);
-       list = tcore_phonebook_get_support_list(co_pb);
-
-       dbg("fdn[%d],adn[%d],sdn[%d],usim[%d],aas[%d],gas[%d]"
-               ,list->b_fdn,list->b_adn,list->b_sdn,list->b_usim,list->b_aas,list->b_gas);
+       dbg("[%s] fdn[%d],adn[%d],sdn[%d],usim[%d],aas[%d],gas[%d]",
+               GET_CP_NAME(invocation), list->b_fdn, list->b_adn, list->b_sdn, list->b_usim, list->b_aas, list->b_gas);
 
        telephony_phonebook_complete_get_init_status(phonebook, invocation,
                        pb_status,
@@ -105,28 +117,17 @@ static gboolean on_phonebook_get_count(TelephonyPhonebook *phonebook, GDBusMetho
        UserRequest *ur = NULL;
        TReturn ret;
        struct treq_phonebook_get_count pb_count;
-       TcorePlugin *plugin = NULL;
-       GSList *co_list = NULL;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_PHONEBOOK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
                return TRUE;
 
-       plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
-       co_list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_PHONEBOOK);
-       if (!co_list) {
-               dbg("error- co_list is NULL");
-               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
-               return TRUE;
-       }
-       co_pb = (CoreObject *)co_list->data;
-       g_slist_free(co_list);
+       DBUS_PBM_GET_COPBM(invocation, co_pb, ctx->server);
 
        pb_status = tcore_phonebook_get_status(co_pb);
-
-       if(pb_status == FALSE) {
+       if (pb_status == FALSE) {
                dbg("pb_init is not completed yet.");
                telephony_phonebook_complete_get_count(phonebook, invocation, PB_ACCESS_CONDITION_NOT_SATISFIED, 0, 0, 0);
                return TRUE;
@@ -136,11 +137,11 @@ static gboolean on_phonebook_get_count(TelephonyPhonebook *phonebook, GDBusMetho
        memset(&pb_count, 0, sizeof(struct treq_phonebook_get_count));
 
        pb_count.phonebook_type = arg_req_type;
-       dbg("req phonebook_type[%d][%s]", pb_count.phonebook_type, dbg_dbus_pb_type_name[pb_count.phonebook_type]);
+       dbg("[%s] req phonebook_type[%d][%s]", GET_CP_NAME(invocation), pb_count.phonebook_type, dbg_dbus_pb_type_name[pb_count.phonebook_type]);
        tcore_user_request_set_data(ur, sizeof(struct treq_phonebook_get_count), &pb_count);
        tcore_user_request_set_command(ur, TREQ_PHONEBOOK_GETCOUNT);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
+       if (ret != TCORE_RETURN_SUCCESS) {
                FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
@@ -153,28 +154,17 @@ static gboolean on_phonebook_get_info(TelephonyPhonebook *phonebook, GDBusMethod
        UserRequest *ur = NULL;
        TReturn ret;
        struct treq_phonebook_get_info pb_info;
-       TcorePlugin *plugin = NULL;
-       GSList *co_list = NULL;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_PHONEBOOK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
                return TRUE;
 
-       plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
-       co_list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_PHONEBOOK);
-       if (!co_list) {
-               dbg("error- co_list is NULL");
-               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
-               return TRUE;
-       }
-       co_pb = (CoreObject *)co_list->data;
-       g_slist_free(co_list);
+       DBUS_PBM_GET_COPBM(invocation, co_pb, ctx->server);
 
        pb_status = tcore_phonebook_get_status(co_pb);
-
-       if(pb_status == FALSE) {
+       if (pb_status == FALSE) {
                dbg("pb_init is not completed yet.");
                telephony_phonebook_complete_get_info(phonebook, invocation, PB_ACCESS_CONDITION_NOT_SATISFIED, 0, 0, 0, 0, 0, 0);
                return TRUE;
@@ -184,13 +174,13 @@ static gboolean on_phonebook_get_info(TelephonyPhonebook *phonebook, GDBusMethod
        memset(&pb_info, 0, sizeof(struct treq_phonebook_get_info));
 
        pb_info.phonebook_type = arg_req_type;
-       dbg("req phonebook_type[%d][%s]", pb_info.phonebook_type, dbg_dbus_pb_type_name[pb_info.phonebook_type]);
+       dbg("[%s] req phonebook_type[%d][%s]", GET_CP_NAME(invocation), pb_info.phonebook_type, dbg_dbus_pb_type_name[pb_info.phonebook_type]);
        tcore_user_request_set_data(ur, sizeof(struct treq_phonebook_get_info), &pb_info);
        tcore_user_request_set_command(ur, TREQ_PHONEBOOK_GETMETAINFO);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -202,34 +192,24 @@ static gboolean on_phonebook_get_usim_info(TelephonyPhonebook *phonebook, GDBusM
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       TcorePlugin *plugin = NULL;
-       GSList *co_list = NULL;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_PHONEBOOK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
                return TRUE;
 
-       plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
-       co_list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_PHONEBOOK);
-       if (!co_list) {
-               dbg("error- co_list is NULL");
-               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
-               return TRUE;
-       }
-       co_pb = (CoreObject *)co_list->data;
-       g_slist_free(co_list);
+       DBUS_PBM_GET_COPBM(invocation, co_pb, ctx->server);
 
        pb_status = tcore_phonebook_get_status(co_pb);
 
-       if(pb_status == FALSE) {
+       if (pb_status == FALSE) {
                GVariant *gv = NULL;
                GVariantBuilder b;
                dbg("pb_init is not completed yet.");
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
                gv = g_variant_builder_end(&b);
-               telephony_phonebook_complete_get_usim_meta_info (phonebook, invocation, PB_ACCESS_CONDITION_NOT_SATISFIED, gv);
+               telephony_phonebook_complete_get_usim_meta_info(phonebook, invocation, PB_ACCESS_CONDITION_NOT_SATISFIED, gv);
                return TRUE;
        }
 
@@ -237,9 +217,9 @@ static gboolean on_phonebook_get_usim_info(TelephonyPhonebook *phonebook, GDBusM
        tcore_user_request_set_data(ur, 0, NULL);
        tcore_user_request_set_command(ur, TREQ_PHONEBOOK_GETUSIMINFO);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
        return TRUE;
@@ -252,28 +232,17 @@ static gboolean on_phonebook_read_record(TelephonyPhonebook *phonebook, GDBusMet
        UserRequest *ur = NULL;
        TReturn ret;
        struct treq_phonebook_read_record pb_read;
-       TcorePlugin *plugin = NULL;
-       GSList *co_list = NULL;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_PHONEBOOK, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
                return TRUE;
 
-       plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
-       co_list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_PHONEBOOK);
-       if (!co_list) {
-               dbg("error- co_list is NULL");
-               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
-               return TRUE;
-       }
-       co_pb = (CoreObject *)co_list->data;
-       g_slist_free(co_list);
-
+       DBUS_PBM_GET_COPBM(invocation, co_pb, ctx->server);
        pb_status = tcore_phonebook_get_status(co_pb);
 
-       if(pb_status == FALSE) {
+       if (pb_status == FALSE) {
                dbg("pb_init is not completed yet.");
                telephony_phonebook_complete_read_record(phonebook, invocation, PB_ACCESS_CONDITION_NOT_SATISFIED,
                                0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0);
@@ -285,15 +254,15 @@ static gboolean on_phonebook_read_record(TelephonyPhonebook *phonebook, GDBusMet
 
        pb_read.index = (unsigned short)arg_index;
        pb_read.phonebook_type = arg_req_type;
-       dbg("req phonebook_type[%d][%s] index[%d]",
-               pb_read.phonebook_type, dbg_dbus_pb_type_name[pb_read.phonebook_type], pb_read.index);
+       dbg("[%s] req phonebook_type[%d][%s] index[%d]",
+               GET_CP_NAME(invocation), pb_read.phonebook_type, dbg_dbus_pb_type_name[pb_read.phonebook_type], pb_read.index);
 
        tcore_user_request_set_data(ur, sizeof(struct treq_phonebook_read_record), &pb_read);
        tcore_user_request_set_command(ur, TREQ_PHONEBOOK_READRECORD);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
        return TRUE;
@@ -304,7 +273,7 @@ static gboolean on_phonebook_update_record(TelephonyPhonebook *phonebook, GDBusM
                const gchar *arg_number, gint arg_ton,
                const gchar *arg_sne, gint arg_sne_dcs,
                const gchar *arg_number2, gint arg_number2_ton,
-               const gchar *arg_number3,gint arg_number3_ton, const gchar *arg_number4, gint arg_number4_ton,
+               const gchar *arg_number3, gint arg_number3_ton, const gchar *arg_number4, gint arg_number4_ton,
                const gchar *arg_email1, const gchar *arg_email2, const gchar *arg_email3, const gchar *arg_email4,
                gint arg_group_index, gpointer user_data)
 {
@@ -312,29 +281,19 @@ static gboolean on_phonebook_update_record(TelephonyPhonebook *phonebook, GDBusM
        UserRequest *ur = NULL;
        TReturn ret;
        struct treq_phonebook_update_record pb_update;
-       TcorePlugin *plugin = NULL;
-       GSList *co_list = NULL;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
        int temp_len = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_PHONEBOOK, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "x"))
                return TRUE;
 
-       plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
-       co_list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_PHONEBOOK);
-       if (!co_list) {
-               dbg("error- co_list is NULL");
-               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
-               return TRUE;
-       }
-       co_pb = (CoreObject *)co_list->data;
-       g_slist_free(co_list);
+       DBUS_PBM_GET_COPBM(invocation, co_pb, ctx->server);
 
        pb_status = tcore_phonebook_get_status(co_pb);
 
-       if(pb_status == FALSE) {
+       if (pb_status == FALSE) {
                dbg("pb_init is not completed yet.");
                telephony_phonebook_complete_update_record(phonebook, invocation, PB_ACCESS_CONDITION_NOT_SATISFIED);
                return TRUE;
@@ -342,56 +301,56 @@ static gboolean on_phonebook_update_record(TelephonyPhonebook *phonebook, GDBusM
 
        memset(&pb_update, 0, sizeof(struct treq_phonebook_update_record));
 
-       dbg("pb_type[%d] index[%d] name[%s] number[%s] email[%s]",
-               arg_type,arg_index,arg_name, arg_number, arg_email1);
+       dbg("[%s] pb_type[%d] index[%d] name[%s] number[%s] email[%s]",
+               GET_CP_NAME(invocation), arg_type, arg_index, arg_name, arg_number, arg_email1);
 
        pb_update.index = (unsigned short)arg_index;
        pb_update.phonebook_type = arg_type;
 
-       if(arg_name != NULL && strlen(arg_name)){
+       if (arg_name != NULL && strlen(arg_name)) {
                pb_update.dcs = PB_TEXT_ASCII;
                pb_update.name_len = strlen(arg_name);
-               if(pb_update.name_len > PHONEBOOK_NAME_BYTE_MAX)
+               if (pb_update.name_len > PHONEBOOK_NAME_BYTE_MAX)
                        pb_update.name_len = PHONEBOOK_NAME_BYTE_MAX;
                memcpy(pb_update.name, arg_name, pb_update.name_len);
        }
-       if(arg_sne != NULL && strlen(arg_sne)){
+       if (arg_sne != NULL && strlen(arg_sne)) {
                pb_update.sne_dcs = PB_TEXT_ASCII;
                pb_update.sne_len = strlen(arg_sne);
-               if(pb_update.sne_len > PHONEBOOK_NAME_BYTE_MAX)
+               if (pb_update.sne_len > PHONEBOOK_NAME_BYTE_MAX)
                        pb_update.sne_len = PHONEBOOK_NAME_BYTE_MAX;
                memcpy(pb_update.sne, arg_sne, pb_update.sne_len);
        }
-       if(arg_number != NULL && (temp_len=strlen(arg_number))){
+       if (arg_number != NULL && (temp_len = strlen(arg_number))) {
                pb_update.ton = arg_ton;
-               if(temp_len > PHONEBOOK_NUMBER_BYTE_MAX)
+               if (temp_len > PHONEBOOK_NUMBER_BYTE_MAX)
                        temp_len = PHONEBOOK_NUMBER_BYTE_MAX;
                memcpy(pb_update.number, arg_number, temp_len);
        }
-       if(arg_number2 != NULL && (temp_len=strlen(arg_number2))){
+       if (arg_number2 != NULL && (temp_len = strlen(arg_number2))) {
                pb_update.anr1_ton = arg_number2_ton;
-               if(temp_len > PHONEBOOK_NUMBER_BYTE_MAX)
+               if (temp_len > PHONEBOOK_NUMBER_BYTE_MAX)
                        temp_len = PHONEBOOK_NUMBER_BYTE_MAX;
                memcpy(pb_update.anr1, arg_number2, temp_len);
        }
 
-       if(arg_number3 != NULL && (temp_len=strlen(arg_number3))){
+       if (arg_number3 != NULL && (temp_len = strlen(arg_number3))) {
                pb_update.anr2_ton = arg_number3_ton;
-               if(temp_len > PHONEBOOK_NUMBER_BYTE_MAX)
+               if (temp_len > PHONEBOOK_NUMBER_BYTE_MAX)
                        temp_len = PHONEBOOK_NUMBER_BYTE_MAX;
                memcpy(pb_update.anr2, arg_number3, temp_len);
        }
 
-       if(arg_number4 != NULL && (temp_len=strlen(arg_number4))){
+       if (arg_number4 != NULL && (temp_len = strlen(arg_number4))) {
                pb_update.anr3_ton = arg_number4_ton;
-               if(temp_len > PHONEBOOK_NUMBER_BYTE_MAX)
+               if (temp_len > PHONEBOOK_NUMBER_BYTE_MAX)
                        temp_len = PHONEBOOK_NUMBER_BYTE_MAX;
                memcpy(pb_update.anr3, arg_number4, temp_len);
        }
 
-       if(arg_email1 != NULL && strlen(arg_email1)){
+       if (arg_email1 != NULL && strlen(arg_email1)) {
                pb_update.email1_len = strlen(arg_email1);
-               if(pb_update.email1_len > PHONEBOOK_EMAIL_BYTE_MAX)
+               if (pb_update.email1_len > PHONEBOOK_EMAIL_BYTE_MAX)
                        pb_update.email1_len = PHONEBOOK_EMAIL_BYTE_MAX;
                memcpy(pb_update.email1, arg_email1, pb_update.email1_len);
        }
@@ -403,9 +362,9 @@ static gboolean on_phonebook_update_record(TelephonyPhonebook *phonebook, GDBusM
        tcore_user_request_set_data(ur, sizeof(struct treq_phonebook_update_record), &pb_update);
        tcore_user_request_set_command(ur, TREQ_PHONEBOOK_UPDATERECORD);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -419,28 +378,18 @@ static gboolean on_phonebook_delete_record(TelephonyPhonebook *phonebook, GDBusM
        UserRequest *ur = NULL;
        TReturn ret;
        struct treq_phonebook_delete_record pb_delete;
-       TcorePlugin *plugin = NULL;
-       GSList *co_list = NULL;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_PHONEBOOK, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "x"))
                return TRUE;
 
-       plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
-       co_list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_PHONEBOOK);
-       if (!co_list) {
-               dbg("error- co_list is NULL");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               return TRUE;
-       }
-       co_pb = (CoreObject *)co_list->data;
-       g_slist_free(co_list);
+       DBUS_PBM_GET_COPBM(invocation, co_pb, ctx->server);
 
        pb_status = tcore_phonebook_get_status(co_pb);
 
-       if(pb_status == FALSE) {
+       if (pb_status == FALSE) {
                dbg("pb_init is not completed yet.");
                telephony_phonebook_complete_delete_record(phonebook, invocation, PB_ACCESS_CONDITION_NOT_SATISFIED);
                return TRUE;
@@ -451,15 +400,15 @@ static gboolean on_phonebook_delete_record(TelephonyPhonebook *phonebook, GDBusM
 
        pb_delete.index = (unsigned short)arg_index;
        pb_delete.phonebook_type = arg_type;
-       dbg("req phonebook_type[%d][%s] index[%d]",
-               pb_delete.phonebook_type, dbg_dbus_pb_type_name[pb_delete.phonebook_type], pb_delete.index);
+       dbg("[%s] req phonebook_type[%d][%s] index[%d]",
+               GET_CP_NAME(invocation), pb_delete.phonebook_type, dbg_dbus_pb_type_name[pb_delete.phonebook_type], pb_delete.index);
 
        tcore_user_request_set_data(ur, sizeof(struct treq_phonebook_delete_record), &pb_delete);
        tcore_user_request_set_command(ur, TREQ_PHONEBOOK_DELETERECORD);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -476,40 +425,33 @@ gboolean dbus_plugin_setup_phonebook_interface(TelephonyObjectSkeleton *object,
 
        dbg("phonebook = %p", phonebook);
 
-       g_signal_connect (phonebook,
-                       "handle-get-init-status",
-                       G_CALLBACK (on_phonebook_get_init_status),
-                       ctx);
-
-       g_signal_connect (phonebook,
-                       "handle-get-count",
-                       G_CALLBACK (on_phonebook_get_count),
-                       ctx);
-
-       g_signal_connect (phonebook,
-                       "handle-get-info",
-                       G_CALLBACK (on_phonebook_get_info),
-                       ctx);
-
-       g_signal_connect (phonebook,
-                       "handle-get-usim-meta-info",
-                       G_CALLBACK (on_phonebook_get_usim_info),
-                       ctx);
-
-       g_signal_connect (phonebook,
-                       "handle-read-record",
-                       G_CALLBACK (on_phonebook_read_record),
-                       ctx);
-
-       g_signal_connect (phonebook,
-                       "handle-update-record",
-                       G_CALLBACK (on_phonebook_update_record),
-                       ctx);
-
-       g_signal_connect (phonebook,
-                       "handle-delete-record",
-                       G_CALLBACK (on_phonebook_delete_record),
-                       ctx);
+       g_signal_connect(phonebook,
+               "handle-get-init-status",
+               G_CALLBACK(on_phonebook_get_init_status), ctx);
+
+       g_signal_connect(phonebook,
+               "handle-get-count",
+               G_CALLBACK(on_phonebook_get_count), ctx);
+
+       g_signal_connect(phonebook,
+               "handle-get-info",
+               G_CALLBACK(on_phonebook_get_info), ctx);
+
+       g_signal_connect(phonebook,
+               "handle-get-usim-meta-info",
+               G_CALLBACK(on_phonebook_get_usim_info), ctx);
+
+       g_signal_connect(phonebook,
+               "handle-read-record",
+               G_CALLBACK(on_phonebook_read_record), ctx);
+
+       g_signal_connect(phonebook,
+               "handle-update-record",
+               G_CALLBACK(on_phonebook_update_record), ctx);
+
+       g_signal_connect(phonebook,
+               "handle-delete-record",
+               G_CALLBACK(on_phonebook_delete_record), ctx);
 
        return TRUE;
 }
@@ -524,138 +466,147 @@ gboolean dbus_plugin_phonebook_response(struct custom_data *ctx, UserRequest *ur
        const struct tresp_phonebook_read_record *resp_pbread = data;
        const struct tresp_phonebook_update_record *resp_pbupdate = data;
        const struct tresp_phonebook_delete_record *resp_pbdelete = data;
+       char *cpname = dbus_info ? GET_CP_NAME(dbus_info->invocation) : "";
 
        switch (command) {
-               case TRESP_PHONEBOOK_GETCOUNT:
-                       dbg("GETCOUNT (type[%d][%s] used[%d]total[%d])",
-                               resp_pbcnt->type, dbg_dbus_pb_type_name[resp_pbcnt->type],
-                               resp_pbcnt->used_count, resp_pbcnt->total_count);
-                       telephony_phonebook_complete_get_count(dbus_info->interface_object, dbus_info->invocation,
-                                       resp_pbcnt->result, resp_pbcnt->type, resp_pbcnt->used_count, resp_pbcnt->total_count);
-                       break;
-
-               case TRESP_PHONEBOOK_GETMETAINFO:
-                       dbg("GETMETAINFO (type[%d][%s])", resp_entry->type, dbg_dbus_pb_type_name[resp_entry->type]);
-                       dbg("index(min[%d]max[%d]), num_max[%d] text(max[%d]used[%d])",
-                               resp_entry->index_min, resp_entry->index_max, resp_entry->number_length_max, resp_entry->text_length_max, resp_entry->used_count);
-                       telephony_phonebook_complete_get_info(dbus_info->interface_object, dbus_info->invocation,
-                                       resp_entry->result, resp_entry->type, resp_entry->index_min, resp_entry->index_max,
-                                       resp_entry->number_length_max, resp_entry->text_length_max, resp_entry->used_count);
-                       break;
-
-               case TRESP_PHONEBOOK_GETUSIMINFO:{
-                       GVariant *gv = NULL;
-                       GVariantBuilder b;
-                       int i;
-                       dbg("GETUSIMINFO");
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-
-                       for(i=0;i < resp_capa->field_count; i++){
-                               g_variant_builder_open(&b,G_VARIANT_TYPE("a{sv}"));
-                               dbg("type[%d][%s] index_max[%d] text_max[%d] used_count[%d]",
-                                       resp_capa->field_list[i].field,
-                                       dbg_dbus_pb_adf_field_name[resp_capa->field_list[i].field],
-                                       resp_capa->field_list[i].index_max,
-                                       resp_capa->field_list[i].text_max,
-                                       resp_capa->field_list[i].used_count);
-                               g_variant_builder_add(&b, "{sv}", "field_type", g_variant_new_int32(resp_capa->field_list[i].field));
-                               g_variant_builder_add(&b, "{sv}", "index_max", g_variant_new_int32(resp_capa->field_list[i].index_max));
-                               g_variant_builder_add(&b, "{sv}", "text_max", g_variant_new_int32(resp_capa->field_list[i].text_max));
-                               g_variant_builder_add(&b, "{sv}", "used_count", g_variant_new_int32(resp_capa->field_list[i].used_count));
-                               g_variant_builder_close(&b);
-                       }
-                       gv = g_variant_builder_end(&b);
+       case TRESP_PHONEBOOK_GETCOUNT:
+               dbg("[%s] GETCOUNT (type[%d][%s] used[%d]total[%d])",
+                       cpname, resp_pbcnt->type, dbg_dbus_pb_type_name[resp_pbcnt->type],
+                       resp_pbcnt->used_count, resp_pbcnt->total_count);
+               telephony_phonebook_complete_get_count(dbus_info->interface_object, dbus_info->invocation,
+                       resp_pbcnt->result, resp_pbcnt->type, resp_pbcnt->used_count, resp_pbcnt->total_count);
+               break;
+
+       case TRESP_PHONEBOOK_GETMETAINFO:
+               dbg("[%s] GETMETAINFO (type[%d][%s])",
+                       cpname, resp_entry->type, dbg_dbus_pb_type_name[resp_entry->type]);
+               dbg("index(min[%d]max[%d]), num_max[%d] text(max[%d]used[%d])",
+                       resp_entry->index_min, resp_entry->index_max, resp_entry->number_length_max,
+                       resp_entry->text_length_max, resp_entry->used_count);
+               telephony_phonebook_complete_get_info(dbus_info->interface_object, dbus_info->invocation,
+                       resp_entry->result, resp_entry->type, resp_entry->index_min, resp_entry->index_max,
+                       resp_entry->number_length_max, resp_entry->text_length_max, resp_entry->used_count);
+               break;
+
+       case TRESP_PHONEBOOK_GETUSIMINFO: {
+               GVariant *gv = NULL;
+               GVariantBuilder b;
+               int i;
+               dbg("[%s] GETUSIMINFO", cpname);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       telephony_phonebook_complete_get_usim_meta_info (dbus_info->interface_object, dbus_info->invocation,
-                                       resp_capa->result,
-                                       gv);
+               for (i = 0; i < resp_capa->field_count; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       dbg("type[%d][%s] index_max[%d] text_max[%d] used_count[%d]",
+                               resp_capa->field_list[i].field,
+                               dbg_dbus_pb_adf_field_name[resp_capa->field_list[i].field],
+                               resp_capa->field_list[i].index_max,
+                               resp_capa->field_list[i].text_max,
+                               resp_capa->field_list[i].used_count);
+                       g_variant_builder_add(&b, "{sv}", "field_type", g_variant_new_int32(resp_capa->field_list[i].field));
+                       g_variant_builder_add(&b, "{sv}", "index_max", g_variant_new_int32(resp_capa->field_list[i].index_max));
+                       g_variant_builder_add(&b, "{sv}", "text_max", g_variant_new_int32(resp_capa->field_list[i].text_max));
+                       g_variant_builder_add(&b, "{sv}", "used_count", g_variant_new_int32(resp_capa->field_list[i].used_count));
+                       g_variant_builder_close(&b);
                }
-                       break;
+               gv = g_variant_builder_end(&b);
 
-               case TRESP_PHONEBOOK_READRECORD: {
-                       unsigned char dest_pb_name[PHONEBOOK_NAME_BYTE_MAX + 1];
-                       unsigned char dest_pb_sne[PHONEBOOK_NAME_BYTE_MAX + 1];
-                       unsigned char dest_pb_email1[PHONEBOOK_EMAIL_BYTE_MAX + 1];
-                       memset(dest_pb_name, 0x00, PHONEBOOK_NAME_BYTE_MAX + 1);
-                       memset(dest_pb_sne, 0x00, PHONEBOOK_NAME_BYTE_MAX + 1);
-                       memset(dest_pb_email1, 0x00, PHONEBOOK_EMAIL_BYTE_MAX + 1);
-                       /* Additional e-mail fields (email 2,3,4) cannot be used to CP*/
+               telephony_phonebook_complete_get_usim_meta_info(dbus_info->interface_object,
+                       dbus_info->invocation, resp_capa->result, gv);
+               }
+               break;
+
+       case TRESP_PHONEBOOK_READRECORD: {
+               unsigned char dest_pb_name[PHONEBOOK_NAME_BYTE_MAX + 1];
+               unsigned char dest_pb_sne[PHONEBOOK_NAME_BYTE_MAX + 1];
+               unsigned char dest_pb_email1[PHONEBOOK_EMAIL_BYTE_MAX + 1];
+               memset(dest_pb_name, 0x00, PHONEBOOK_NAME_BYTE_MAX + 1);
+               memset(dest_pb_sne, 0x00, PHONEBOOK_NAME_BYTE_MAX + 1);
+               memset(dest_pb_email1, 0x00, PHONEBOOK_EMAIL_BYTE_MAX + 1);
+               /* Additional e-mail fields (email 2,3,4) cannot be used to CP*/
+
+               dbg("[%s] READRECORD (type[%d][%s] index[%d][%d])",
+                       cpname, resp_pbread->phonebook_type,
+                       dbg_dbus_pb_type_name[resp_pbread->phonebook_type],
+                       resp_pbread->index, resp_pbread->next_index);
+
+               if (resp_pbread->name_len > 0) {
+                       dbg("name:[%s] len:[%d]", resp_pbread->name, resp_pbread->name_len);
+                       memcpy(dest_pb_name, resp_pbread->name, resp_pbread->name_len);
+               }
 
-                       dbg("READRECORD (type[%d][%s] index[%d][%d])",
-                               resp_pbread->phonebook_type, dbg_dbus_pb_type_name[resp_pbread->phonebook_type], resp_pbread->index,resp_pbread->next_index);
+               dbg("number:[%s] ton:[%d][%s])",
+                       resp_pbread->number, resp_pbread->ton, dbg_dbus_pb_ton_name[resp_pbread->ton]);
 
-                       if (resp_pbread->name_len > 0) {
-                               dbg("name:[%s] len:[%d]",resp_pbread->name, resp_pbread->name_len);
-                               memcpy(dest_pb_name,resp_pbread->name,resp_pbread->name_len);
+               if (resp_pbread->phonebook_type == PB_TYPE_USIM) {
+                       if (resp_pbread->sne_len > 0) {
+                               dbg("sne:[%s] sne_len:[%d]", resp_pbread->sne, resp_pbread->sne_len);
+                               memcpy(dest_pb_sne, resp_pbread->sne, resp_pbread->sne_len);
                        }
 
-                       dbg("number:[%s] ton:[%d][%s])",
-                               resp_pbread->number,resp_pbread->ton, dbg_dbus_pb_ton_name[resp_pbread->ton] );
-
-                       if(resp_pbread->phonebook_type == PB_TYPE_USIM) {
-                               if (resp_pbread->sne_len > 0) {
-                                       dbg("sne:[%s] sne_len:[%d]", resp_pbread->sne,resp_pbread->sne_len);
-                                       memcpy(dest_pb_sne,resp_pbread->sne,resp_pbread->sne_len);
-                               }
-
-                               if (strlen((const char*)resp_pbread->anr1) != 0 || strlen((const char*)resp_pbread->anr2) != 0 || strlen((const char*)resp_pbread->anr3) != 0) {
-                                       dbg("anr1:([%s],ton[%d][%s])",resp_pbread->anr1,resp_pbread->anr1_ton, dbg_dbus_pb_ton_name[resp_pbread->anr1_ton]);
-                                       dbg("anr2:([%s],ton[%d][%s])",resp_pbread->anr2,resp_pbread->anr2_ton, dbg_dbus_pb_ton_name[resp_pbread->anr2_ton]);
-                                       dbg("anr3:([%s],ton[%d][%s])",resp_pbread->anr3,resp_pbread->anr3_ton, dbg_dbus_pb_ton_name[resp_pbread->anr3_ton]);
-                               }
-                               if (resp_pbread->email1_len > 0) {
-                                       dbg("email1:[%s] len:[%d]",resp_pbread->email1, resp_pbread->email1_len);
-                                       memcpy(dest_pb_email1, resp_pbread->email1, resp_pbread->email1_len);
-                               }
-                               /* Additional e-mail fields (email 2,3,4) cannot be used to CP*/
+                       if (strlen((const char*)resp_pbread->anr1) != 0 || strlen((const char*)resp_pbread->anr2) != 0 || strlen((const char*)resp_pbread->anr3) != 0) {
+                               dbg("anr1:([%s],ton[%d][%s])", resp_pbread->anr1,
+                                       resp_pbread->anr1_ton, dbg_dbus_pb_ton_name[resp_pbread->anr1_ton]);
+                               dbg("anr2:([%s],ton[%d][%s])", resp_pbread->anr2,
+                                       resp_pbread->anr2_ton, dbg_dbus_pb_ton_name[resp_pbread->anr2_ton]);
+                               dbg("anr3:([%s],ton[%d][%s])", resp_pbread->anr3,
+                                       resp_pbread->anr3_ton, dbg_dbus_pb_ton_name[resp_pbread->anr3_ton]);
                        }
-
-                       /*
-                        * Check whether NAME, SNE string values are invalid utf-8 string or not,
-                        * because if invalid it will be converted to "[INVALID UTF-8]" automatically by g_variant_new_string().
-                        */
-                       if (g_utf8_validate((const gchar *)dest_pb_name, -1, NULL) == FALSE) {
-                               tcore_util_hex_dump("[INVALID_UTF8_NAME] ", strlen((const char*)dest_pb_name), dest_pb_name);
-                               dbg("Empty NAME field.");
-                               memset(dest_pb_name, 0x00, PHONEBOOK_NAME_BYTE_MAX + 1);
+                       if (resp_pbread->email1_len > 0) {
+                               dbg("email1:[%s] len:[%d]", resp_pbread->email1, resp_pbread->email1_len);
+                               memcpy(dest_pb_email1, resp_pbread->email1, resp_pbread->email1_len);
                        }
-                       if(resp_pbread->phonebook_type == PB_TYPE_USIM) {
-                               if (g_utf8_validate((const gchar *)dest_pb_sne, -1, NULL) == FALSE) {
-                                       tcore_util_hex_dump("[INVALID_UTF8_SNE] ", strlen((const char*)dest_pb_sne), dest_pb_sne);
-                                       dbg("Empty SNE field.");
-                                       memset(dest_pb_sne, 0x00, PHONEBOOK_NAME_BYTE_MAX + 1);
-                               }
+                       /* Additional e-mail fields (email 2,3,4) cannot be used to CP*/
+               }
+
+               /*
+                * Check whether NAME, SNE string values are invalid utf-8 string or not,
+                * because if invalid it will be converted to "[INVALID UTF-8]" automatically by g_variant_new_string().
+                */
+               if (g_utf8_validate((const gchar *)dest_pb_name, -1, NULL) == FALSE) {
+                       tcore_util_hex_dump("[INVALID_UTF8_NAME] ", strlen((const char*)dest_pb_name), dest_pb_name);
+                       dbg("Empty NAME field.");
+                       memset(dest_pb_name, 0x00, PHONEBOOK_NAME_BYTE_MAX + 1);
+               }
+               if (resp_pbread->phonebook_type == PB_TYPE_USIM) {
+                       if (g_utf8_validate((const gchar *)dest_pb_sne, -1, NULL) == FALSE) {
+                               tcore_util_hex_dump("[INVALID_UTF8_SNE] ", strlen((const char*)dest_pb_sne), dest_pb_sne);
+                               dbg("Empty SNE field.");
+                               memset(dest_pb_sne, 0x00, PHONEBOOK_NAME_BYTE_MAX + 1);
                        }
+               }
 
-                       telephony_phonebook_complete_read_record(dbus_info->interface_object, dbus_info->invocation,
-                                                               resp_pbread->result, resp_pbread->phonebook_type, resp_pbread->index, resp_pbread->next_index,
-                                                               (const gchar *)dest_pb_name, resp_pbread->dcs,
-                                                               (const gchar *)resp_pbread->number, resp_pbread->ton,
-                                                               (const gchar *)dest_pb_sne, resp_pbread->sne_dcs,
-                                                               (const gchar *)resp_pbread->anr1, resp_pbread->anr1_ton,
-                                                               (const gchar *)resp_pbread->anr2, resp_pbread->anr2_ton,
-                                                               (const gchar *)resp_pbread->anr3, resp_pbread->anr3_ton,
-                                                               (const gchar *)dest_pb_email1,
-                                                               (const gchar *)resp_pbread->email2,
-                                                               (const gchar *)resp_pbread->email3,
-                                                               (const gchar *)resp_pbread->email4,
-                                                               resp_pbread->group_index);
-
-               }       break;
-
-               case TRESP_PHONEBOOK_UPDATERECORD:
-                       dbg("UPDATERECORD (result[%d])", resp_pbupdate->result);
-                       telephony_phonebook_complete_update_record(dbus_info->interface_object, dbus_info->invocation,resp_pbupdate->result);
-                       break;
-
-               case TRESP_PHONEBOOK_DELETERECORD:
-                       dbg("DELETERECORD (result[%d])", resp_pbdelete->result);
-                       telephony_phonebook_complete_delete_record(dbus_info->interface_object, dbus_info->invocation, resp_pbdelete->result);
-                       break;
-
-               default:
-                       dbg("not handled cmd[0x%x]", command);
-                       break;
+               telephony_phonebook_complete_read_record(dbus_info->interface_object, dbus_info->invocation,
+                       resp_pbread->result, resp_pbread->phonebook_type, resp_pbread->index, resp_pbread->next_index,
+                       (const gchar *)dest_pb_name, resp_pbread->dcs,
+                       (const gchar *)resp_pbread->number, resp_pbread->ton,
+                       (const gchar *)dest_pb_sne, resp_pbread->sne_dcs,
+                       (const gchar *)resp_pbread->anr1, resp_pbread->anr1_ton,
+                       (const gchar *)resp_pbread->anr2, resp_pbread->anr2_ton,
+                       (const gchar *)resp_pbread->anr3, resp_pbread->anr3_ton,
+                       (const gchar *)dest_pb_email1,
+                       (const gchar *)resp_pbread->email2,
+                       (const gchar *)resp_pbread->email3,
+                       (const gchar *)resp_pbread->email4,
+                       resp_pbread->group_index);
+               }
+               break;
+
+       case TRESP_PHONEBOOK_UPDATERECORD:
+               dbg("[%s] UPDATERECORD (result[%d])", cpname, resp_pbupdate->result);
+               telephony_phonebook_complete_update_record(dbus_info->interface_object,
+                       dbus_info->invocation, resp_pbupdate->result);
+               break;
+
+       case TRESP_PHONEBOOK_DELETERECORD:
+               dbg("[%s] DELETERECORD (result[%d])", cpname, resp_pbdelete->result);
+               telephony_phonebook_complete_delete_record(dbus_info->interface_object,
+                       dbus_info->invocation, resp_pbdelete->result);
+               break;
+
+       default:
+               dbg("not handled cmd[0x%x]", command);
+               break;
        }
 
        return TRUE;
@@ -666,37 +617,52 @@ gboolean dbus_plugin_phonebook_notification(struct custom_data *ctx, CoreObject
                unsigned int data_len, const void *data)
 {
        TelephonyPhonebook *phonebook;
-       const struct tnoti_phonebook_status *n_pb_status = data;
        const char *cp_name;
 
        cp_name = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
 
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-                               command, cp_name);
-
        phonebook = telephony_object_peek_phonebook(TELEPHONY_OBJECT(object));
+       if (phonebook == NULL) {
+               err("phonebook object is NULL!!!");
+               return FALSE;
+       }
+
        switch (command) {
-               case TNOTI_PHONEBOOK_STATUS :
+       case TNOTI_PHONEBOOK_STATUS: {
+               const struct tnoti_phonebook_status *n_pb_status = data;
 
 #ifdef ENABLE_KPI_LOGS
-                       if (n_pb_status->b_init == TRUE)
-                               TIME_CHECK("[%s] PBM Service Ready", cp_name);
+               if (n_pb_status->b_init == TRUE)
+                       TIME_CHECK("[%s] PBM Service Ready", cp_name);
 #endif
 
-                       telephony_phonebook_emit_status(phonebook,
-                               n_pb_status->b_init,
-                               n_pb_status->support_list.b_fdn,
-                               n_pb_status->support_list.b_adn,
-                               n_pb_status->support_list.b_sdn,
-                               n_pb_status->support_list.b_usim,
-                               n_pb_status->support_list.b_aas,
-                               n_pb_status->support_list.b_gas);
+               telephony_phonebook_emit_status(phonebook,
+                       n_pb_status->b_init,
+                       n_pb_status->support_list.b_fdn,
+                       n_pb_status->support_list.b_adn,
+                       n_pb_status->support_list.b_sdn,
+                       n_pb_status->support_list.b_usim,
+                       n_pb_status->support_list.b_aas,
+                       n_pb_status->support_list.b_gas);
+               }
+               break;
+
+       case TNOTI_PHONEBOOK_CONTACT_CHANGE: {
+               const struct tnoti_phonebook_contact_change *n_pb_contact_change = data;
 
-                       break;
+               dbg("phonebook_type [%d] index [%d] operation [%d]",
+                       n_pb_contact_change->phonebook_type, n_pb_contact_change->index, n_pb_contact_change->operation);
+
+               telephony_phonebook_emit_contact_change(phonebook,
+                       n_pb_contact_change->phonebook_type,
+                       n_pb_contact_change->index,
+                       n_pb_contact_change->operation);
+               }
+               break;
 
-               default:
-                       dbg("not handled cmd[0x%x]", command);
-                       break;
+       default:
+               dbg("not handled cmd[0x%x]", command);
+               break;
        }
 
        return TRUE;
index dd4dba1..cf63a0a 100644 (file)
--- a/src/sap.c
+++ b/src/sap.c
@@ -45,9 +45,9 @@ static gboolean on_sap_connect(TelephonySap *sap, GDBusMethodInvocation *invocat
        UserRequest *ur = NULL;
        TReturn ret;
        struct treq_sap_req_connect req_conn;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAP, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SAP, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, sap, invocation);
@@ -58,9 +58,9 @@ static gboolean on_sap_connect(TelephonySap *sap, GDBusMethodInvocation *invocat
        tcore_user_request_set_data(ur, sizeof(struct treq_sap_req_connect), &req_conn);
        tcore_user_request_set_command(ur, TREQ_SAP_REQ_CONNECT);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -72,18 +72,18 @@ static gboolean on_sap_disconnect(TelephonySap *sap, GDBusMethodInvocation *invo
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAP, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SAP, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, sap, invocation);
 
        tcore_user_request_set_command(ur, TREQ_SAP_REQ_DISCONNECT);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -95,18 +95,18 @@ static gboolean on_sap_get_status(TelephonySap *sap, GDBusMethodInvocation *invo
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAP, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SAP, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, sap, invocation);
 
        tcore_user_request_set_command(ur, TREQ_SAP_REQ_STATUS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -118,18 +118,18 @@ static gboolean on_sap_get_atr(TelephonySap *sap, GDBusMethodInvocation *invocat
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAP, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SAP, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, sap, invocation);
 
        tcore_user_request_set_command(ur, TREQ_SAP_REQ_ATR);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -146,12 +146,12 @@ static gboolean on_sap_transfer_apdu(TelephonySap *sap, GDBusMethodInvocation *i
        GVariantIter *iter = NULL;
        GVariant *inner_gv = NULL;
        guchar rt_i;
-       int i =0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       int i = 0;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        dbg("Func Entrance");
 
-       if (!check_access_control (p_cynara, invocation, AC_SAP, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SAP, "x"))
                return TRUE;
 
        memset(&t_apdu, 0, sizeof(struct treq_sap_transfer_apdu));
@@ -159,7 +159,7 @@ static gboolean on_sap_transfer_apdu(TelephonySap *sap, GDBusMethodInvocation *i
        inner_gv = g_variant_get_variant(arg_req_apdu);
 
        g_variant_get(inner_gv, "ay", &iter);
-       while ( g_variant_iter_loop (iter, "y", &rt_i)) {
+       while (g_variant_iter_loop(iter, "y", &rt_i)) {
                t_apdu.apdu_data[i] = rt_i;
                i++;
        }
@@ -168,16 +168,16 @@ static gboolean on_sap_transfer_apdu(TelephonySap *sap, GDBusMethodInvocation *i
        g_variant_unref(inner_gv);
        g_variant_unref(arg_req_apdu);
 
-       for(i=0; i < (int)t_apdu.apdu_length; i++)
-               dbg("apdu[%d][0x%02x]",i, t_apdu.apdu_data[i]);
+       for (i = 0; i < (int)t_apdu.apdu_length; i++)
+               dbg("apdu[%d][0x%02x]", i, t_apdu.apdu_data[i]);
 
        ur = MAKE_UR(ctx, sap, invocation);
        tcore_user_request_set_data(ur, sizeof(struct treq_sap_transfer_apdu), &t_apdu);
        tcore_user_request_set_command(ur, TREQ_SAP_TRANSFER_APDU);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -191,9 +191,9 @@ static gboolean on_sap_set_protocol(TelephonySap *sap, GDBusMethodInvocation *in
        UserRequest *ur = NULL;
        TReturn ret;
        struct treq_sap_set_protocol set_protocol;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAP, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_SAP, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, sap, invocation);
@@ -204,9 +204,9 @@ static gboolean on_sap_set_protocol(TelephonySap *sap, GDBusMethodInvocation *in
        tcore_user_request_set_data(ur, sizeof(struct treq_sap_set_protocol), &set_protocol);
        tcore_user_request_set_command(ur, TREQ_SAP_SET_PROTOCOL);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -220,9 +220,9 @@ static gboolean on_sap_set_power(TelephonySap *sap, GDBusMethodInvocation *invoc
        UserRequest *ur = NULL;
        TReturn ret;
        struct treq_sap_set_power set_power;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAP, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_SAP, "w"))
                return TRUE;
 
        ur = MAKE_UR(ctx, sap, invocation);
@@ -233,9 +233,9 @@ static gboolean on_sap_set_power(TelephonySap *sap, GDBusMethodInvocation *invoc
        tcore_user_request_set_data(ur, sizeof(struct treq_sap_set_power), &set_power);
        tcore_user_request_set_command(ur, TREQ_SAP_SET_POWER);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -247,18 +247,18 @@ static gboolean on_sap_get_card_reader_status(TelephonySap *sap, GDBusMethodInvo
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAP, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SAP, "r"))
                return TRUE;
 
        ur = MAKE_UR(ctx, sap, invocation);
 
        tcore_user_request_set_command(ur, TREQ_SAP_REQ_CARDREADERSTATUS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -275,45 +275,37 @@ gboolean dbus_plugin_setup_sap_interface(TelephonyObjectSkeleton *object, struct
 
        dbg("sap = %p", sap);
 
-       g_signal_connect (sap,
-                       "handle-connect",
-                       G_CALLBACK (on_sap_connect),
-                       ctx);
-
-       g_signal_connect (sap,
-                       "handle-disconnect",
-                       G_CALLBACK (on_sap_disconnect),
-                       ctx);
-
-       g_signal_connect (sap,
-                       "handle-get-status",
-                       G_CALLBACK (on_sap_get_status),
-                       ctx);
-
-       g_signal_connect (sap,
-                       "handle-get-atr",
-                       G_CALLBACK (on_sap_get_atr),
-                       ctx);
-
-       g_signal_connect (sap,
-                       "handle-transfer-apdu",
-                       G_CALLBACK (on_sap_transfer_apdu),
-                       ctx);
-
-       g_signal_connect (sap,
-                       "handle-set-protocol",
-                       G_CALLBACK (on_sap_set_protocol),
-                       ctx);
-
-       g_signal_connect (sap,
-                       "handle-set-power",
-                       G_CALLBACK (on_sap_set_power),
-                       ctx);
-
-       g_signal_connect (sap,
-                       "handle-get-card-reader-status",
-                       G_CALLBACK (on_sap_get_card_reader_status),
-                       ctx);
+       g_signal_connect(sap,
+               "handle-connect",
+               G_CALLBACK(on_sap_connect), ctx);
+
+       g_signal_connect(sap,
+               "handle-disconnect",
+               G_CALLBACK(on_sap_disconnect), ctx);
+
+       g_signal_connect(sap,
+               "handle-get-status",
+               G_CALLBACK(on_sap_get_status), ctx);
+
+       g_signal_connect(sap,
+               "handle-get-atr",
+               G_CALLBACK(on_sap_get_atr), ctx);
+
+       g_signal_connect(sap,
+               "handle-transfer-apdu",
+               G_CALLBACK(on_sap_transfer_apdu), ctx);
+
+       g_signal_connect(sap,
+               "handle-set-protocol",
+               G_CALLBACK(on_sap_set_protocol), ctx);
+
+       g_signal_connect(sap,
+               "handle-set-power",
+               G_CALLBACK(on_sap_set_power), ctx);
+
+       g_signal_connect(sap,
+               "handle-get-card-reader-status",
+               G_CALLBACK(on_sap_get_card_reader_status), ctx);
 
        return TRUE;
 }
@@ -331,87 +323,85 @@ gboolean dbus_plugin_sap_response(struct custom_data *ctx, UserRequest *ur,
        const struct tresp_sap_set_power *sap_power = data;
        const struct tresp_sap_req_cardreaderstatus *sap_reader = data;
 
-       dbg("application Command = [0x%x], data_len = %d",command, data_len);
-
        switch (command) {
-               case TRESP_SAP_REQ_CONNECT:
-                       dbg("dbus comm - TRESP_SAP_REQ_CONNECT");
-                       telephony_sap_complete_connect(dbus_info->interface_object, dbus_info->invocation,
-                                       sap_conn->status, sap_conn->max_msg_size);
-                       break;
-
-               case TRESP_SAP_REQ_DISCONNECT:
-                       dbg("dbus comm - TRESP_SAP_REQ_DISCONNECT");
-                       telephony_sap_complete_disconnect(dbus_info->interface_object, dbus_info->invocation,
-                                       sap_disconn->result);
-                       break;
-
-               case TRESP_SAP_REQ_STATUS:
-                       dbg("dbus comm - TRESP_SAP_REQ_STATUS");
-                       telephony_sap_complete_get_status(dbus_info->interface_object, dbus_info->invocation,
-                                       sap_status->status);
-                       break;
-
-               case TRESP_SAP_REQ_ATR: {
-                       GVariantBuilder builder;
-                       GVariant * atr_gv = NULL;
-                       GVariant *inner_gv = NULL;
-                       int i =0;
-
-                       dbg("dbus comm - TRESP_SAP_REQ_ATR");
-                       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-                       for(i = 0; i < (int)sap_atr->atr_length; i++) {
-                               dbg("sap_atr->atr[%d][0x%02x]", i,sap_atr->atr[i]);
-                               g_variant_builder_add (&builder, "y", sap_atr->atr[i]);
-                       }
-                       inner_gv = g_variant_builder_end(&builder);
-                       atr_gv = g_variant_new("v", inner_gv);
-
-                       telephony_sap_complete_get_atr(dbus_info->interface_object, dbus_info->invocation,
-                                       sap_atr->result, atr_gv);
+       case TRESP_SAP_REQ_CONNECT:
+               dbg("dbus comm - TRESP_SAP_REQ_CONNECT");
+               telephony_sap_complete_connect(dbus_info->interface_object, dbus_info->invocation,
+                               sap_conn->status, sap_conn->max_msg_size);
+               break;
+
+       case TRESP_SAP_REQ_DISCONNECT:
+               dbg("dbus comm - TRESP_SAP_REQ_DISCONNECT");
+               telephony_sap_complete_disconnect(dbus_info->interface_object, dbus_info->invocation,
+                               sap_disconn->result);
+               break;
+
+       case TRESP_SAP_REQ_STATUS:
+               dbg("dbus comm - TRESP_SAP_REQ_STATUS");
+               telephony_sap_complete_get_status(dbus_info->interface_object, dbus_info->invocation,
+                               sap_status->status);
+               break;
+
+       case TRESP_SAP_REQ_ATR: {
+               GVariantBuilder builder;
+               GVariant * atr_gv = NULL;
+               GVariant *inner_gv = NULL;
+               int i = 0;
+
+               dbg("dbus comm - TRESP_SAP_REQ_ATR");
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < (int)sap_atr->atr_length; i++) {
+                       dbg("sap_atr->atr[%d][0x%02x]", i, sap_atr->atr[i]);
+                       g_variant_builder_add(&builder, "y", sap_atr->atr[i]);
                }
-                       break;
-
-               case TRESP_SAP_TRANSFER_APDU: {
-                       GVariantBuilder builder;
-                       GVariant * apdu_gv = NULL;
-                       GVariant *inner_gv = NULL;
-                       int i =0;
-
-                       dbg("dbus comm - TRESP_SAP_TRANSFER_APDU");
-                       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-                       for(i = 0; i < (int)sap_apdu->resp_apdu_length; i++) {
-                               dbg("sap_apdu->resp_adpdu[%d][0x%02x]", i,sap_apdu->resp_adpdu[i]);
-                               g_variant_builder_add (&builder, "y", sap_apdu->resp_adpdu[i]);
-                       }
-                       inner_gv = g_variant_builder_end(&builder);
-                       apdu_gv = g_variant_new("v", inner_gv);
-
-                       telephony_sap_complete_transfer_apdu(dbus_info->interface_object, dbus_info->invocation,
-                                       sap_apdu->result, apdu_gv);
+               inner_gv = g_variant_builder_end(&builder);
+               atr_gv = g_variant_new("v", inner_gv);
+
+               telephony_sap_complete_get_atr(dbus_info->interface_object, dbus_info->invocation,
+                               sap_atr->result, atr_gv);
+       }
+               break;
+
+       case TRESP_SAP_TRANSFER_APDU: {
+               GVariantBuilder builder;
+               GVariant * apdu_gv = NULL;
+               GVariant *inner_gv = NULL;
+               int i = 0;
+
+               dbg("dbus comm - TRESP_SAP_TRANSFER_APDU");
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < (int)sap_apdu->resp_apdu_length; i++) {
+                       dbg("sap_apdu->resp_adpdu[%d][0x%02x]", i, sap_apdu->resp_adpdu[i]);
+                       g_variant_builder_add(&builder, "y", sap_apdu->resp_adpdu[i]);
                }
-                       break;
-
-               case TRESP_SAP_SET_PROTOCOL:
-                       dbg("dbus comm - TRESP_SAP_SET_PROTOCOL");
-                       telephony_sap_complete_set_protocol(dbus_info->interface_object, dbus_info->invocation,
-                                       sap_protocol->result);
-                       break;
-
-               case TRESP_SAP_SET_POWER:
-                       dbg("dbus comm - TRESP_SAP_SET_POWER");
-                       telephony_sap_complete_set_power(dbus_info->interface_object, dbus_info->invocation,
-                                       sap_power->result);
-                       break;
-
-               case TRESP_SAP_REQ_CARDREADERSTATUS:
-                       dbg("dbus comm - TRESP_SAP_REQ_CARDREADERSTATUS");
-                       telephony_sap_complete_get_card_reader_status(dbus_info->interface_object, dbus_info->invocation,
-                                       sap_reader->result, sap_reader->reader_status);
-                       break;
-
-               default:
-                       dbg("not handled command[%d]", command);
+               inner_gv = g_variant_builder_end(&builder);
+               apdu_gv = g_variant_new("v", inner_gv);
+
+               telephony_sap_complete_transfer_apdu(dbus_info->interface_object, dbus_info->invocation,
+                               sap_apdu->result, apdu_gv);
+       }
+               break;
+
+       case TRESP_SAP_SET_PROTOCOL:
+               dbg("dbus comm - TRESP_SAP_SET_PROTOCOL");
+               telephony_sap_complete_set_protocol(dbus_info->interface_object, dbus_info->invocation,
+                               sap_protocol->result);
+               break;
+
+       case TRESP_SAP_SET_POWER:
+               dbg("dbus comm - TRESP_SAP_SET_POWER");
+               telephony_sap_complete_set_power(dbus_info->interface_object, dbus_info->invocation,
+                               sap_power->result);
+               break;
+
+       case TRESP_SAP_REQ_CARDREADERSTATUS:
+               dbg("dbus comm - TRESP_SAP_REQ_CARDREADERSTATUS");
+               telephony_sap_complete_get_card_reader_status(dbus_info->interface_object, dbus_info->invocation,
+                               sap_reader->result, sap_reader->reader_status);
+               break;
+
+       default:
+               dbg("not handled command[%d]", command);
                break;
        }
 
@@ -430,22 +420,24 @@ gboolean dbus_plugin_sap_notification(struct custom_data *ctx, CoreObject *sourc
                dbg("object is NULL");
                return FALSE;
        }
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-                               command, tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source)));
 
        sap = telephony_object_peek_sap(TELEPHONY_OBJECT(object));
+       if (sap == NULL) {
+               err("sap object is NULL!!!");
+               return FALSE;
+       }
 
        switch (command) {
-               case TNOTI_SAP_STATUS:
-                       dbg("notified sap_status[%d]", n_sap_status->status);
-                       telephony_sap_emit_status(sap, n_sap_status->status);
-                       break;
-               case TNOTI_SAP_DISCONNECT:
-                       dbg("notified sap_disconnect type[%d]", n_sap_disconn->type);
-                       telephony_sap_emit_disconnect(sap, n_sap_disconn->type);
-                       break;
-               default:
-                       dbg("not handled command[%d]", command);
+       case TNOTI_SAP_STATUS:
+               dbg("notified sap_status[%d]", n_sap_status->status);
+               telephony_sap_emit_status(sap, n_sap_status->status);
+               break;
+       case TNOTI_SAP_DISCONNECT:
+               dbg("notified sap_disconnect type[%d]", n_sap_disconn->type);
+               telephony_sap_emit_disconnect(sap, n_sap_disconn->type);
+               break;
+       default:
+               dbg("not handled command[%d]", command);
                break;
        }
 
old mode 100755 (executable)
new mode 100644 (file)
index 4054d5e..e6f70fc
--- a/src/sat.c
+++ b/src/sat.c
@@ -38,7 +38,6 @@
 #include "common.h"
 #include "sat_manager.h"
 #include "sat_ui_support/sat_ui_support.h"
-#include "package-manager.h"
 
 static void _sat_set_main_menu(struct custom_data *ctx, const char *cp_name, GVariant *main_menu)
 {
@@ -50,7 +49,7 @@ static void _sat_set_main_menu(struct custom_data *ctx, const char *cp_name, GVa
                if (object == NULL)
                        continue;
 
-               if (g_strcmp0(object->cp_name, cp_name) == 0 ) {
+               if (g_strcmp0(object->cp_name, cp_name) == 0) {
                        /* need to free the previous main_menu */
                        g_variant_unref(object->cached_sat_main_menu);
                        object->cached_sat_main_menu = main_menu;
@@ -106,13 +105,13 @@ static gboolean on_sat_get_main_menu_info(TelephonySAT *sat, GDBusMethodInvocati
        GVariant *icon_id = NULL;
        GVariant *icon_list = NULL;
 #endif
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAT, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SAT, "r"))
                return TRUE;
 
        main_menu = _sat_get_main_menu(ctx, GET_CP_NAME(invocation));
-       if(!main_menu){
+       if (!main_menu) {
                dbg("no main menu");
                return FALSE;
        }
@@ -146,14 +145,14 @@ static gboolean on_sat_send_display_status(TelephonySAT *sat, GDBusMethodInvocat
        struct custom_data *ctx = user_data;
        gboolean result = FALSE;
        gint out_param = 1;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAT, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
                return TRUE;
 
        cp_name = GET_CP_NAME(invocation);
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                out_param = 0;
                telephony_sat_complete_send_ui_display_status(sat, invocation, out_param);
@@ -161,9 +160,8 @@ static gboolean on_sat_send_display_status(TelephonySAT *sat, GDBusMethodInvocat
        }
 
        result = sat_manager_handle_ui_display_status(ctx, plg, arg_command_id, arg_display_status);
-       if(!result){
+       if (!result)
                dbg("fail to send exec result");
-       }
 
        out_param = (result ? 1 : 0);
        telephony_sat_complete_send_ui_display_status(sat, invocation, out_param);
@@ -177,18 +175,18 @@ static gboolean on_sat_send_user_confirm(TelephonySAT *sat, GDBusMethodInvocatio
        TcorePlugin *plg = NULL;
        char *cp_name;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        gboolean result = FALSE;
        gint out_param = 1;
        GVariant *confirm_data = NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAT, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
                return TRUE;
 
        cp_name = GET_CP_NAME(invocation);
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                out_param = 0;
                telephony_sat_complete_send_user_confirm(sat, invocation, out_param);
@@ -198,9 +196,8 @@ static gboolean on_sat_send_user_confirm(TelephonySAT *sat, GDBusMethodInvocatio
        confirm_data = g_variant_new("(iiv)", arg_command_id, arg_user_confirm_type, arg_additional_data);
 
        result = sat_manager_handle_user_confirm(ctx, plg, confirm_data);
-       if(!result){
+       if (!result)
                dbg("fail to send user confirm");
-       }
 
        out_param = (result ? 1 : 0);
        telephony_sat_complete_send_user_confirm(sat, invocation, out_param);
@@ -215,17 +212,17 @@ static gboolean on_sat_send_app_exec_result(TelephonySAT *sat, GDBusMethodInvoca
        TcorePlugin *plg = NULL;
        char *cp_name;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        gboolean result = FALSE;
        gint out_param = 1;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAT, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
                return TRUE;
 
        cp_name = GET_CP_NAME(invocation);
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                out_param = 0;
                telephony_sat_complete_send_app_exec_result(sat, invocation, out_param);
@@ -234,9 +231,8 @@ static gboolean on_sat_send_app_exec_result(TelephonySAT *sat, GDBusMethodInvoca
 
        dbg("processing app exec result");
        result = sat_manager_handle_app_exec_result(ctx, plg, arg_command_id, arg_command_type, arg_exec_result);
-       if(!result){
+       if (!result)
                dbg("fail to send exec result");
-       }
 
        out_param = (result ? 1 : 0);
        telephony_sat_complete_send_app_exec_result(sat, invocation, out_param);
@@ -251,9 +247,9 @@ static gboolean on_sat_select_menu(TelephonySAT *sat, GDBusMethodInvocation *inv
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        struct treq_sat_envelop_cmd_data envelop_data;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAT, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, sat, invocation);
@@ -267,9 +263,9 @@ static gboolean on_sat_select_menu(TelephonySAT *sat, GDBusMethodInvocation *inv
        tcore_user_request_set_data(ur, sizeof(struct treq_sat_envelop_cmd_data), &envelop_data);
        tcore_user_request_set_command(ur, TREQ_SAT_REQ_ENVELOPE);
        rv = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(rv != TCORE_RETURN_SUCCESS){
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", rv);
+       if (rv != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", rv);
                tcore_user_request_unref(ur);
        }
 
@@ -277,18 +273,18 @@ static gboolean on_sat_select_menu(TelephonySAT *sat, GDBusMethodInvocation *inv
 }
 
 static gboolean on_sat_download_event(TelephonySAT *sat, GDBusMethodInvocation *invocation,
-               gint arg_event_download_type, gint arg_src_device,gint arg_dest_device,
+               gint arg_event_download_type, gint arg_src_device, gint arg_dest_device,
                GVariant *arg_download_data, gpointer user_data)
 {
        gboolean b_event = FALSE;
        TReturn rv;
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        struct treq_sat_envelop_cmd_data envelop_data;
 
-       if (!check_access_control (p_cynara, invocation, AC_SAT, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
                return TRUE;
 
        ur = MAKE_UR(ctx, sat, invocation);
@@ -298,7 +294,7 @@ static gboolean on_sat_download_event(TelephonySAT *sat, GDBusMethodInvocation *
        b_event = sat_manager_handle_event_download_envelop(arg_event_download_type, arg_src_device, arg_dest_device,
                                &envelop_data.envelop_data.event_download, arg_download_data);
 
-       if(!b_event){
+       if (!b_event) {
                telephony_sat_complete_download_event(sat, invocation, -1, ENVELOPE_FAILED);
                tcore_user_request_unref(ur);
                return TRUE;
@@ -307,9 +303,9 @@ static gboolean on_sat_download_event(TelephonySAT *sat, GDBusMethodInvocation *
        tcore_user_request_set_data(ur, sizeof(struct treq_sat_envelop_cmd_data), &envelop_data);
        tcore_user_request_set_command(ur, TREQ_SAT_REQ_ENVELOPE);
        rv = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if(rv != TCORE_RETURN_SUCCESS){
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", rv);
+       if (rv != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", rv);
                tcore_user_request_unref(ur);
        }
 
@@ -326,35 +322,29 @@ gboolean dbus_plugin_setup_sat_interface(TelephonyObjectSkeleton *object, struct
 
        dbg("sat = %p", sat);
 
-       g_signal_connect (sat,
-                       "handle-get-main-menu-info",
-                       G_CALLBACK (on_sat_get_main_menu_info),
-                       ctx);
+       g_signal_connect(sat,
+               "handle-get-main-menu-info",
+               G_CALLBACK(on_sat_get_main_menu_info), ctx);
 
-       g_signal_connect (sat,
-                       "handle-send-ui-display-status",
-                       G_CALLBACK (on_sat_send_display_status),
-                       ctx);
+       g_signal_connect(sat,
+               "handle-send-ui-display-status",
+               G_CALLBACK(on_sat_send_display_status), ctx);
 
-       g_signal_connect (sat,
-                       "handle-send-user-confirm",
-                       G_CALLBACK (on_sat_send_user_confirm),
-                       ctx);
+       g_signal_connect(sat,
+               "handle-send-user-confirm",
+               G_CALLBACK(on_sat_send_user_confirm), ctx);
 
-       g_signal_connect (sat,
-                       "handle-send-app-exec-result",
-                       G_CALLBACK (on_sat_send_app_exec_result),
-                       ctx);
+       g_signal_connect(sat,
+               "handle-send-app-exec-result",
+               G_CALLBACK(on_sat_send_app_exec_result), ctx);
 
-       g_signal_connect (sat,
-                       "handle-select-menu",
-                       G_CALLBACK (on_sat_select_menu),
-                       ctx);
+       g_signal_connect(sat,
+               "handle-select-menu",
+               G_CALLBACK(on_sat_select_menu), ctx);
 
-       g_signal_connect (sat,
-                       "handle-download-event",
-                       G_CALLBACK (on_sat_download_event),
-                       ctx);
+       g_signal_connect(sat,
+               "handle-download-event",
+               G_CALLBACK(on_sat_download_event), ctx);
 
        return TRUE;
 }
@@ -365,31 +355,28 @@ gboolean dbus_plugin_sat_response(struct custom_data *ctx, UserRequest *ur,
 {
        const struct tresp_sat_envelop_data *envelop_rsp = NULL;
 
-       dbg("sat response command = [0x%x], data_len = %d", command, data_len);
-
        switch (command) {
-               case TRESP_SAT_REQ_ENVELOPE: {
-                       envelop_rsp = (struct tresp_sat_envelop_data *)data;
+       case TRESP_SAT_REQ_ENVELOPE: {
+               envelop_rsp = (struct tresp_sat_envelop_data *)data;
 
-                       dbg("envelop sub_cmd(%d) result(%d) rsp(%d)", envelop_rsp->sub_cmd, envelop_rsp->result, envelop_rsp->envelop_resp);
+               dbg("envelop sub_cmd(%d) result(%d) rsp(%d)", envelop_rsp->sub_cmd, envelop_rsp->result, envelop_rsp->envelop_resp);
 
-                       if(envelop_rsp->sub_cmd == ENVELOP_MENU_SELECTION){
-                               telephony_sat_complete_select_menu(dbus_info->interface_object, dbus_info->invocation,
-                                               envelop_rsp->result, envelop_rsp->envelop_resp);
-                       }
-                       else if(envelop_rsp->sub_cmd == ENVELOP_EVENT_DOWNLOAD){
-                               telephony_sat_complete_download_event(dbus_info->interface_object, dbus_info->invocation,
-                                               envelop_rsp->result, envelop_rsp->envelop_resp);
-                       }
-               } break;
+               if (envelop_rsp->sub_cmd == ENVELOP_MENU_SELECTION) {
+                       telephony_sat_complete_select_menu(dbus_info->interface_object, dbus_info->invocation,
+                                       envelop_rsp->result, envelop_rsp->envelop_resp);
+               } else if (envelop_rsp->sub_cmd == ENVELOP_EVENT_DOWNLOAD) {
+                       telephony_sat_complete_download_event(dbus_info->interface_object, dbus_info->invocation,
+                                       envelop_rsp->result, envelop_rsp->envelop_resp);
+               }
+       } break;
 
-               case TRESP_SAT_REQ_TERMINALRESPONSE:
-                       dbg("receive TRESP_SAT_REQ_TERMINALRESPONSE");
-               break;
+       case TRESP_SAT_REQ_TERMINALRESPONSE:
+               dbg("receive TRESP_SAT_REQ_TERMINALRESPONSE");
+       break;
 
-               default:
-                       dbg("not handled command[%d]", command);
-               break;
+       default:
+               dbg("not handled command[%d]", command);
+       break;
        }
        return TRUE;
 }
@@ -407,116 +394,104 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                return FALSE;
        }
        cp_name  = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
-
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-                               command, cp_name);
-
        slot_id = get_sim_slot_id_by_cp_name((char *)cp_name);
        dbg("slot_id: [%d]", slot_id);
 
        sat = telephony_object_peek_sat(TELEPHONY_OBJECT(object));
+       if (sat == NULL) {
+               err("sat object is NULL!!!");
+               return FALSE;
+       }
 
-       //session end notification
+       /* session end notification */
        switch (command) {
-               case TNOTI_SAT_SESSION_END: {
-
+       case TNOTI_SAT_SESSION_END: {
                dbg("notified sat session end evt");
                sat_manager_init_queue(ctx, cp_name);
 
-                       //sat_ui_support_terminate_sat_ui();
-                       telephony_sat_emit_end_proactive_session(sat, SAT_PROATV_CMD_TYPE_END_PROACTIVE_SESSION);
-                       return TRUE;
-               }
-               break;
+               /* sat_ui_support_terminate_sat_ui(); */
+               telephony_sat_emit_end_proactive_session(sat, SAT_PROATV_CMD_TYPE_END_PROACTIVE_SESSION);
+               return TRUE;
+               } break;
 
-               //call control notification
-               case TNOTI_SAT_CALL_CTRL_RESULT: {
-                       struct tnoti_sat_call_control_result_ind *cc_result_noti = NULL;
-                       gint call_ctrl_result = 0, bc_repeat_indicator = 0, ton = 0x0F, npi=0X0F;
-                       gchar *text = NULL, *call_num = NULL, *ss_string = NULL, *sub_addr = NULL, *ccp1 = NULL, *ccp2 = NULL;
+       /* call control notification */
+       case TNOTI_SAT_CALL_CTRL_RESULT: {
+               struct tnoti_sat_call_control_result_ind *cc_result_noti = NULL;
+               gint call_ctrl_result = 0, bc_repeat_indicator = 0, ton = 0x0F, npi = 0X0F;
+               gchar *text = NULL, *call_num = NULL, *ss_string = NULL, *sub_addr = NULL, *ccp1 = NULL, *ccp2 = NULL;
 
-                       cc_result_noti = (struct tnoti_sat_call_control_result_ind *)data;
-                       if (cc_result_noti == NULL) {
-                               err("Indication data is NULL");
-                               return FALSE;
-                       }
-                       dbg("sat call control result notification");
+               cc_result_noti = (struct tnoti_sat_call_control_result_ind *)data;
+               if (cc_result_noti == NULL) {
+                       err("Indication data is NULL");
+                       return FALSE;
+               }
+               dbg("sat call control result notification");
 
                call_ctrl_result = cc_result_noti->cc_result;
                bc_repeat_indicator = cc_result_noti->bc_repeat_type.bc_indi_repeat_type;
 
-               if(cc_result_noti->address.dialing_number_len > 0){
+               if (cc_result_noti->address.dialing_number_len > 0) {
                        ton = cc_result_noti->address.ton;
                        npi = cc_result_noti->address.npi;
-                       if(ton == TON_INTERNATIONAL)
+                       if (ton == TON_INTERNATIONAL)
                                call_num = g_strdup_printf("+%s", cc_result_noti->address.dialing_number);
                        else
                                call_num = g_strdup(cc_result_noti->address.dialing_number);
                        ss_string = g_strdup("");
-               }
-               else if(cc_result_noti->ss_string.string_len > 0){
+               } else if (cc_result_noti->ss_string.string_len > 0) {
                        ton = cc_result_noti->ss_string.ton;
                        npi = cc_result_noti->ss_string.npi;
                        call_num = g_strdup("");
                        ss_string = g_strdup(cc_result_noti->ss_string.ss_string);
                }
 
-               if(cc_result_noti->alpha_id.alpha_data_len > 0){
+               if (cc_result_noti->alpha_id.alpha_data_len > 0)
                        text = g_strdup(cc_result_noti->alpha_id.alpha_data);
-               }
-               else{
+               else
                        text = g_strdup("");
-               }
 
-               if(cc_result_noti->sub_address.subaddress_len > 0){
+               if (cc_result_noti->sub_address.subaddress_len > 0)
                        sub_addr = g_strdup(cc_result_noti->sub_address.subaddress);
-               }
-               else{
+               else
                        sub_addr = g_strdup("");
-               }
 
-               if(cc_result_noti->ccp1.data_len > 0){
+               if (cc_result_noti->ccp1.data_len > 0)
                        ccp1 = g_strdup(cc_result_noti->ccp1.data);
-               }
-               else{
+               else
                        ccp1 = g_strdup("");
-               }
 
 
-               if(cc_result_noti->ccp2.data_len > 0){
+               if (cc_result_noti->ccp2.data_len > 0)
                        ccp2 = g_strdup(cc_result_noti->ccp2.data);
-               }
-               else{
+               else
                        ccp2 = g_strdup("");
-               }
 
                telephony_sat_emit_call_control_result(sat, call_ctrl_result, text, ton, npi, call_num,
                        ss_string, sub_addr, ccp1, ccp2, bc_repeat_indicator);
 
-                       g_free(text); g_free(call_num); g_free(ss_string); g_free(sub_addr); g_free(ccp1); g_free(ccp2);
-                       return TRUE;
-               }
-               break;
+               g_free(text); g_free(call_num); g_free(ss_string); g_free(sub_addr); g_free(ccp1); g_free(ccp2);
+               return TRUE;
+               } break;
 
-               case TNOTI_SAT_MO_SM_CTRL_RESULT: {
-                       struct tnoti_sat_mo_sm_control_result_ind *mo_sm_result_noti = NULL;
-                       gint call_ctrl_result = 0;
-                       gint rp_dst_ton = 0x0F, rp_dst_npi = 0X0F, tp_dst_ton = 0x0F, tp_dst_npi = 0X0F;
-                       gchar *text = NULL, *rp_dst_call_num = NULL, *tp_dst_call_num = NULL;
+       case TNOTI_SAT_MO_SM_CTRL_RESULT: {
+               struct tnoti_sat_mo_sm_control_result_ind *mo_sm_result_noti = NULL;
+               gint call_ctrl_result = 0;
+               gint rp_dst_ton = 0x0F, rp_dst_npi = 0X0F, tp_dst_ton = 0x0F, tp_dst_npi = 0X0F;
+               gchar *text = NULL, *rp_dst_call_num = NULL, *tp_dst_call_num = NULL;
 
-                       mo_sm_result_noti = (struct tnoti_sat_mo_sm_control_result_ind *)data;
-                       if (mo_sm_result_noti == NULL) {
-                               err("Indication data is NULL");
-                               return FALSE;
-                       }
-                       dbg("sat mo sm control result notification");
+               mo_sm_result_noti = (struct tnoti_sat_mo_sm_control_result_ind *)data;
+               if (mo_sm_result_noti == NULL) {
+                       err("Indication data is NULL");
+                       return FALSE;
+               }
+               dbg("sat mo sm control result notification");
 
                call_ctrl_result = mo_sm_result_noti->cc_result;
 
-               if(mo_sm_result_noti->rp_dst_address.dialing_number_len > 0){
+               if (mo_sm_result_noti->rp_dst_address.dialing_number_len > 0) {
                        rp_dst_ton = mo_sm_result_noti->rp_dst_address.ton;
                        rp_dst_npi = mo_sm_result_noti->rp_dst_address.npi;
-                       if(rp_dst_ton == TON_INTERNATIONAL)
+                       if (rp_dst_ton == TON_INTERNATIONAL)
                                rp_dst_call_num = g_strdup_printf("+%s", mo_sm_result_noti->rp_dst_address.dialing_number);
                        else
                                rp_dst_call_num = g_strdup(mo_sm_result_noti->rp_dst_address.dialing_number);
@@ -524,10 +499,10 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        rp_dst_call_num = g_strdup("");
                }
 
-               if(mo_sm_result_noti->tp_dst_address.dialing_number_len > 0){
+               if (mo_sm_result_noti->tp_dst_address.dialing_number_len > 0) {
                        tp_dst_ton = mo_sm_result_noti->tp_dst_address.ton;
                        tp_dst_npi = mo_sm_result_noti->tp_dst_address.npi;
-                       if(tp_dst_ton == TON_INTERNATIONAL)
+                       if (tp_dst_ton == TON_INTERNATIONAL)
                                tp_dst_call_num = g_strdup_printf("+%s", mo_sm_result_noti->tp_dst_address.dialing_number);
                        else
                                tp_dst_call_num = g_strdup(mo_sm_result_noti->tp_dst_address.dialing_number);
@@ -535,1033 +510,1017 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        tp_dst_call_num = g_strdup("");
                }
 
-               if(mo_sm_result_noti->alpha_id.alpha_data_len > 0){
+               if (mo_sm_result_noti->alpha_id.alpha_data_len > 0)
                        text = g_strdup(mo_sm_result_noti->alpha_id.alpha_data);
-               }
-               else{
+               else
                        text = g_strdup("");
-               }
 
                telephony_sat_emit_mo_sm_control_result(sat, call_ctrl_result, text,
                        rp_dst_ton, rp_dst_npi, rp_dst_call_num, tp_dst_ton, tp_dst_npi, tp_dst_call_num);
 
-                       g_free(text); g_free(rp_dst_call_num); g_free(tp_dst_call_num);
-                       return TRUE;
-               }
-               break;
+               g_free(text); g_free(rp_dst_call_num); g_free(tp_dst_call_num);
+               return TRUE;
+               } break;
 
-               //Proactive Command Notification
-               case TNOTI_SAT_PROACTIVE_CMD: {
-                       struct tnoti_sat_proactive_ind *p_ind;
-                       TcorePlugin *plg;
-                       plg = tcore_object_ref_plugin(source);
-                       if (plg == NULL) {
-                               dbg("there is no valid plugin at this point");
-                               return FALSE;
-                       }
+       /* Proactive Command Notification */
+       case TNOTI_SAT_PROACTIVE_CMD: {
+               struct tnoti_sat_proactive_ind *p_ind;
+               TcorePlugin *plg;
+               plg = tcore_object_ref_plugin(source);
+               if (plg == NULL) {
+                       dbg("there is no valid plugin at this point");
+                       return FALSE;
+               }
 
-                       if (cp_name == NULL) {
-                               dbg("CP name is NULL");
-                               return FALSE;
-                       }
+               if (cp_name == NULL) {
+                       dbg("CP name is NULL");
+                       return FALSE;
+               }
 
-                       p_ind = (struct tnoti_sat_proactive_ind *)data;
-                       if (p_ind == NULL) {
-                               dbg("Indication data is NULL");
-                               return FALSE;
-                       }
-                       dbg("notified sat proactive command(%d)", p_ind->cmd_type);
-
-                       switch (p_ind->cmd_type) {
-                               case SAT_PROATV_CMD_SETUP_MENU:{
-                                       GVariant *menu_info = NULL;
-                                       gchar *title;
-                                       gint command_id, menu_cnt;
-                                       gboolean b_present, b_helpinfo, b_updated;
-                                       GVariant *items;
+               p_ind = (struct tnoti_sat_proactive_ind *)data;
+               if (p_ind == NULL) {
+                       dbg("Indication data is NULL");
+                       return FALSE;
+               }
+               dbg("notified sat proactive command(%d)", p_ind->cmd_type);
+
+               switch (p_ind->cmd_type) {
+               case SAT_PROATV_CMD_SETUP_MENU: {
+                       GVariant *menu_info = NULL;
+                       gchar *title;
+                       gint command_id, menu_cnt;
+                       gboolean b_present, b_helpinfo, b_updated;
+                       GVariant *items;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id = NULL;
-                                       GVariant *icon_list = NULL;
+                       GVariant *icon_id = NULL;
+                       GVariant *icon_list = NULL;
 #endif
-                                       menu_info = sat_manager_caching_setup_menu_info(ctx, cp_name,
-                                                                       (struct tel_sat_setup_menu_tlv*)&p_ind->proactive_ind_data.setup_menu);
+                       menu_info = sat_manager_caching_setup_menu_info(ctx, cp_name,
+                               (struct tel_sat_setup_menu_tlv*)&p_ind->proactive_ind_data.setup_menu);
 
-                                       dbg("menu_info type_format(%s)", g_variant_get_type_string(menu_info));
+                       dbg("menu_info type_format(%s)", g_variant_get_type_string(menu_info));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(menu_info, "(ibs@vibb@v@v)", &command_id, &b_present, &title, &items,
-                                                       &menu_cnt, &b_helpinfo, &b_updated, &icon_id, &icon_list);
+                       g_variant_get(menu_info, "(ibs@vibb@v@v)", &command_id, &b_present, &title, &items,
+                               &menu_cnt, &b_helpinfo, &b_updated, &icon_id, &icon_list);
 #else
-                                       g_variant_get(menu_info, "(ibs@vibb)", &command_id, &b_present, &title, &items,
-                                                       &menu_cnt, &b_helpinfo, &b_updated);
+                       g_variant_get(menu_info, "(ibs@vibb)", &command_id, &b_present, &title, &items,
+                               &menu_cnt, &b_helpinfo, &b_updated);
 #endif
-                                       if(!menu_cnt){
-                                               dbg("no main menu data");
-                                               /* No need to cache anything so make store NULL in cached_sat_main_menu */
-                                               _sat_set_main_menu(ctx, cp_name, NULL);
-                                               g_variant_unref(menu_info);
-                                       } else {
-                                               _sat_set_main_menu(ctx, cp_name, menu_info);
-                                       }
-                                       if(b_updated) {
+                       if (!menu_cnt) {
+                               dbg("no main menu data");
+                               /* No need to cache anything so make store NULL in cached_sat_main_menu */
+                               _sat_set_main_menu(ctx, cp_name, NULL);
+                               g_variant_unref(menu_info);
+                       } else {
+                               _sat_set_main_menu(ctx, cp_name, menu_info);
+                       }
+                       if (b_updated) {
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                               telephony_sat_emit_setup_menu(sat, command_id, b_present, title, items, menu_cnt,
-                                                       b_helpinfo, b_updated, icon_id, icon_list);
+                               telephony_sat_emit_setup_menu(sat, command_id, b_present, title, items, menu_cnt,
+                                       b_helpinfo, b_updated, icon_id, icon_list);
 #else
-                                               telephony_sat_emit_setup_menu(sat, command_id, b_present, title, items, menu_cnt,
-                                                       b_helpinfo, b_updated);
+                               telephony_sat_emit_setup_menu(sat, command_id, b_present, title, items, menu_cnt,
+                                       b_helpinfo, b_updated);
 #endif
-                                       }
-                                       g_free(title);
-                               } break;
+                       }
+                       g_free(title);
+                       } break;
 
-                               case SAT_PROATV_CMD_DISPLAY_TEXT:{
-                                       GVariant *display_text = NULL;
+               case SAT_PROATV_CMD_DISPLAY_TEXT: {
+                       GVariant *display_text = NULL;
 
-                                       gint command_id, text_len, duration;
-                                       gboolean high_priority, user_rsp_required, immediately_rsp;
-                                       gchar* text = NULL;
+                       gint command_id, text_len, duration;
+                       gboolean high_priority, user_rsp_required, immediately_rsp;
+                       gchar* text = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id = NULL;
+                       GVariant *icon_id = NULL;
 #endif
-                                       int ret;
+                       int ret;
 
-                                       display_text = sat_manager_display_text_noti(ctx, cp_name, (struct tel_sat_display_text_tlv*) &p_ind->proactive_ind_data.display_text, p_ind->decode_err_code);
+                       display_text = sat_manager_display_text_noti(ctx, cp_name, (struct tel_sat_display_text_tlv*) &p_ind->proactive_ind_data.display_text, p_ind->decode_err_code);
 
-                                       if(!display_text){
-                                               dbg("no display text data");
-                                               return TRUE;
-                                       }
+                       if (!display_text) {
+                               dbg("no display text data");
+                               return TRUE;
+                       }
 
-                                       dbg("display text type_format(%s)", g_variant_get_type_string(display_text));
+                       dbg("display text type_format(%s)", g_variant_get_type_string(display_text));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(display_text, "(isiibbb@v)", &command_id, &text, &text_len, &duration,
-                                                               &high_priority, &user_rsp_required, &immediately_rsp, &icon_id);
+                       g_variant_get(display_text, "(isiibbb@v)", &command_id, &text, &text_len, &duration,
+                               &high_priority, &user_rsp_required, &immediately_rsp, &icon_id);
 #else
-                                       g_variant_get(display_text, "(isiibbb)", &command_id, &text, &text_len, &duration,
-                                                               &high_priority, &user_rsp_required, &immediately_rsp);
+                       g_variant_get(display_text, "(isiibbb)", &command_id, &text, &text_len, &duration,
+                               &high_priority, &user_rsp_required, &immediately_rsp);
 #endif
-                                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_DISPLAY_TEXT, display_text, slot_id);
-                                       if(!ret) {
-                                               int rv;
-                                               dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                               if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                       dbg("Fail to send terminal response\n");
-                                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                               if(!rv)
-                                                       dbg("fail to dequeue data\n");
-                                       }
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_DISPLAY_TEXT, display_text, slot_id);
+                       if (!ret) {
+                               int rv;
+                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+                               if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                       dbg("Fail to send terminal response\n");
+                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                               if (!rv)
+                                       dbg("fail to dequeue data\n");
+                       }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       telephony_sat_emit_display_text(sat, command_id, text, text_len, duration,
-                                                       high_priority, user_rsp_required, immediately_rsp, icon_id);
+                       telephony_sat_emit_display_text(sat, command_id, text, text_len, duration,
+                               high_priority, user_rsp_required, immediately_rsp, icon_id);
 #else
-                                       telephony_sat_emit_display_text(sat, command_id, text, text_len, duration,
-                                                       high_priority, user_rsp_required, immediately_rsp);
+                       telephony_sat_emit_display_text(sat, command_id, text, text_len, duration,
+                               high_priority, user_rsp_required, immediately_rsp);
 #endif
-                                       g_free(text);
-                               } break;
-
-                               case SAT_PROATV_CMD_SELECT_ITEM:{
-                                       GVariant *select_menu = NULL;
-
-                                       gboolean help_info ;
-                                       gchar *selected_text = NULL;
-                                       gint command_id, default_item_id, menu_cnt, text_len =0;
-                                       GVariant *menu_items;
+                       g_free(text);
+                       } break;
+
+               case SAT_PROATV_CMD_SELECT_ITEM: {
+                       GVariant *select_menu = NULL;
+                       gboolean help_info ;
+                       gchar *selected_text = NULL;
+                       gint command_id, default_item_id, menu_cnt, text_len = 0;
+                       GVariant *menu_items;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id, *icon_list;
+                       GVariant *icon_id, *icon_list;
 #endif
-                                       int ret;
+                       int ret;
 
-                                       select_menu = sat_manager_select_item_noti(ctx, cp_name, (struct tel_sat_select_item_tlv*) &p_ind->proactive_ind_data.select_item);
+                       select_menu = sat_manager_select_item_noti(ctx, cp_name, (struct tel_sat_select_item_tlv*) &p_ind->proactive_ind_data.select_item);
 
-                                       if(!select_menu){
-                                               dbg("no select menu data");
-                                               return TRUE;
-                                       }
+                       if (!select_menu) {
+                               dbg("no select menu data");
+                               return TRUE;
+                       }
 
-                                       dbg("select menu type_format(%s)", g_variant_get_type_string(select_menu));
+                       dbg("select menu type_format(%s)", g_variant_get_type_string(select_menu));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(select_menu, "(ibsiii@v@v@v)", &command_id, &help_info, &selected_text,
-                                                       &text_len, &default_item_id, &menu_cnt, &menu_items, &icon_id, &icon_list);
+                       g_variant_get(select_menu, "(ibsiii@v@v@v)", &command_id, &help_info, &selected_text,
+                               &text_len, &default_item_id, &menu_cnt, &menu_items, &icon_id, &icon_list);
 #else
-                                       g_variant_get(select_menu, "(ibsiii@v)", &command_id, &help_info, &selected_text,
-                                                       &text_len, &default_item_id, &menu_cnt, &menu_items);
+                       g_variant_get(select_menu, "(ibsiii@v)", &command_id, &help_info, &selected_text,
+                               &text_len, &default_item_id, &menu_cnt, &menu_items);
 #endif
-                                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SELECT_ITEM, select_menu, slot_id);
-                                       if(!ret) {
-                                               int rv;
-                                               dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                               if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                       dbg("Fail to send terminal response\n");
-                                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                               if(!rv)
-                                                       dbg("fail to dequeue data\n");
-                                       }
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SELECT_ITEM, select_menu, slot_id);
+                       if (!ret) {
+                               int rv;
+                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+                               if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                       dbg("Fail to send terminal response\n");
+                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                               if (!rv)
+                                       dbg("fail to dequeue data\n");
+                       }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       telephony_sat_emit_select_item (sat, command_id, help_info, selected_text, text_len,
-                                                       default_item_id, menu_cnt, menu_items, icon_id, icon_list);
+                       telephony_sat_emit_select_item(sat, command_id, help_info, selected_text, text_len,
+                               default_item_id, menu_cnt, menu_items, icon_id, icon_list);
 #else
-                                       telephony_sat_emit_select_item (sat, command_id, help_info, selected_text, text_len,
-                                                       default_item_id, menu_cnt, menu_items);
+                       telephony_sat_emit_select_item(sat, command_id, help_info, selected_text, text_len,
+                               default_item_id, menu_cnt, menu_items);
 #endif
-                                       g_free(selected_text);
-                               } break;
-
-                               case SAT_PROATV_CMD_GET_INKEY:{
-                                       GVariant *get_inkey = NULL;
-                                       gint command_id, key_type, input_character_mode;
-                                       gint text_len, duration;
-                                       gboolean b_numeric, b_help_info;
-                                       gchar *text = NULL;
+                       g_free(selected_text);
+                       } break;
+
+               case SAT_PROATV_CMD_GET_INKEY: {
+                       GVariant *get_inkey = NULL;
+                       gint command_id, key_type, input_character_mode;
+                       gint text_len, duration;
+                       gboolean b_numeric, b_help_info;
+                       gchar *text = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       int ret;
+                       int ret;
 
-                                       get_inkey = sat_manager_get_inkey_noti(ctx, cp_name, (struct tel_sat_get_inkey_tlv*) &p_ind->proactive_ind_data.get_inkey, p_ind->decode_err_code);
+                       get_inkey = sat_manager_get_inkey_noti(ctx, cp_name, (struct tel_sat_get_inkey_tlv*) &p_ind->proactive_ind_data.get_inkey, p_ind->decode_err_code);
 
-                                       if(!get_inkey){
-                                               dbg("no get inkey data");
-                                               return TRUE;
-                                       }
+                       if (!get_inkey) {
+                               dbg("no get inkey data");
+                               return TRUE;
+                       }
 
-                                       dbg("get inkey type_format(%s)", g_variant_get_type_string(get_inkey));
+                       dbg("get inkey type_format(%s)", g_variant_get_type_string(get_inkey));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(get_inkey, "(iiibbsii@v)", &command_id, &key_type, &input_character_mode,
-                                                       &b_numeric,&b_help_info, &text, &text_len, &duration, &icon_id);
+                       g_variant_get(get_inkey, "(iiibbsii@v)", &command_id, &key_type, &input_character_mode,
+                               &b_numeric, &b_help_info, &text, &text_len, &duration, &icon_id);
 #else
-                                       g_variant_get(get_inkey, "(iiibbsii)", &command_id, &key_type, &input_character_mode,
-                                                       &b_numeric,&b_help_info, &text, &text_len, &duration);
+                       g_variant_get(get_inkey, "(iiibbsii)", &command_id, &key_type, &input_character_mode,
+                               &b_numeric, &b_help_info, &text, &text_len, &duration);
 #endif
-                                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_GET_INKEY, get_inkey, slot_id);
-                                       if(!ret) {
-                                               int rv;
-                                               dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                               if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                       dbg("Fail to send terminal response\n");
-                                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                               if(!rv)
-                                                       dbg("fail to dequeue data\n");
-                                       }
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_GET_INKEY, get_inkey, slot_id);
+                       if (!ret) {
+                               int rv;
+                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+                               if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                       dbg("Fail to send terminal response\n");
+                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                               if (!rv)
+                                       dbg("fail to dequeue data\n");
+                       }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       telephony_sat_emit_get_inkey(sat, command_id, key_type, input_character_mode,
-                                                       b_numeric, b_help_info, text, text_len, duration, icon_id);
+                       telephony_sat_emit_get_inkey(sat, command_id, key_type, input_character_mode,
+                               b_numeric, b_help_info, text, text_len, duration, icon_id);
 #else
-                                       telephony_sat_emit_get_inkey(sat, command_id, key_type, input_character_mode,
-                                                       b_numeric, b_help_info, text, text_len, duration);
+                       telephony_sat_emit_get_inkey(sat, command_id, key_type, input_character_mode,
+                               b_numeric, b_help_info, text, text_len, duration);
 #endif
-                                       g_free(text);
-                               } break;
-
-                               case SAT_PROATV_CMD_GET_INPUT:{
-                                       GVariant *get_input = NULL;
-                                       gint command_id, input_character_mode;
-                                       gint text_len, def_text_len, rsp_len_min, rsp_len_max;
-                                       gboolean b_numeric, b_help_info, b_echo_input;
-                                       gchar *text = NULL, *def_text = NULL;
-                                       int ret;
+                       g_free(text);
+                       } break;
+
+               case SAT_PROATV_CMD_GET_INPUT: {
+                       GVariant *get_input = NULL;
+                       gint command_id, input_character_mode;
+                       gint text_len, def_text_len, rsp_len_min, rsp_len_max;
+                       gboolean b_numeric, b_help_info, b_echo_input;
+                       gchar *text = NULL, *def_text = NULL;
+                       int ret;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       get_input = sat_manager_get_input_noti(ctx, cp_name, (struct tel_sat_get_input_tlv*) &p_ind->proactive_ind_data.get_input, p_ind->decode_err_code);
+                       get_input = sat_manager_get_input_noti(ctx, cp_name, (struct tel_sat_get_input_tlv*) &p_ind->proactive_ind_data.get_input, p_ind->decode_err_code);
 
-                                       if(!get_input){
-                                               dbg("no get input data");
-                                               return TRUE;
-                                       }
+                       if (!get_input) {
+                               dbg("no get input data");
+                               return TRUE;
+                       }
 
-                                       dbg("get input type_format(%s)", g_variant_get_type_string(get_input));
+                       dbg("get input type_format(%s)", g_variant_get_type_string(get_input));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(get_input, "(iibbbsiiisi@v)", &command_id, &input_character_mode, &b_numeric, &b_help_info, &b_echo_input,
-                                                       &text, &text_len, &rsp_len_max, &rsp_len_min, &def_text, &def_text_len, &icon_id);
+                       g_variant_get(get_input, "(iibbbsiiisi@v)", &command_id,
+                               &input_character_mode, &b_numeric, &b_help_info,
+                               &b_echo_input, &text, &text_len, &rsp_len_max,
+                               &rsp_len_min, &def_text, &def_text_len, &icon_id);
 #else
-                                       g_variant_get(get_input, "(iibbbsiiisi)", &command_id, &input_character_mode, &b_numeric, &b_help_info, &b_echo_input,
-                                                       &text, &text_len, &rsp_len_max, &rsp_len_min, &def_text, &def_text_len);
+                       g_variant_get(get_input, "(iibbbsiiisi)", &command_id,
+                               &input_character_mode, &b_numeric, &b_help_info,
+                               &b_echo_input, &text, &text_len, &rsp_len_max,
+                               &rsp_len_min, &def_text, &def_text_len);
 #endif
-                                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_GET_INPUT, get_input, slot_id);
-                                       if(!ret) {
-                                               int rv;
-                                               dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                               if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                       dbg("Fail to send terminal response\n");
-                                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                               if(!rv)
-                                                       dbg("fail to dequeue data\n");
-                                       }
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_GET_INPUT, get_input, slot_id);
+                       if (!ret) {
+                               int rv;
+                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+                               if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                       dbg("Fail to send terminal response\n");
+                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                               if (!rv)
+                                       dbg("fail to dequeue data\n");
+                       }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       telephony_sat_emit_get_input(sat, command_id, input_character_mode, b_numeric, b_help_info,
-                                                       b_echo_input, text, text_len, rsp_len_max, rsp_len_min, def_text, def_text_len, icon_id);
+                       telephony_sat_emit_get_input(sat, command_id, input_character_mode, b_numeric, b_help_info,
+                               b_echo_input, text, text_len, rsp_len_max, rsp_len_min, def_text, def_text_len, icon_id);
 #else
-                                       telephony_sat_emit_get_input(sat, command_id, input_character_mode, b_numeric, b_help_info,
-                                                       b_echo_input, text, text_len, rsp_len_max, rsp_len_min, def_text, def_text_len);
+                       telephony_sat_emit_get_input(sat, command_id, input_character_mode, b_numeric, b_help_info,
+                               b_echo_input, text, text_len, rsp_len_max, rsp_len_min, def_text, def_text_len);
 #endif
-                                       g_free(text);
-                                       g_free(def_text);
-                               } break;
-
-                               case SAT_PROATV_CMD_PLAY_TONE:{
-                                       GVariant *play_tone = NULL;
-                                       gint command_id, tone_type, duration;
-                                       gint text_len;
-                                       gchar* text = NULL;
-                                       int ret;
+                       g_free(text);
+                       g_free(def_text);
+                       } break;
+
+               case SAT_PROATV_CMD_PLAY_TONE: {
+                       GVariant *play_tone = NULL;
+                       gint command_id, tone_type, duration;
+                       gint text_len;
+                       gchar* text = NULL;
+                       int ret;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       play_tone = sat_manager_play_tone_noti(ctx, cp_name, (struct tel_sat_play_tone_tlv*) &p_ind->proactive_ind_data.play_tone);
+                       play_tone = sat_manager_play_tone_noti(ctx, cp_name, (struct tel_sat_play_tone_tlv*) &p_ind->proactive_ind_data.play_tone);
 
-                                       if(!play_tone){
-                                               dbg("no play tone data");
-                                               return TRUE;
-                                       }
+                       if (!play_tone) {
+                               dbg("no play tone data");
+                               return TRUE;
+                       }
 
-                                       dbg("play tone type_format(%s)", g_variant_get_type_string(play_tone));
+                       dbg("play tone type_format(%s)", g_variant_get_type_string(play_tone));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(play_tone, "(isi@vii)", &command_id, &text, &text_len, &icon_id, &tone_type, &duration);
+                       g_variant_get(play_tone, "(isi@vii)", &command_id, &text, &text_len, &icon_id, &tone_type, &duration);
 #else
-                                       g_variant_get(play_tone, "(isiii)", &command_id, &text, &text_len, &tone_type, &duration);
+                       g_variant_get(play_tone, "(isiii)", &command_id, &text, &text_len, &tone_type, &duration);
 #endif
-                                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_PLAY_TONE, play_tone, slot_id);
-                                       if(!ret) {
-                                               int rv;
-                                               dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                               if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                       dbg("Fail to send terminal response\n");
-                                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                               if(!rv)
-                                                       dbg("fail to dequeue data\n");
-                                       }
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_PLAY_TONE, play_tone, slot_id);
+                       if (!ret) {
+                               int rv;
+                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+                               if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                       dbg("Fail to send terminal response\n");
+                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                               if (!rv)
+                                       dbg("fail to dequeue data\n");
+                       }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       telephony_sat_emit_play_tone(sat, command_id, text, text_len, icon_id, tone_type, duration);
+                       telephony_sat_emit_play_tone(sat, command_id, text, text_len, icon_id, tone_type, duration);
 #else
-                                       telephony_sat_emit_play_tone(sat, command_id, text, text_len, tone_type, duration);
+                       telephony_sat_emit_play_tone(sat, command_id, text, text_len, tone_type, duration);
 #endif
-                                       g_free(text);
-                               } break;
-
-                               case SAT_PROATV_CMD_SEND_SMS:{
-                                       GVariant *send_sms = NULL;
-
-                                       gint command_id, ton, npi, tpdu_type;
-                                       gboolean b_packing_required;
-                                       gint text_len, number_len, tpdu_data_len;
-                                       gchar* text = NULL, *dialling_number = NULL;
-                                       GVariant *tpdu_data;
+                       g_free(text);
+                       } break;
+
+               case SAT_PROATV_CMD_SEND_SMS: {
+                       GVariant *send_sms = NULL;
+                       gint command_id, ton, npi, tpdu_type;
+                       gboolean b_packing_required;
+                       gint text_len, number_len, tpdu_data_len;
+                       gchar* text = NULL, *dialling_number = NULL;
+                       GVariant *tpdu_data;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       send_sms = sat_manager_send_sms_noti(ctx, cp_name, (struct tel_sat_send_sms_tlv*) &p_ind->proactive_ind_data.send_sms);
+                       send_sms = sat_manager_send_sms_noti(ctx, cp_name, (struct tel_sat_send_sms_tlv*) &p_ind->proactive_ind_data.send_sms);
 
-                                       if(!send_sms){
-                                               dbg("no send sms data");
-                                               return TRUE;
-                                       }
+                       if (!send_sms) {
+                               dbg("no send sms data");
+                               return TRUE;
+                       }
 
-                                       dbg("send sms type_format(%s)", g_variant_get_type_string(send_sms));
+                       dbg("send sms type_format(%s)", g_variant_get_type_string(send_sms));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(send_sms, "(isi@vbiisii@vi)", &command_id, &text, &text_len, &icon_id, &b_packing_required, &ton, &npi,
-                                                       &dialling_number, &number_len, &tpdu_type, &tpdu_data, &tpdu_data_len);
+                       g_variant_get(send_sms, "(isi@vbiisii@vi)", &command_id,
+                               &text, &text_len, &icon_id, &b_packing_required, &ton, &npi,
+                               &dialling_number, &number_len, &tpdu_type, &tpdu_data, &tpdu_data_len);
 #else
-                                       g_variant_get(send_sms, "(isibiisii@vi)", &command_id, &text, &text_len, &b_packing_required, &ton, &npi,
-                                                       &dialling_number, &number_len, &tpdu_type, &tpdu_data, &tpdu_data_len);
+                       g_variant_get(send_sms, "(isibiisii@vi)", &command_id,
+                               &text, &text_len, &b_packing_required, &ton, &npi,
+                               &dialling_number, &number_len, &tpdu_type, &tpdu_data, &tpdu_data_len);
 #endif
-                                       dbg("check display text : text(%s) text len(%d)", text, text_len);
-                                       if(text_len > 1 && (g_strcmp0(text,"") != 0) ){
-                                               GVariant *ui_info = NULL;
-                                               gboolean user_confirm = FALSE;
-                                               int ret;
-                                               dbg("text should be displayed by ui");
-                                               dbg("send sms is pending!!!");
+                       dbg("check display text : text(%s) text len(%d)", text, text_len);
+                       if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
+                               GVariant *ui_info = NULL;
+                               gboolean user_confirm = FALSE;
+                               int ret;
+                               dbg("text should be displayed by ui");
+                               dbg("send sms is pending!!!");
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
 #else
-                                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
 #endif
-                                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SEND_SMS, ui_info, slot_id);
-                                               if(!ret) {
-                                                       int rv;
-                                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                                       if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                               dbg("Fail to send terminal response\n");
-                                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                                       if(!rv)
-                                                               dbg("fail to dequeue data\n");
-                                               }
-                                               g_free(text);
-                                               g_free(dialling_number);
-                                               return TRUE;
-                                       }
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SEND_SMS, ui_info, slot_id);
+                               if (!ret) {
+                                       int rv;
+                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+                                       if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                               dbg("Fail to send terminal response\n");
+                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                                       if (!rv)
+                                               dbg("fail to dequeue data\n");
+                               }
+                               g_free(text);
+                               g_free(dialling_number);
+                               return TRUE;
+                       }
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                                       telephony_sat_emit_send_sms(sat, command_id, text, text_len, b_packing_required,
-                                                       ton, npi, dialling_number, number_len, tpdu_type, tpdu_data, tpdu_data_len);
+                       telephony_sat_emit_send_sms(sat, command_id, text, text_len, b_packing_required,
+                               ton, npi, dialling_number, number_len, tpdu_type, tpdu_data, tpdu_data_len);
 #endif
-                                       g_free(text);
-                                       g_free(dialling_number);
-                               } break;
-
-                               case SAT_PROATV_CMD_SEND_SS:{
-                                       GVariant *send_ss = NULL;
-
-                                       gint command_id, ton, npi;
-                                       gint text_len, ss_str_len;
-                                       gchar* text = NULL, *ss_string = NULL;
+                       g_free(text);
+                       g_free(dialling_number);
+                       } break;
+
+               case SAT_PROATV_CMD_SEND_SS: {
+                       GVariant *send_ss = NULL;
+                       gint command_id, ton, npi;
+                       gint text_len, ss_str_len;
+                       gchar* text = NULL, *ss_string = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       send_ss = sat_manager_send_ss_noti(ctx, cp_name, (struct tel_sat_send_ss_tlv*) &p_ind->proactive_ind_data.send_ss);
+                       send_ss = sat_manager_send_ss_noti(ctx, cp_name, (struct tel_sat_send_ss_tlv*) &p_ind->proactive_ind_data.send_ss);
 
-                                       if(!send_ss){
-                                               dbg("no send ss data");
-                                               return TRUE;
-                                       }
+                       if (!send_ss) {
+                               dbg("no send ss data");
+                               return TRUE;
+                       }
 
-                                       dbg("send ss type_format(%s)", g_variant_get_type_string(send_ss));
+                       dbg("send ss type_format(%s)", g_variant_get_type_string(send_ss));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(send_ss, "(isi@viiis)", &command_id, &text, &text_len, &icon_id,
+                       g_variant_get(send_ss, "(isi@viiis)", &command_id, &text, &text_len, &icon_id,
                                                        &ton, &npi, &ss_str_len, &ss_string);
 #else
-                                       g_variant_get(send_ss, "(isiiiis)", &command_id, &text, &text_len,
+                       g_variant_get(send_ss, "(isiiiis)", &command_id, &text, &text_len,
                                                        &ton, &npi, &ss_str_len, &ss_string);
 #endif
-                                       dbg("check display text : text(%s) text len(%d)", text, text_len);
-                                       if(text_len > 1 && (g_strcmp0(text,"") != 0) ){
-                                               GVariant *ui_info = NULL;
-                                               gboolean user_confirm = FALSE;
-                                               int ret;
-                                               dbg("text should be displayed by ui");
-                                               dbg("send ss is pending!!!");
+                       dbg("check display text : text(%s) text len(%d)", text, text_len);
+                       if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
+                               GVariant *ui_info = NULL;
+                               gboolean user_confirm = FALSE;
+                               int ret;
+                               dbg("text should be displayed by ui");
+                               dbg("send ss is pending!!!");
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
 #else
-                                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
 #endif
-                                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
-                                               if(!ret) {
-                                                       int rv;
-                                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                                       if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                               dbg("Fail to send terminal response\n");
-                                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                                       if(!rv)
-                                                               dbg("fail to dequeue data\n");
-                                               }
-                                               g_free(text);
-                                               g_free(ss_string);
-                                               return TRUE;
-                                       }
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
+                               if (!ret) {
+                                       int rv;
+                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+                                       if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                               dbg("Fail to send terminal response\n");
+                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                                       if (!rv)
+                                               dbg("fail to dequeue data\n");
+                               }
+                               g_free(text);
+                               g_free(ss_string);
+                               return TRUE;
+                       }
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                                       telephony_sat_emit_send_ss(sat, command_id, text, text_len, ton, npi, ss_string);
-                                       //tizen ciss
-                                       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_SS, send_ss, slot_id);
+                       telephony_sat_emit_send_ss(sat, command_id, text, text_len, ton, npi, ss_string);
+                       /* tizen ciss */
+                       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_SS, send_ss, slot_id);
 #endif
-                                       g_free(text);
-                                       g_free(ss_string);
-                               } break;
-
-                               case SAT_PROATV_CMD_SEND_USSD:{
-                                       GVariant *send_ussd = NULL;
-
-                                       gint command_id;
-                                       gint text_len, ussd_str_len;
-                                       guchar dcs;
-                                       gchar* text = NULL, *ussd_string = NULL;
+                       g_free(text);
+                       g_free(ss_string);
+                       } break;
+
+               case SAT_PROATV_CMD_SEND_USSD: {
+                       GVariant *send_ussd = NULL;
+                       gint command_id;
+                       gint text_len, ussd_str_len;
+                       guchar dcs;
+                       gchar* text = NULL, *ussd_string = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       send_ussd = sat_manager_send_ussd_noti(ctx, cp_name, (struct tel_sat_send_ussd_tlv*) &p_ind->proactive_ind_data.send_ussd);
+                       send_ussd = sat_manager_send_ussd_noti(ctx, cp_name, (struct tel_sat_send_ussd_tlv*) &p_ind->proactive_ind_data.send_ussd);
 
-                                       if(!send_ussd){
-                                               dbg("no send ussd data");
-                                               return TRUE;
-                                       }
+                       if (!send_ussd) {
+                               dbg("no send ussd data");
+                               return TRUE;
+                       }
 
-                                       dbg("send ussd type_format(%s)", g_variant_get_type_string(send_ussd));
+                       dbg("send ussd type_format(%s)", g_variant_get_type_string(send_ussd));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(send_ussd, "(isi@vyis)", &command_id, &text, &text_len, &icon_id, &dcs, &ussd_str_len, &ussd_string);
+                       g_variant_get(send_ussd, "(isi@vyis)", &command_id, &text, &text_len, &icon_id, &dcs, &ussd_str_len, &ussd_string);
 #else
-                                       g_variant_get(send_ussd, "(isiyis)", &command_id, &text, &text_len, &dcs, &ussd_str_len, &ussd_string);
+                       g_variant_get(send_ussd, "(isiyis)", &command_id, &text, &text_len, &dcs, &ussd_str_len, &ussd_string);
 #endif
-                                       dbg("check display text : text(%s) text len(%d)", text, text_len);
-                                       if(text_len > 1 && (g_strcmp0(text,"") != 0) ){
-                                               GVariant *ui_info = NULL;
-                                               gboolean user_confirm = FALSE;
-                                               int ret;
-                                               dbg("text should be displayed by ui");
-                                               dbg("send ussd is pending!!!");
+                       dbg("check display text : text(%s) text len(%d)", text, text_len);
+                       if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
+                               GVariant *ui_info = NULL;
+                               gboolean user_confirm = FALSE;
+                               int ret;
+                               dbg("text should be displayed by ui");
+                               dbg("send ussd is pending!!!");
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
 #else
-                                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
 #endif
-                                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
-                                               if(!ret) {
-                                                       int rv;
-                                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                                       if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                               dbg("Fail to send terminal response\n");
-                                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                                       if(!rv)
-                                                               dbg("fail to dequeue data\n");
-                                               }
-                                               g_free(text);
-                                               g_free(ussd_string);
-                                               return TRUE;
-                                       }
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
+                               if (!ret) {
+                                       int rv;
+                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+                                       if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                               dbg("Fail to send terminal response\n");
+                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                                       if (!rv)
+                                               dbg("fail to dequeue data\n");
+                               }
+                               g_free(text);
+                               g_free(ussd_string);
+                               return TRUE;
+                       }
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                                       telephony_sat_emit_setup_ussd(sat, command_id, text, text_len, dcs, ussd_string);
-                                       //tizen ciss ui
-                                       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_USSD, send_ussd, slot_id);
+                       telephony_sat_emit_setup_ussd(sat, command_id, text, text_len, dcs, ussd_string);
+                       /* tizen ciss ui */
+                       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_USSD, send_ussd, slot_id);
 #endif
-                                       g_free(text);
-                                       g_free(ussd_string);
-                               } break;
-
-                               case SAT_PROATV_CMD_SETUP_CALL:{
-                                       GVariant *setup_call = NULL;
-
-                                       gint command_id, call_type, confirmed_text_len, text_len, duration;
-                                       gchar *confirmed_text, *text = NULL, *call_number = NULL;
+                       g_free(text);
+                       g_free(ussd_string);
+                       } break;
+
+               case SAT_PROATV_CMD_SETUP_CALL: {
+                       GVariant *setup_call = NULL;
+                       gint command_id, call_type, confirmed_text_len, text_len, duration;
+                       gchar *confirmed_text, *text = NULL, *call_number = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       setup_call = sat_manager_setup_call_noti(ctx, cp_name, (struct tel_sat_setup_call_tlv*) &p_ind->proactive_ind_data.setup_call);
+                       setup_call = sat_manager_setup_call_noti(ctx, cp_name, (struct tel_sat_setup_call_tlv*) &p_ind->proactive_ind_data.setup_call);
 
-                                       if(!setup_call){
-                                               dbg("no setup call data");
-                                               return TRUE;
-                                       }
+                       if (!setup_call) {
+                               dbg("no setup call data");
+                               return TRUE;
+                       }
 
-                                       dbg("setup call type_format(%s)", g_variant_get_type_string(setup_call));
+                       dbg("setup call type_format(%s)", g_variant_get_type_string(setup_call));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(setup_call, "(isisi@visi)", &command_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &icon_id, &call_type, &call_number, &duration);
+                       g_variant_get(setup_call, "(isisi@visi)", &command_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &icon_id, &call_type, &call_number, &duration);
 #else
-                                       g_variant_get(setup_call, "(isisiisi)", &command_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &call_type, &call_number, &duration);
+                       g_variant_get(setup_call, "(isisiisi)", &command_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &call_type, &call_number, &duration);
 #endif
-                                       dbg("check display text : text(%s) text len(%d)", confirmed_text, confirmed_text_len);
-                                       if(confirmed_text_len > 1 && (g_strcmp0(confirmed_text,"") != 0) ){
-                                               GVariant *ui_info = NULL;
-                                               gboolean user_confirm = TRUE;
-                                               int ret;
-                                               dbg("text should be displayed by ui");
-                                               dbg("setup call is pending!!!");
+                       dbg("check display text : text(%s) text len(%d)", confirmed_text, confirmed_text_len);
+                       if (confirmed_text_len > 1 && (g_strcmp0(confirmed_text, "") != 0)) {
+                               GVariant *ui_info = NULL;
+                               gboolean user_confirm = TRUE;
+                               int ret;
+                               dbg("text should be displayed by ui");
+                               dbg("setup call is pending!!!");
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                               ui_info = g_variant_new("(isibv)", command_id, confirmed_text, confirmed_text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id, confirmed_text, confirmed_text_len, user_confirm, icon_id);
 #else
-                                               ui_info = g_variant_new("(isib)", command_id, confirmed_text, confirmed_text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id, confirmed_text, confirmed_text_len, user_confirm);
 #endif
-                                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
-                                               if(!ret) {
-                                                       int rv;
-                                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                                       if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                               dbg("Fail to send terminal response\n");
-                                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                                       if(!rv)
-                                                               dbg("fail to dequeue data\n");
-                                               }
-                                               g_free(text);
-                                               g_free(call_number);
-                                               return TRUE;
-                                       }
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
+                               if (!ret) {
+                                       int rv;
+                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+                                       if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                               dbg("Fail to send terminal response\n");
+                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                                       if (!rv)
+                                               dbg("fail to dequeue data\n");
+                               }
+                               g_free(text);
+                               g_free(call_number);
+                               return TRUE;
+                       }
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       telephony_sat_emit_setup_call(sat, command_id, confirmed_text, confirmed_text_len,text, text_len, icon_id, call_type, call_number, duration);
+                       telephony_sat_emit_setup_call(sat, command_id, confirmed_text, confirmed_text_len, text, text_len, icon_id, call_type, call_number, duration);
 #else
-                                       telephony_sat_emit_setup_call(sat, command_id, confirmed_text, confirmed_text_len,text, text_len, call_type, call_number, duration);
+                       telephony_sat_emit_setup_call(sat, command_id, confirmed_text, confirmed_text_len, text, text_len, call_type, call_number, duration);
 #endif
-                                       g_free(text);
-                                       g_free(call_number);
-
-                                       //tizen call ui in no alpha id case
-                                       sat_ui_support_launch_call_application(SAT_PROATV_CMD_SETUP_CALL, setup_call, slot_id);
-
-                               }break;
-
-                               case SAT_PROATV_CMD_SETUP_EVENT_LIST:{
-                                       GVariant *event_list = NULL;
-
-                                       gint event_cnt;
-                                       GVariant *evt_list;
-
-                                       event_list = sat_manager_setup_event_list_noti(ctx, cp_name, (struct tel_sat_setup_event_list_tlv*) &p_ind->proactive_ind_data.setup_event_list);
-
-                                       if(!event_list){
-                                               dbg("no setup event list data");
-                                               return TRUE;
-                                       }
-
-                                       dbg("setup event list type_format(%s)", g_variant_get_type_string(event_list));
-                                       g_variant_get(event_list, "(i@v)", &event_cnt, &evt_list);
-
-                                       telephony_sat_emit_setup_event_list(sat, event_cnt, evt_list);
+                       g_free(text);
+                       g_free(call_number);
+
+                       /* tizen call ui in no alpha id case */
+                       sat_ui_support_launch_call_application(SAT_PROATV_CMD_SETUP_CALL, setup_call, slot_id);
+                       } break;
+
+               case SAT_PROATV_CMD_SETUP_EVENT_LIST: {
+                       GVariant *event_list = NULL;
+                       gint event_cnt;
+                       GVariant *evt_list;
+                       event_list = sat_manager_setup_event_list_noti(ctx, cp_name, (struct tel_sat_setup_event_list_tlv*) &p_ind->proactive_ind_data.setup_event_list);
+
+                       if (!event_list) {
+                               dbg("no setup event list data");
+                               return TRUE;
+                       }
 
-                                       //bip proactive command is only handled by BIP Manager
-                                       {
-                                               GDBusConnection *conn = NULL;
-                                               const gchar *g_path = NULL;
+                       dbg("setup event list type_format(%s)", g_variant_get_type_string(event_list));
+                       g_variant_get(event_list, "(i@v)", &event_cnt, &evt_list);
+                       telephony_sat_emit_setup_event_list(sat, event_cnt, evt_list);
 
-                                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
-                                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
+                       /* bip proactive command is only handled by BIP Manager */
+                       {
+                               GDBusConnection *conn = NULL;
+                               const gchar *g_path = NULL;
 
-                                               /* TODO: SAT Event Downloader should execute event_list as well. */
-                                               sat_ui_support_exec_evtdw(conn, g_path, SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);
-                                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);
-                                       }
-                               } break;
+                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
+                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                               case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT:{
-                                       GVariant *setup_idle_mode = NULL;
-                                       int ret;
+                               /* TODO: SAT Event Downloader should execute event_list as well. */
+                               sat_ui_support_exec_evtdw(conn, g_path, SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);
+                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);
+                       }
+                       } break;
 
-                                       gint command_id, text_len;
-                                       gchar* text = NULL;
+               case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT: {
+                       GVariant *setup_idle_mode = NULL;
+                       int ret;
+                       gint command_id, text_len;
+                       gchar* text = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       setup_idle_mode = sat_manager_setup_idle_mode_text_noti(ctx, cp_name, (struct tel_sat_setup_idle_mode_text_tlv*) &p_ind->proactive_ind_data.setup_idle_mode_text, p_ind->decode_err_code);
+                       setup_idle_mode = sat_manager_setup_idle_mode_text_noti(ctx, cp_name, (struct tel_sat_setup_idle_mode_text_tlv*) &p_ind->proactive_ind_data.setup_idle_mode_text, p_ind->decode_err_code);
 
-                                       if(!setup_idle_mode){
-                                               dbg("no setup idle mode text data");
-                                               return TRUE;
-                                       }
+                       if (!setup_idle_mode) {
+                               dbg("no setup idle mode text data");
+                               return TRUE;
+                       }
 
-                                       dbg("setup idle mode text type_format(%s)", g_variant_get_type_string(setup_idle_mode));
+                       dbg("setup idle mode text type_format(%s)", g_variant_get_type_string(setup_idle_mode));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(setup_idle_mode, "(isi@v)", &command_id, &text, &text_len, &icon_id);
+                       g_variant_get(setup_idle_mode, "(isi@v)", &command_id, &text, &text_len, &icon_id);
 #else
-                                       g_variant_get(setup_idle_mode, "(isi)", &command_id, &text, &text_len);
+                       g_variant_get(setup_idle_mode, "(isi)", &command_id, &text, &text_len);
 #endif
-
-                                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT, setup_idle_mode, slot_id);
-                                       if(!ret) {
-                                               int rv;
-                                               dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                               if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                       dbg("Fail to send terminal response\n");
-                                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                               if(!rv)
-                                                       dbg("fail to dequeue data\n");
-                                       }
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT, setup_idle_mode, slot_id);
+                       if (!ret) {
+                               int rv;
+                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+                               if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                       dbg("Fail to send terminal response\n");
+                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                               if (!rv)
+                                       dbg("fail to dequeue data\n");
+                       }
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       telephony_sat_emit_setup_idle_mode_text(sat, command_id, text, text_len, icon_id);
+                       telephony_sat_emit_setup_idle_mode_text(sat, command_id, text, text_len, icon_id);
 #else
-                                       telephony_sat_emit_setup_idle_mode_text(sat, command_id, text, text_len);
+                       telephony_sat_emit_setup_idle_mode_text(sat, command_id, text, text_len);
 #endif
-                                       g_free(text);
-                               } break;
-
-                               case SAT_PROATV_CMD_OPEN_CHANNEL:{
-                                       GVariant *open_channel = NULL;
-
-                                       gint command_id, bearer_type, protocol_type, dest_addr_type;
-                                       gboolean immediate_link, auto_reconnection, bg_mode;
-                                       gint text_len, buffer_size, port_number;
-                                       gchar *text = NULL, *dest_address;
-                                       GVariant *bearer_param;
-                                       GVariant *bearer_detail;
+                       g_free(text);
+                       } break;
+
+               case SAT_PROATV_CMD_OPEN_CHANNEL: {
+                       GVariant *open_channel = NULL;
+                       gint command_id, bearer_type, protocol_type, dest_addr_type;
+                       gboolean immediate_link, auto_reconnection, bg_mode;
+                       gint text_len, buffer_size, port_number;
+                       gchar *text = NULL, *dest_address;
+                       GVariant *bearer_param;
+                       GVariant *bearer_detail;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       open_channel = sat_manager_open_channel_noti(ctx, cp_name, (struct tel_sat_open_channel_tlv*) &p_ind->proactive_ind_data.open_channel);
+                       open_channel = sat_manager_open_channel_noti(ctx, cp_name, (struct tel_sat_open_channel_tlv*) &p_ind->proactive_ind_data.open_channel);
 
-                                       if(!open_channel){
-                                               dbg("no open channel data");
-                                               return TRUE;
-                                       }
+                       if (!open_channel) {
+                               dbg("no open channel data");
+                               return TRUE;
+                       }
 
-                                       dbg("open channel type_format(%s)", g_variant_get_type_string(open_channel));
+                       dbg("open channel type_format(%s)", g_variant_get_type_string(open_channel));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(open_channel,"(isi@vbbbi@viiiis@v)", &command_id, &text, &text_len, &icon_id, &immediate_link, &auto_reconnection, &bg_mode,
-                                                       &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
+                       g_variant_get(open_channel, "(isi@vbbbi@viiiis@v)", &command_id,
+                               &text, &text_len, &icon_id, &immediate_link, &auto_reconnection, &bg_mode,
+                               &bearer_type, &bearer_param, &buffer_size, &protocol_type,
+                               &port_number, &dest_addr_type, &dest_address, &bearer_detail);
 #else
-                                       g_variant_get(open_channel,"(isibbbi@viiiis@v)", &command_id, &text, &text_len, &immediate_link, &auto_reconnection, &bg_mode,
-                                                       &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
+                       g_variant_get(open_channel, "(isibbbi@viiiis@v)", &command_id,
+                               &text, &text_len, &immediate_link, &auto_reconnection, &bg_mode,
+                               &bearer_type, &bearer_param, &buffer_size, &protocol_type,
+                               &port_number, &dest_addr_type, &dest_address, &bearer_detail);
 #endif
-                                       dbg("check display text : text(%s) text len(%d)", text, text_len);
-                                       if(text_len > 1 && (g_strcmp0(text,"") != 0) ){
-                                               GVariant *ui_info = NULL;
-                                               gboolean user_confirm = TRUE;
-                                               int ret;
-                                               dbg("text should be displayed by ui");
-                                               dbg("open channel text is displayed!!!");
+                       dbg("check display text : text(%s) text len(%d)", text, text_len);
+                       if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
+                               GVariant *ui_info = NULL;
+                               gboolean user_confirm = TRUE;
+                               int ret;
+                               dbg("text should be displayed by ui");
+                               dbg("open channel text is displayed!!!");
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
 #else
-                                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
 #endif
-                                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
-                                                       if(!ret) {
-                                                       int rv;
-                                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                                       if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                               dbg("Fail to send terminal response\n");
-                                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                                       if(!rv)
-                                                               dbg("fail to dequeue data\n");
-                                               }
-                                               g_free(text);
-                                               g_free(dest_address);
-                                               return TRUE;
-                                       }
-                                       g_free(text);
-                                       g_free(dest_address);
-
-                                       /*telephony_sat_emit_open_channel(sat, command_id, text, text_len, immediate_link, auto_reconnection, bg_mode,
-                                                               bearer_type, bearer_param, buffer_size, protocol_type, port_number, dest_addr_type, dest_address, bearer_detail);*/
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
+                                       if (!ret) {
+                                       int rv;
+                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+                                       if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                               dbg("Fail to send terminal response\n");
+                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                                       if (!rv)
+                                               dbg("fail to dequeue data\n");
+                               }
+                               g_free(text);
+                               g_free(dest_address);
+                               return TRUE;
+                       }
+                       g_free(text);
+                       g_free(dest_address);
+
+                       /*telephony_sat_emit_open_channel(sat, command_id, text, text_len, immediate_link, auto_reconnection, bg_mode,
+                               bearer_type, bearer_param, buffer_size, protocol_type, port_number, dest_addr_type, dest_address, bearer_detail);*/
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                                       //bip proactive command is only handled by BIP Manager
-                                       {
-                                               GDBusConnection *conn = NULL;
-                                               const gchar *g_path = NULL;
+                       /* bip proactive command is only handled by BIP Manager */
+                       {
+                               GDBusConnection *conn = NULL;
+                               const gchar *g_path = NULL;
 
-                                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
-                                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
+                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
+                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_OPEN_CHANNEL, open_channel);
-                                       }
+                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_OPEN_CHANNEL, open_channel);
+                       }
 #endif
-                               } break;
+                       } break;
 
-                               case SAT_PROATV_CMD_CLOSE_CHANNEL:{
-                                       GVariant *close_channel = NULL;
-
-                                       gint command_id, channel_id, text_len;
-                                       gchar *text = NULL;
+               case SAT_PROATV_CMD_CLOSE_CHANNEL: {
+                       GVariant *close_channel = NULL;
+                       gint command_id, channel_id, text_len;
+                       gchar *text = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       GVariant *icon_id;
 #endif
-                                       close_channel = sat_manager_close_channel_noti(ctx, cp_name, (struct tel_sat_close_channel_tlv*) &p_ind->proactive_ind_data.close_channel);
-
-                                       if(!close_channel){
-                                               dbg("no close channel data");
-                                               return TRUE;
-                                       }
+                       close_channel = sat_manager_close_channel_noti(ctx, cp_name, (struct tel_sat_close_channel_tlv*) &p_ind->proactive_ind_data.close_channel);
 
-                                       //TODO check the data for sat-ui
+                       if (!close_channel) {
+                               dbg("no close channel data");
+                               return TRUE;
+                       }
 
-                                       dbg("close channel type_format(%s)", g_variant_get_type_string(close_channel));
+                       /* TODO check the data for sat-ui */
+                       dbg("close channel type_format(%s)", g_variant_get_type_string(close_channel));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(close_channel, "(isi@vi)", &command_id, &text, &text_len, &icon_id, &channel_id);
+                       g_variant_get(close_channel, "(isi@vi)", &command_id, &text, &text_len, &icon_id, &channel_id);
 #else
-                                       g_variant_get(close_channel, "(isii)", &command_id, &text, &text_len, &channel_id);
+                       g_variant_get(close_channel, "(isii)", &command_id, &text, &text_len, &channel_id);
 #endif
 
-                                       /*telephony_sat_emit_close_channel(sat, command_id, text, text_len, channel_id);*/
+                       /*telephony_sat_emit_close_channel(sat, command_id, text, text_len, channel_id);*/
+                       /* bip proactive command is only handled by BIP Manager */
+                       {
+                               GDBusConnection *conn = NULL;
+                               const gchar *g_path = NULL;
+
+                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
+                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                                       //bip proactive command is only handled by BIP Manager
-                                       {
-                                               GDBusConnection *conn = NULL;
-                                               const gchar *g_path = NULL;
+                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_CLOSE_CHANNEL, close_channel);
+                       }
 
-                                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
-                                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
+                       g_free(text);
+                       } break;
 
-                                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_CLOSE_CHANNEL, close_channel);
-                                       }
+               case SAT_PROATV_CMD_RECEIVE_DATA: {
+                       GVariant *receive_data = NULL;
+                       gint command_id, text_len, channel_id, channel_data_len = 0;
+                       gchar *text = NULL;
+#if defined(TIZEN_SUPPORT_SAT_ICON)
+                       GVariant *icon_id;
+#endif
+                       receive_data = sat_manager_receive_data_noti(ctx, cp_name, (struct tel_sat_receive_channel_tlv*) &p_ind->proactive_ind_data.receive_data);
 
-                                       g_free(text);
-                               } break;
+                       if (!receive_data) {
+                               dbg("no receive data data");
+                               return TRUE;
+                       }
 
-                               case SAT_PROATV_CMD_RECEIVE_DATA:{
-                                       GVariant *receive_data = NULL;
+                       /* TODO check the data for sat-ui */
 
-                                       gint command_id, text_len, channel_id, channel_data_len = 0;
-                                       gchar *text = NULL;
+                       dbg("receive data type_format(%s)", g_variant_get_type_string(receive_data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
+                       g_variant_get(receive_data, "(isi@vii)", &command_id, &text, &text_len, &icon_id, &channel_id, &channel_data_len);
+#else
+                       g_variant_get(receive_data, "(isiii)", &command_id, &text, &text_len, &channel_id, &channel_data_len);
 #endif
-                                       receive_data = sat_manager_receive_data_noti(ctx, cp_name, (struct tel_sat_receive_channel_tlv*) &p_ind->proactive_ind_data.receive_data);
+                       /*telephony_sat_emit_receive_data(sat, command_id, text, text_len, channel_id, channel_data_len);*/
+                       /* bip proactive command is only handled by BIP Manager */
+                       {
+                               GDBusConnection *conn = NULL;
+                               const gchar *g_path = NULL;
 
-                                       if(!receive_data){
-                                               dbg("no receive data data");
-                                               return TRUE;
-                                       }
+                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
+                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                                       //TODO check the data for sat-ui
+                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_RECEIVE_DATA, receive_data);
+                       }
+                       g_free(text);
+                       } break;
+
+               case SAT_PROATV_CMD_SEND_DATA: {
+                       GVariant *send_data = NULL;
+                       gint command_id, channel_id, text_len, channel_data_len;
+                       gboolean send_data_immediately;
+                       gchar *text = NULL;
+                       GVariant *channel_data;
+#if defined(TIZEN_SUPPORT_SAT_ICON)
+                       GVariant *icon_id;
+#endif
+                       send_data = sat_manager_send_data_noti(ctx, cp_name, (struct tel_sat_send_channel_tlv*) &p_ind->proactive_ind_data.send_data);
 
-                                       dbg("receive data type_format(%s)", g_variant_get_type_string(receive_data));
+                       if (!send_data) {
+                               dbg("no send data data");
+                               return TRUE;
+                       }
+                       /* TODO check the data for sat-ui */
+                       dbg("send data type_format(%s)", g_variant_get_type_string(send_data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(receive_data, "(isi@vii)", &command_id, &text, &text_len, &icon_id, &channel_id, &channel_data_len);
+                       g_variant_get(send_data, "(isi@vib@vi)", &command_id, &text, &text_len, &icon_id, &channel_id, &send_data_immediately, &channel_data, &channel_data_len);
 #else
-                                       g_variant_get(receive_data, "(isiii)", &command_id, &text, &text_len, &channel_id, &channel_data_len);
+                       g_variant_get(send_data, "(isiib@vi)", &command_id, &text, &text_len, &channel_id, &send_data_immediately, &channel_data, &channel_data_len);
 #endif
-                                       /*telephony_sat_emit_receive_data(sat, command_id, text, text_len, channel_id, channel_data_len);*/
+                       /*telephony_sat_emit_send_data(sat, command_id, text, text_len, channel_id, send_data_immediately, channel_data, channel_data_len);*/
 
-                                       //bip proactive command is only handled by BIP Manager
-                                       {
-                                               GDBusConnection *conn = NULL;
-                                               const gchar *g_path = NULL;
+                       /* bip proactive command is only handled by BIP Manager */
+                       {
+                               GDBusConnection *conn = NULL;
+                               const gchar *g_path = NULL;
 
-                                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
-                                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
+                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
+                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_RECEIVE_DATA, receive_data);
-                                       }
-                                       g_free(text);
-                               } break;
+                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_SEND_DATA, send_data);
+                       }
+                       g_free(text);
+                       } break;
 
-                               case SAT_PROATV_CMD_SEND_DATA:{
-                                       GVariant *send_data = NULL;
+               case SAT_PROATV_CMD_GET_CHANNEL_STATUS: {
+                       GVariant *channel_status = NULL;
+                       gint command_id;
 
-                                       gint command_id, channel_id, text_len, channel_data_len;
-                                       gboolean send_data_immediately;
-                                       gchar *text = NULL;
-                                       GVariant *channel_data;
-#if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id;
-#endif
-                                       send_data = sat_manager_send_data_noti(ctx, cp_name, (struct tel_sat_send_channel_tlv*) &p_ind->proactive_ind_data.send_data);
+                       channel_status = sat_manager_get_channel_status_noti(ctx, cp_name, (struct tel_sat_get_channel_status_tlv*) &p_ind->proactive_ind_data.get_channel_status);
 
-                                       if(!send_data){
-                                               dbg("no send data data");
-                                               return TRUE;
-                                       }
+                       if (!channel_status) {
+                               dbg("no get channel status data");
+                               return TRUE;
+                       }
 
-                                       //TODO check the data for sat-ui
+                       /* TODO check the data for sat-ui */
+                       dbg("get channel status type_format(%s)", g_variant_get_type_string(channel_status));
+                       g_variant_get(channel_status, "(i)", &command_id);
 
-                                       dbg("send data type_format(%s)", g_variant_get_type_string(send_data));
-#if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(send_data, "(isi@vib@vi)", &command_id, &text, &text_len, &icon_id, &channel_id, &send_data_immediately, &channel_data, &channel_data_len);
-#else
-                                       g_variant_get(send_data, "(isiib@vi)", &command_id, &text, &text_len, &channel_id, &send_data_immediately, &channel_data, &channel_data_len);
-#endif
-                                       /*telephony_sat_emit_send_data(sat, command_id, text, text_len, channel_id, send_data_immediately, channel_data, channel_data_len);*/
-
-                                       //bip proactive command is only handled by BIP Manager
-                                       {
-                                               GDBusConnection *conn = NULL;
-                                               const gchar *g_path = NULL;
-
-                                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
-                                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
-
-                                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_SEND_DATA, send_data);
-                                       }
-                                       g_free(text);
-                               } break;
-
-                               case SAT_PROATV_CMD_GET_CHANNEL_STATUS:{
-                                       GVariant *channel_status = NULL;
-
-                                       gint command_id;
-
-                                       channel_status = sat_manager_get_channel_status_noti(ctx, cp_name, (struct tel_sat_get_channel_status_tlv*) &p_ind->proactive_ind_data.get_channel_status);
-
-                                       if(!channel_status){
-                                               dbg("no get channel status data");
-                                               return TRUE;
-                                       }
-
-                                       //TODO check the data for sat-ui
-
-                                       dbg("get channel status type_format(%s)", g_variant_get_type_string(channel_status));
-                                       g_variant_get(channel_status, "(i)", &command_id);
-
-                                       /*telephony_sat_emit_get_channel_status(sat, command_id);*/
-
-                                       //bip proactive command is only handled by BIP Manager
-                                       {
-                                               GDBusConnection *conn = NULL;
-                                               const gchar *g_path = NULL;
-
-                                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
-                                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
-
-                                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_GET_CHANNEL_STATUS, channel_status);
-                                       }
-                               } break;
-
-                               case SAT_PROATV_CMD_REFRESH:{
-                                       GVariant *refresh = NULL;
-                                       gint command_id = 0;
-                                       gint refresh_type =0;
-                                       GVariant *file_list = NULL;
-                                       int ret;
-
-                                       refresh = sat_manager_refresh_noti(ctx, cp_name, (struct tel_sat_refresh_tlv*) &p_ind->proactive_ind_data.refresh);
-
-                                       if(!refresh){
-                                               dbg("no refresh data");
-                                               return TRUE;
-                                       }
-
-                                       dbg("refresh type_format(%s)", g_variant_get_type_string(refresh));
-                                       g_variant_get(refresh, "(ii@v)", &command_id, &refresh_type, &file_list);
-
-                                       telephony_sat_emit_refresh(sat, command_id, refresh_type, file_list);
-                                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_REFRESH, refresh, slot_id);
-                                       if(!ret) {
-                                               int rv;
-                                               dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                               if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                       dbg("Fail to send terminal response\n");
-                                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                               if(!rv)
-                                                       dbg("fail to dequeue data\n");
-                                       }
-                               }break;
-
-                               case SAT_PROATV_CMD_MORE_TIME:{
-                                       sat_manager_more_time_noti(ctx, cp_name, (struct tel_sat_more_time_tlv*) &p_ind->proactive_ind_data.more_time);
-                                       telephony_sat_emit_more_time(sat);
-                               }break;
-
-                               case SAT_PROATV_CMD_SEND_DTMF:{
-                                       GVariant *send_dtmf = NULL;
-                                       gint command_id = 0;
-                                       gint text_len = 0, dtmf_str_len = 0;
-                                       gchar *text = NULL;
-                                       gchar *dtmf_str = NULL;
+                       /*telephony_sat_emit_get_channel_status(sat, command_id);*/
+                       /* bip proactive command is only handled by BIP Manager */
+                       {
+                               GDBusConnection *conn = NULL;
+                               const gchar *g_path = NULL;
+
+                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
+                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
+
+                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_GET_CHANNEL_STATUS, channel_status);
+                       }
+                       } break;
+
+               case SAT_PROATV_CMD_REFRESH: {
+                       GVariant *refresh = NULL;
+                       gint command_id = 0;
+                       gint refresh_type = 0;
+                       GVariant *file_list = NULL;
+                       int ret;
+
+                       refresh = sat_manager_refresh_noti(ctx, cp_name, (struct tel_sat_refresh_tlv*) &p_ind->proactive_ind_data.refresh);
+
+                       if (!refresh) {
+                               dbg("no refresh data");
+                               return TRUE;
+                       }
+
+                       dbg("refresh type_format(%s)", g_variant_get_type_string(refresh));
+                       g_variant_get(refresh, "(ii@v)", &command_id, &refresh_type, &file_list);
+
+                       telephony_sat_emit_refresh(sat, command_id, refresh_type, file_list);
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_REFRESH, refresh, slot_id);
+                       if (!ret) {
+                               int rv;
+                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+                               if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                       dbg("Fail to send terminal response\n");
+                               rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                               if (!rv)
+                                       dbg("fail to dequeue data\n");
+                       }
+                       } break;
+
+               case SAT_PROATV_CMD_MORE_TIME: {
+                       sat_manager_more_time_noti(ctx, cp_name, (struct tel_sat_more_time_tlv*) &p_ind->proactive_ind_data.more_time);
+                       telephony_sat_emit_more_time(sat);
+                       } break;
+
+               case SAT_PROATV_CMD_SEND_DTMF: {
+                       GVariant *send_dtmf = NULL;
+                       gint command_id = 0;
+                       gint text_len = 0, dtmf_str_len = 0;
+                       gchar *text = NULL;
+                       gchar *dtmf_str = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id = NULL;
+                       GVariant *icon_id = NULL;
 #endif
-                                       send_dtmf = sat_manager_send_dtmf_noti(ctx, cp_name, (struct tel_sat_send_dtmf_tlv*) &p_ind->proactive_ind_data.send_dtmf);
-                                       if(!send_dtmf){
-                                               dbg("no send_dtmf data");
-                                               return TRUE;
-                                       }
+                       send_dtmf = sat_manager_send_dtmf_noti(ctx, cp_name, (struct tel_sat_send_dtmf_tlv*) &p_ind->proactive_ind_data.send_dtmf);
+                       if (!send_dtmf) {
+                               dbg("no send_dtmf data");
+                               return TRUE;
+                       }
 
-                                       dbg("send_dtmf type_format(%s)", g_variant_get_type_string(send_dtmf));
+                       dbg("send_dtmf type_format(%s)", g_variant_get_type_string(send_dtmf));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(send_dtmf, "(isi@vis)", &command_id, &text, &text_len, &icon_id, &dtmf_str_len, &dtmf_str);
+                       g_variant_get(send_dtmf, "(isi@vis)", &command_id, &text, &text_len, &icon_id, &dtmf_str_len, &dtmf_str);
 #else
-                                       g_variant_get(send_dtmf, "(isiis)", &command_id, &text, &text_len, &dtmf_str_len, &dtmf_str);
+                       g_variant_get(send_dtmf, "(isiis)", &command_id, &text, &text_len, &dtmf_str_len, &dtmf_str);
 #endif
-                                       if(text_len > 1 && (g_strcmp0(text,"") != 0) ){
-                                               GVariant *ui_info = NULL;
-                                               gboolean user_confirm = FALSE;
-                                               int ret;
-                                               dbg("text should be displayed by ui");
-                                               dbg("send dtmf is displayed!!!");
+                       if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
+                               GVariant *ui_info = NULL;
+                               gboolean user_confirm = FALSE;
+                               int ret;
+                               dbg("text should be displayed by ui");
+                               dbg("send dtmf is displayed!!!");
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
 #else
-                                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
 #endif
-                                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SEND_DTMF, ui_info, slot_id);
-                                               if(!ret) {
-                                                       int rv;
-                                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                                       if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                               dbg("Fail to send terminal response\n");
-                                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                                       if(!rv)
-                                                               dbg("fail to dequeue data\n");
-                                               }
-                                               g_free(text);
-                                               g_free(dtmf_str);
-                                               return TRUE;
-                                       }
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SEND_DTMF, ui_info, slot_id);
+                               if (!ret) {
+                                       int rv;
+                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+                                       if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                               dbg("Fail to send terminal response\n");
+                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                                       if (!rv)
+                                               dbg("fail to dequeue data\n");
+                               }
+                               g_free(text);
+                               g_free(dtmf_str);
+                               return TRUE;
+                       }
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                                       telephony_sat_emit_send_dtmf(sat, command_id, text, text_len, dtmf_str, dtmf_str_len);
+                       telephony_sat_emit_send_dtmf(sat, command_id, text, text_len, dtmf_str, dtmf_str_len);
 #endif
-                                       g_free(text);
-                                       g_free(dtmf_str);
-                               }break;
-
-                               case SAT_PROATV_CMD_LAUNCH_BROWSER:{
-                                       GVariant *launch_browser = NULL;
-                                       gint command_id = 0;
-                                       gint browser_launch_type = 0, browser_id = 0;
-                                       gint url_len = 0, text_len = 0, gateway_proxy_len =0;
-                                       gchar *url = NULL;
-                                       gchar *text = NULL;
-                                       gchar *gateway_proxy = NULL;
+                       g_free(text);
+                       g_free(dtmf_str);
+                       break;
+
+               case SAT_PROATV_CMD_LAUNCH_BROWSER: {
+                       GVariant *launch_browser = NULL;
+                       gint command_id = 0;
+                       gint browser_launch_type = 0, browser_id = 0;
+                       gint url_len = 0, text_len = 0, gateway_proxy_len = 0;
+                       gchar *url = NULL;
+                       gchar *text = NULL;
+                       gchar *gateway_proxy = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       GVariant *icon_id = NULL;
+                       GVariant *icon_id = NULL;
 #endif
-                                       launch_browser = sat_manager_launch_browser_noti(ctx, cp_name, (struct tel_sat_launch_browser_tlv*) &p_ind->proactive_ind_data.launch_browser);
-                                       if(!launch_browser){
-                                               dbg("no launch_browser data");
-                                               return TRUE;
-                                       }
+                       launch_browser = sat_manager_launch_browser_noti(ctx, cp_name, (struct tel_sat_launch_browser_tlv*) &p_ind->proactive_ind_data.launch_browser);
+                       if (!launch_browser) {
+                               dbg("no launch_browser data");
+                               return TRUE;
+                       }
 
-                                       dbg("launch_browser type_format(%s)", g_variant_get_type_string(launch_browser));
+                       dbg("launch_browser type_format(%s)", g_variant_get_type_string(launch_browser));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                       g_variant_get(launch_browser, "(iiisisisi@v)", &command_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len, &icon_id);
+                       g_variant_get(launch_browser, "(iiisisisi@v)", &command_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len, &icon_id);
 #else
-                                       g_variant_get(launch_browser, "(iiisisisi)", &command_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len);
+                       g_variant_get(launch_browser, "(iiisisisi)", &command_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len);
 #endif
-                                       //Popup is mendatory option in browser case
-                                       {
-                                               GVariant *ui_info = NULL;
-                                               gboolean user_confirm = TRUE;
-                                               int ret;
-                                               dbg("text should be displayed by ui");
-                                               dbg("launch browser is displayed!!!");
+                       /* Popup is mendatory option in browser case */
+                       {
+                               GVariant *ui_info = NULL;
+                               gboolean user_confirm = TRUE;
+                               int ret;
+                               dbg("text should be displayed by ui");
+                               dbg("launch browser is displayed!!!");
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
 #else
-                                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
 #endif
-                                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_LAUNCH_BROWSER, ui_info, slot_id);
-                                               if(!ret) {
-                                                       int rv;
-                                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
-                                                       if(!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                                               dbg("Fail to send terminal response\n");
-                                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
-                                                       if(!rv)
-                                                               dbg("fail to dequeue data\n");
-                                               }
-                                               g_free(url);
-                                               g_free(text);
-                                               g_free(gateway_proxy);
-                                               return TRUE;
-                                       }
-                               }break;
-
-                               case SAT_PROATV_CMD_PROVIDE_LOCAL_INFO:{
-                                       GVariant *provide_info = NULL;
-                                       gint info_type = 0;
-
-                                       provide_info = sat_manager_provide_local_info_noti(ctx, cp_name, (struct tel_sat_provide_local_info_tlv*) &p_ind->proactive_ind_data.provide_local_info);
-                                       if(!provide_info){
-                                               dbg("no provide_info data");
-                                               return TRUE;
-                                       }
-
-                                       dbg("provide_info type_format(%s)", g_variant_get_type_string(provide_info));
-                                       g_variant_get(provide_info, "(i)", &info_type);
-
-                                       telephony_sat_emit_provide_local_info(sat, info_type);
-                               }break;
-
-                               case SAT_PROATV_CMD_LANGUAGE_NOTIFICATION:{
-                                       GVariant *language_noti = NULL;
-                                       gint command_id = 0;
-                                       gint language = 0;
-                                       gboolean b_specified = FALSE;
-
-                                       language_noti = sat_manager_language_notification_noti(ctx, cp_name, (struct tel_sat_language_notification_tlv*) &p_ind->proactive_ind_data.language_notification);
-                                       if(!language_noti){
-                                               dbg("no language_noti data");
-                                               return TRUE;
-                                       }
-
-                                       dbg("language_noti type_format(%s)", g_variant_get_type_string(language_noti));
-                                       g_variant_get(language_noti, "(iib)", &command_id, &language, &b_specified);
-
-                                       sat_manager_update_language(ctx, cp_name, language_noti);
-
-                                       telephony_sat_emit_language_notification(sat, command_id, language, b_specified);
-                               }break;
-
-                               default:{
-                                       gboolean rv = FALSE;
-                                       rv = sat_manager_processing_unsupport_proactive_command(ctx, cp_name, (struct tel_sat_unsupproted_command_tlv*) &p_ind->proactive_ind_data.unsupport_cmd);
-                                       dbg("not handled ind->cmd_type[0x%x] send error tr result(%d)", p_ind->cmd_type, rv);
-                               }break;
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_LAUNCH_BROWSER, ui_info, slot_id);
+                               if (!ret) {
+                                       int rv;
+                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+                                       if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
+                                               dbg("Fail to send terminal response\n");
+                                       rv = sat_manager_remove_cmd_by_id(ctx, command_id);
+                                       if (!rv)
+                                               dbg("fail to dequeue data\n");
+                               }
+                               g_free(url);
+                               g_free(text);
+                               g_free(gateway_proxy);
+                               return TRUE;
                        }
+                       } break;
+
+               case SAT_PROATV_CMD_PROVIDE_LOCAL_INFO: {
+                       GVariant *provide_info = NULL;
+                       gint info_type = 0;
+
+                       provide_info = sat_manager_provide_local_info_noti(ctx, cp_name, (struct tel_sat_provide_local_info_tlv*) &p_ind->proactive_ind_data.provide_local_info);
+                       if (!provide_info) {
+                               dbg("no provide_info data");
+                               return TRUE;
+                       }
+
+                       dbg("provide_info type_format(%s)", g_variant_get_type_string(provide_info));
+                       g_variant_get(provide_info, "(i)", &info_type);
+
+                       telephony_sat_emit_provide_local_info(sat, info_type);
+                       } break;
+
+               case SAT_PROATV_CMD_LANGUAGE_NOTIFICATION: {
+                       GVariant *language_noti = NULL;
+                       gint command_id = 0;
+                       gint language = 0;
+                       gboolean b_specified = FALSE;
+
+                       language_noti = sat_manager_language_notification_noti(ctx, cp_name, (struct tel_sat_language_notification_tlv*) &p_ind->proactive_ind_data.language_notification);
+                       if (!language_noti) {
+                               dbg("no language_noti data");
+                               return TRUE;
+                       }
+
+                       dbg("language_noti type_format(%s)", g_variant_get_type_string(language_noti));
+                       g_variant_get(language_noti, "(iib)", &command_id, &language, &b_specified);
+
+                       sat_manager_update_language(ctx, cp_name, language_noti);
+
+                       telephony_sat_emit_language_notification(sat, command_id, language, b_specified);
+                       } break;
+
+               default:{
+                       gboolean rv = FALSE;
+                       rv = sat_manager_processing_unsupport_proactive_command(ctx, cp_name, (struct tel_sat_unsupproted_command_tlv*) &p_ind->proactive_ind_data.unsupport_cmd);
+                       dbg("not handled ind->cmd_type[0x%x] send error tr result(%d)", p_ind->cmd_type, rv);
+                       } break;
+               }
                } break;
-               default:
-                       err("Unhandled Notification: [0x%x]", command);
+       default:
+               err("Unhandled Notification: [0x%x]", command);
                break;
        }
 
old mode 100755 (executable)
new mode 100644 (file)
index f82a13f..3bba87d
@@ -82,48 +82,48 @@ static unsigned char _convert_decimal_to_bcd(int dec)
 static const gchar* _convert_sim_lang_to_string(enum tel_sim_language_type lang)
 {
        dbg("convert lang(%d)", lang);
-       switch(lang){
-               case SIM_LANG_GERMAN:
-                       return "de_DE.UTF-8";
-               case SIM_LANG_ENGLISH:
-                       return "en_GB.UTF-8";
-               case SIM_LANG_ITALIAN:
-                       return "it_IT.UTF-8";
-               case SIM_LANG_FRENCH:
-                       return "fr_FR.UTF-8";
-               case SIM_LANG_SPANISH:
-                       return "es_ES.UTF-8";
-               case SIM_LANG_DUTCH:
-                       return "nl_NL.UTF-8";
-               case SIM_LANG_SWEDISH:
-                       return "sv_SE.UTF-8";
-               case SIM_LANG_DANISH:
-                       return "da_DK.UTF-8";
-               case SIM_LANG_PORTUGUESE:
-                       return "pt_PT.UTF-8";
-               case SIM_LANG_FINNISH:
-                       return "fi_FI.UTF-8";
-               case SIM_LANG_NORWEGIAN:
-                       return "nb_NO.UTF-8";
-               case SIM_LANG_GREEK:
-                       return "el_GR.UTF-8";
-               case SIM_LANG_TURKISH:
-                       return "tr_TR.UTF-8";
-               case SIM_LANG_HUNGARIAN:
-                       return "hu_HU.UTF-8";
-               case SIM_LANG_POLISH:
-                       return "pl_PL.UTF-8";
-               case SIM_LANG_KOREAN:
-                       return "ko_KR.UTF-8";
-               case SIM_LANG_CHINESE:
-                       return "zh_CH.UTF-8";
-               case SIM_LANG_RUSSIAN:
-                       return "ru_RU.UTF-8";
-               case SIM_LANG_JAPANESE:
-                       return "ja_JP.UTF-8";
-               default:
-                       return NULL;
-       }//end of switch
+       switch (lang) {
+       case SIM_LANG_GERMAN:
+               return "de_DE.UTF-8";
+       case SIM_LANG_ENGLISH:
+               return "en_GB.UTF-8";
+       case SIM_LANG_ITALIAN:
+               return "it_IT.UTF-8";
+       case SIM_LANG_FRENCH:
+               return "fr_FR.UTF-8";
+       case SIM_LANG_SPANISH:
+               return "es_ES.UTF-8";
+       case SIM_LANG_DUTCH:
+               return "nl_NL.UTF-8";
+       case SIM_LANG_SWEDISH:
+               return "sv_SE.UTF-8";
+       case SIM_LANG_DANISH:
+               return "da_DK.UTF-8";
+       case SIM_LANG_PORTUGUESE:
+               return "pt_PT.UTF-8";
+       case SIM_LANG_FINNISH:
+               return "fi_FI.UTF-8";
+       case SIM_LANG_NORWEGIAN:
+               return "nb_NO.UTF-8";
+       case SIM_LANG_GREEK:
+               return "el_GR.UTF-8";
+       case SIM_LANG_TURKISH:
+               return "tr_TR.UTF-8";
+       case SIM_LANG_HUNGARIAN:
+               return "hu_HU.UTF-8";
+       case SIM_LANG_POLISH:
+               return "pl_PL.UTF-8";
+       case SIM_LANG_KOREAN:
+               return "ko_KR.UTF-8";
+       case SIM_LANG_CHINESE:
+               return "zh_CH.UTF-8";
+       case SIM_LANG_RUSSIAN:
+               return "ru_RU.UTF-8";
+       case SIM_LANG_JAPANESE:
+               return "ja_JP.UTF-8";
+       default:
+               return NULL;
+       }
 
        return NULL;
 }
@@ -132,63 +132,44 @@ static enum tel_sim_language_type _convert_string_to_sim_lang(const gchar* lang_
 {
        dbg("convert lang(%s)", lang_str);
 
-       if (g_str_equal(lang_str, "de_DE.UTF-8") == TRUE) {
+       if (g_str_equal(lang_str, "de_DE.UTF-8") == TRUE)
                return SIM_LANG_GERMAN;
-       }
-       else if (g_str_equal(lang_str, "en_GB.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "en_GB.UTF-8") == TRUE)
                return SIM_LANG_ENGLISH;
-       }
-       else if (g_str_equal(lang_str, "it_IT.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "it_IT.UTF-8") == TRUE)
                return SIM_LANG_ITALIAN;
-       }
-       else if (g_str_equal(lang_str, "fr_FR.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "fr_FR.UTF-8") == TRUE)
                return SIM_LANG_FRENCH;
-       }
-       else if (g_str_equal(lang_str, "es_ES.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "es_ES.UTF-8") == TRUE)
                return SIM_LANG_SPANISH;
-       }
-       else if (g_str_equal(lang_str, "nl_NL.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "nl_NL.UTF-8") == TRUE)
                return SIM_LANG_DUTCH;
-       }
-       else if (g_str_equal(lang_str, "sv_SE.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "sv_SE.UTF-8") == TRUE)
                return SIM_LANG_SWEDISH;
-       }
-       else if (g_str_equal(lang_str, "da_DK.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "da_DK.UTF-8") == TRUE)
                return SIM_LANG_DANISH;
-       }
-       else if (g_str_equal(lang_str, "pt_PT.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "pt_PT.UTF-8") == TRUE)
                return SIM_LANG_PORTUGUESE;
-       }
-       else if (g_str_equal(lang_str, "fi_FI.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "fi_FI.UTF-8") == TRUE)
                return SIM_LANG_FINNISH;
-       }
-       else if (g_str_equal(lang_str, "nb_NO.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "nb_NO.UTF-8") == TRUE)
                return SIM_LANG_NORWEGIAN;
-       }
-       else if (g_str_equal(lang_str, "el_GR.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "el_GR.UTF-8") == TRUE)
                return SIM_LANG_GREEK;
-       }
-       else if (g_str_equal(lang_str, "tr_TR.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "tr_TR.UTF-8") == TRUE)
                return SIM_LANG_TURKISH;
-       }
-       else if (g_str_equal(lang_str, "hu_HU.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "hu_HU.UTF-8") == TRUE)
                return SIM_LANG_HUNGARIAN;
-       }
-       else if (g_str_equal(lang_str, "pl_PL.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "pl_PL.UTF-8") == TRUE)
                return SIM_LANG_POLISH;
-       }
-       else if (g_str_equal(lang_str, "ko_KR.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "ko_KR.UTF-8") == TRUE)
                return SIM_LANG_KOREAN;
-       }
-       else if (g_str_equal(lang_str, "zh_CH.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "zh_CH.UTF-8") == TRUE)
                return SIM_LANG_CHINESE;
-       }
-       else if (g_str_equal(lang_str, "ru_RU.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "ru_RU.UTF-8") == TRUE)
                return SIM_LANG_RUSSIAN;
-       }
-       else if (g_str_equal(lang_str, "ja_JP.UTF-8") == TRUE) {
+       else if (g_str_equal(lang_str, "ja_JP.UTF-8") == TRUE)
                return SIM_LANG_JAPANESE;
-       }
 
        dbg("there is no matched language");
        return SIM_LANG_UNSPECIFIED;
@@ -219,12 +200,13 @@ static char* _convert_hex_string_to_bytes(char *s)
 
        sz = strlen(s);
        ret = calloc(1, (sz / 2) + 1);
+       if (!ret)
+               return NULL;
 
        dbg("Convert String to Binary!!");
 
-       for (i = 0; i < sz; i += 2) {
+       for (i = 0; i < sz; i += 2)
                ret[i / 2] = (char) ((_convert_hex_char_to_int(s[i]) << 4) | _convert_hex_char_to_int(s[i + 1]));
-       }
 
        return ret;
 }
@@ -232,22 +214,22 @@ static char* _convert_hex_string_to_bytes(char *s)
 static unsigned int _get_time_in_ms(struct tel_sat_duration *dr)
 {
        switch (dr->time_unit) {
-               case TIME_UNIT_MINUTES:
-                       return (unsigned int)dr->time_interval * 60000;
-                       break;
+       case TIME_UNIT_MINUTES:
+               return (unsigned int)dr->time_interval * 60000;
+               break;
 
-               case TIME_UNIT_SECONDS:
-                       return (unsigned int)dr->time_interval * 1000;
-                       break;
+       case TIME_UNIT_SECONDS:
+               return (unsigned int)dr->time_interval * 1000;
+               break;
 
-               case TIME_UNIT_TENTHS_OF_SECONDS:
-                       return (unsigned int)dr->time_interval * 100;
-                       break;
+       case TIME_UNIT_TENTHS_OF_SECONDS:
+               return (unsigned int)dr->time_interval * 100;
+               break;
 
-               case TIME_UNIT_RESERVED:
-               default:
-                       return 0;       // set default
-                       break;
+       case TIME_UNIT_RESERVED:
+       default:
+               return 0;
+               break;
        }
 
        return 0;
@@ -259,15 +241,15 @@ static int _get_queue_empty_index(void)
        int i;
        int local_index = -1;
 
-       for(i =0; i<SAT_DEF_CMD_Q_MAX ; i++) {
-               if(sat_queue[i]) {
-                       dbg("index[%d] is being used",i);
+       for (i = 0; i < SAT_DEF_CMD_Q_MAX; i++) {
+               if (sat_queue[i]) {
+                       dbg("index[%d] is being used", i);
                        cnt++;
                }
        }
-       for(i =0; i<SAT_DEF_CMD_Q_MAX ; i++) {
-               if(!sat_queue[i]) {
-                       dbg("found empty slot [%p] at index [%d]", sat_queue[i] ,i);
+       for (i = 0; i < SAT_DEF_CMD_Q_MAX; i++) {
+               if (!sat_queue[i]) {
+                       dbg("found empty slot [%p] at index [%d]", sat_queue[i]i);
                        local_index = i;
                        break;
                }
@@ -290,14 +272,14 @@ static gboolean _push_data(struct custom_data *ctx, struct sat_manager_queue_dat
 
        item = g_new0(struct sat_manager_queue_data, 1);
 
-       if(!item) {
+       if (!item) {
                dbg("[SAT] FAILED TO ALLOC QUEUE ITEM!\n");
                return FALSE;
        }
 
        memcpy((void*)item, (void*)cmd_obj, sizeof(struct sat_manager_queue_data));
        sat_queue[local_index] = item;
-       dbg("push data to queue at index[%d], [%p].\n",local_index, item);
+       dbg("push data to queue at index[%d], [%p].\n", local_index, item);
        return TRUE;
 }
 
@@ -308,7 +290,7 @@ static gboolean _pop_nth_data(struct custom_data *ctx, struct sat_manager_queue_
 
        SAT_CMD_Q_CHECK(local_index);
 
-       if(!sat_queue[local_index]) {
+       if (!sat_queue[local_index]) {
                dbg("[SAT] sat_queue[%d] is null !!\n", local_index);
                return FALSE;
        }
@@ -316,7 +298,7 @@ static gboolean _pop_nth_data(struct custom_data *ctx, struct sat_manager_queue_
        item = sat_queue[local_index];
 
        memcpy((void*)cmd_obj, (void*)item, sizeof(struct sat_manager_queue_data));
-       dbg("pop data from queue at index[%d],[%p].\n",local_index, item);
+       dbg("pop data from queue at index[%d],[%p].\n", local_index, item);
        sat_queue[local_index] = NULL;
        g_free(item);
        return TRUE;
@@ -330,14 +312,14 @@ static gboolean _peek_nth_data(struct custom_data *ctx, struct sat_manager_queue
 
        SAT_CMD_Q_CHECK(local_index);
 
-       if(!sat_queue[local_index]) {
+       if (!sat_queue[local_index]) {
                dbg("[SAT] sat_queue[%d] is null !!\n", local_index);
                return FALSE;
        }
 
        item = sat_queue[local_index];
        memcpy((void*)cmd_obj, (void*)item, sizeof(struct sat_manager_queue_data));
-       dbg("peek data from queue at index[%d],[%p].\n",local_index, item);
+       dbg("peek data from queue at index[%d],[%p].\n", local_index, item);
        return TRUE;
 }
 
@@ -345,7 +327,7 @@ static gboolean _sat_manager_check_language_set(const char* lan)
 {
        xmlNode *cur_node = NULL;
        xmlNodePtr cur;
-       void *xml_doc = NULL,*xml_root_node = NULL;
+       void *xml_doc = NULL, *xml_root_node = NULL;
        char *id = NULL;
        gboolean ret = FALSE;
 
@@ -357,7 +339,7 @@ static gboolean _sat_manager_check_language_set(const char* lan)
 
        cur = xml_root_node;
        /* Compare language */
-       for(cur_node = cur; cur_node; cur_node = cur_node->next) {
+       for (cur_node = cur; cur_node; cur_node = cur_node->next) {
                if (cur_node->type == XML_ELEMENT_NODE) {
                        id = (char *)xmlGetProp(cur_node, (const xmlChar *)"id");
                        if (id && g_str_has_prefix(lan, id)) {
@@ -378,22 +360,22 @@ void sat_manager_init_queue(struct custom_data *ctx, const char *cp_name)
        int i;
 
        dbg("Entered into queue");
-       for(i=0;i<SAT_DEF_CMD_Q_MAX;i++) {
+       for (i = 0; i < SAT_DEF_CMD_Q_MAX; i++) {
                struct sat_manager_queue_data * item = sat_queue[i];
-               if(item != NULL && !g_strcmp0(cp_name,item->cp_name)) {
+               if (item != NULL && !g_strcmp0(cp_name, item->cp_name)) {
                        dbg("item[%d]: cmd_type[%d]", i, item->cmd_type);
 #if defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                       switch(item->cmd_type) {
-                               case SAT_PROATV_CMD_SEND_SMS:
-                               case SAT_PROATV_CMD_SEND_SS:
-                               case SAT_PROATV_CMD_SEND_USSD:
-                               case SAT_PROATV_CMD_SEND_DTMF: {
-                                       dbg("[SAT] set noti flag");
-                                       item->noti_required = TRUE;
-                                       return;
-                                       } break;
-                               default:
-                                       break;
+                       switch (item->cmd_type) {
+                       case SAT_PROATV_CMD_SEND_SMS:
+                       case SAT_PROATV_CMD_SEND_SS:
+                       case SAT_PROATV_CMD_SEND_USSD:
+                       case SAT_PROATV_CMD_SEND_DTMF: {
+                               dbg("[SAT] set noti flag");
+                               item->noti_required = TRUE;
+                               return;
+                               } break;
+                       default:
+                               break;
                        }
 #endif
                        g_free(item->cp_name);
@@ -408,7 +390,7 @@ static gboolean sat_manager_enqueue_cmd(struct custom_data *ctx, struct sat_mana
        int id;
 
        id = _get_queue_empty_index();
-       if(id < 0) {
+       if (id < 0) {
                dbg("Fail to get empty index.\n");
                return FALSE;
        }
@@ -431,26 +413,20 @@ static gboolean sat_manager_check_availiable_event_list(struct tel_sat_setup_eve
        gboolean rv = TRUE;
        int local_index = 0;
 
-       for(local_index = 0; local_index < event_list_tlv->event_list.event_list_cnt; local_index++){
-               if(event_list_tlv->event_list.evt_list[local_index] == EVENT_USER_ACTIVITY){
+       for (local_index = 0; local_index < event_list_tlv->event_list.event_list_cnt; local_index++) {
+               if (event_list_tlv->event_list.evt_list[local_index] == EVENT_USER_ACTIVITY) {
                        dbg("do user activity");
-               }
-               else if(event_list_tlv->event_list.evt_list[local_index] == EVENT_IDLE_SCREEN_AVAILABLE){
+               } else if (event_list_tlv->event_list.evt_list[local_index] == EVENT_IDLE_SCREEN_AVAILABLE) {
                        dbg("do idle screen");
-               }
-               else if(event_list_tlv->event_list.evt_list[local_index] == EVENT_LANGUAGE_SELECTION){
+               } else if (event_list_tlv->event_list.evt_list[local_index] == EVENT_LANGUAGE_SELECTION) {
                        dbg("do language selection");
-               }
-               else if(event_list_tlv->event_list.evt_list[local_index] == EVENT_BROWSER_TERMINATION){
+               } else if (event_list_tlv->event_list.evt_list[local_index] == EVENT_BROWSER_TERMINATION) {
                        dbg("do browser termination");
-               }
-               else if(event_list_tlv->event_list.evt_list[local_index] == EVENT_DATA_AVAILABLE){
+               } else if (event_list_tlv->event_list.evt_list[local_index] == EVENT_DATA_AVAILABLE) {
                        dbg("do data available (bip)");
-               }
-               else if(event_list_tlv->event_list.evt_list[local_index] == EVENT_CHANNEL_STATUS){
+               } else if (event_list_tlv->event_list.evt_list[local_index] == EVENT_CHANNEL_STATUS) {
                        dbg("do channel status (bip)");
-               }
-               else{
+               } else {
                        dbg("unmanaged event (%d)", event_list_tlv->event_list.evt_list[local_index]);
                        rv = FALSE;
                }
@@ -475,7 +451,7 @@ static TReturn sat_manager_send_user_confirmation(Communicator *comm, TcorePlugi
        tcore_user_request_set_data(ur, sizeof(struct treq_sat_user_confirmation_data), (void *)conf_data);
        rv = tcore_communicator_dispatch_request(comm, ur);
        if (rv != TCORE_RETURN_SUCCESS) {
-               dbg("fail to send terminal response",rv);
+               dbg("fail to send terminal response", rv);
                tcore_user_request_unref(ur);
                rv = TCORE_RETURN_FAILURE;
        }
@@ -499,7 +475,7 @@ static TReturn sat_manager_send_terminal_response(Communicator *comm, TcorePlugi
        tcore_user_request_set_data(ur, sizeof(struct treq_sat_terminal_rsp_data), (void *)tr);
        rv = tcore_communicator_dispatch_request(comm, ur);
        if (rv != TCORE_RETURN_SUCCESS) {
-               dbg("fail to send terminal response",rv);
+               dbg("fail to send terminal response", rv);
                tcore_user_request_unref(ur);
                rv = TCORE_RETURN_FAILURE;
        }
@@ -512,13 +488,13 @@ gboolean sat_manager_remove_cmd_by_id(struct custom_data *ctx, int cmd_id)
        struct sat_manager_queue_data *item;
        int local_index = cmd_id;
 
-       if(!sat_queue[local_index]) {
+       if (!sat_queue[local_index]) {
                dbg("[SAT] sat_queue[%d] is already null !!\n", local_index);
                return FALSE;
        }
        item = sat_queue[local_index];
 
-       dbg("remove data from queue at index[%d],[%p].\n",local_index, item);
+       dbg("remove data from queue at index[%d],[%p].\n", local_index, item);
        sat_queue[local_index] = NULL;
        g_free(item->cp_name);
        g_free(item);
@@ -554,7 +530,7 @@ GVariant* sat_manager_caching_setup_menu_info(struct custom_data *ctx, const cha
        memset(&main_title, 0 , SAT_ALPHA_ID_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
@@ -566,16 +542,16 @@ GVariant* sat_manager_caching_setup_menu_info(struct custom_data *ctx, const cha
                        continue;
 
                if (g_strcmp0(object->cp_name, cp_name) == 0) {
-                       if(object->cached_sat_main_menu) {
+                       if (object->cached_sat_main_menu) {
                                dbg("main menu info is updated");
                                updated = TRUE;
                        }
                }
        }
 
-       //check the validation of content
-       if(!setup_menu_tlv->menu_item_cnt || !setup_menu_tlv->menu_item[0].text_len){
-               //support GCF case 27.22.4.8.1 - 1.1 setup menu
+       /* check the validation of content */
+       if (!setup_menu_tlv->menu_item_cnt || !setup_menu_tlv->menu_item[0].text_len) {
+               /* support GCF case 27.22.4.8.1 - 1.1 setup menu */
 
                dbg("no menu item updated menu(%d)", updated);
 
@@ -588,14 +564,13 @@ GVariant* sat_manager_caching_setup_menu_info(struct custom_data *ctx, const cha
                tr.terminal_rsp_data.setup_menu.device_id.src = setup_menu_tlv->device_id.dest;
                tr.terminal_rsp_data.setup_menu.device_id.dest = setup_menu_tlv->device_id.src;
 
-               if(updated){
+               if (updated)
                        tr.terminal_rsp_data.setup_menu.result_type = RESULT_SUCCESS;
-               }else{
+               else
                        tr.terminal_rsp_data.setup_menu.result_type = RESULT_BEYOND_ME_CAPABILITIES;
-               }
 
                sat_manager_send_terminal_response(ctx->comm, plg, &tr);
-               //return NULL;
+               /* return NULL; */
        }
 
 
@@ -603,23 +578,23 @@ GVariant* sat_manager_caching_setup_menu_info(struct custom_data *ctx, const cha
        menu_present = setup_menu_tlv->command_detail.cmd_qualifier.setup_menu.select_preference;
        menu_cnt = setup_menu_tlv->menu_item_cnt;
 
-       //get title
-       if(setup_menu_tlv->alpha_id.alpha_data_len)
+       /* get title */
+       if (setup_menu_tlv->alpha_id.alpha_data_len)
                tcore_util_convert_string_to_utf8((unsigned char*)&main_title, (unsigned short*)&title_len,
                        setup_menu_tlv->alpha_id.dcs.a_format,
                        (unsigned char*)&setup_menu_tlv->alpha_id.alpha_data,
                        (unsigned short)setup_menu_tlv->alpha_id.alpha_data_len);
-       dbg("sat main menu title(%s)",main_title);
+       dbg("sat main menu title(%s)", main_title);
 
-       g_variant_builder_init(&v_builder, G_VARIANT_TYPE ("a(si)"));
+       g_variant_builder_init(&v_builder, G_VARIANT_TYPE("a(si)"));
 
-       //get menu items
-       if(!setup_menu_tlv->next_act_ind_list.cnt){
+       /* get menu items */
+       if (!setup_menu_tlv->next_act_ind_list.cnt) {
                int local_index = 0;
 
                dbg("setup_menu_tlv->next_act_ind_list.cnt == 0");
 
-               for(local_index = 0; local_index < menu_cnt; local_index++){
+               for (local_index = 0; local_index < menu_cnt; local_index++) {
                        gushort item_len;
                        gchar item_str[SAT_ITEM_TEXT_LEN_MAX + 1];
 
@@ -629,18 +604,17 @@ GVariant* sat_manager_caching_setup_menu_info(struct custom_data *ctx, const cha
                                (unsigned char*)&setup_menu_tlv->menu_item[local_index].text,
                                (unsigned short)setup_menu_tlv->menu_item[local_index].text_len);
 
-                       dbg( "index(%d) item_id(%d) item_string(%s)", local_index, setup_menu_tlv->menu_item[local_index].item_id, item_str);
+                       dbg("index(%d) item_id(%d) item_string(%s)", local_index, setup_menu_tlv->menu_item[local_index].item_id, item_str);
 
-                       //g_variant_builder_add(v_builder, "(sy)", &item_str, setup_menu_tlv->menu_item[index].item_id);
+                       /* g_variant_builder_add(v_builder, "(sy)", &item_str, setup_menu_tlv->menu_item[index].item_id); */
                        g_variant_builder_add(&v_builder, "(si)", item_str, (gint32)(setup_menu_tlv->menu_item[local_index].item_id));
                }
-       }
-       else{
+       } else {
                int local_index = 0;
 
                dbg("setup_menu_tlv->next_act_ind_list.cnt != 0");
 
-               for(local_index = 0; local_index < menu_cnt; local_index++){
+               for (local_index = 0; local_index < menu_cnt; local_index++) {
                        gushort item_len;
                        gchar item_str[SAT_ITEM_TEXT_LEN_MAX + 1];
 
@@ -650,39 +624,38 @@ GVariant* sat_manager_caching_setup_menu_info(struct custom_data *ctx, const cha
                                (unsigned char*)&setup_menu_tlv->menu_item[local_index].text,
                                (unsigned short)setup_menu_tlv->menu_item[local_index].text_len);
 
-                       dbg( "index(%d) item_id(%d) item_string(%s)", local_index, setup_menu_tlv->menu_item[local_index].item_id, item_str);
+                       dbg("index(%d) item_id(%d) item_string(%s)", local_index, setup_menu_tlv->menu_item[local_index].item_id, item_str);
 
-                       //g_variant_builder_add(v_builder, "(sy)", g_strdup(item_str), setup_menu_tlv->menu_item[local_index].item_id);
+                       /* g_variant_builder_add(v_builder, "(sy)", g_strdup(item_str), setup_menu_tlv->menu_item[local_index].item_id); */
                        g_variant_builder_add(&v_builder, "(si)", item_str, (gint32)(setup_menu_tlv->menu_item[local_index].item_id));
                }
        }
 
        menu_items = g_variant_builder_end(&v_builder);
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_SETUP_MENU;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.setupMenuInd), setup_menu_tlv, sizeof(struct tel_sat_setup_menu_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(setup_menu_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (setup_menu_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", setup_menu_tlv->icon_id.is_exist, setup_menu_tlv->icon_id.icon_qualifer, (gint32) setup_menu_tlv->icon_id.icon_identifier, (gint32) setup_menu_tlv->icon_id.icon_info.width,
                        (gint32) setup_menu_tlv->icon_id.icon_info.height, setup_menu_tlv->icon_id.icon_info.ics, setup_menu_tlv->icon_id.icon_info.icon_data_len, setup_menu_tlv->icon_id.icon_info.icon_file);
        }
        icon_id = g_variant_builder_end(&v_builder_icon);
 
        /* Icon list data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiv)"));
-       if(setup_menu_tlv->icon_list.is_exist) {
-               g_variant_builder_init(&v_builder_icon_list_data, G_VARIANT_TYPE ("a(iiiiis)"));
-               for(local_index= 0; local_index< (int)setup_menu_tlv->icon_list.icon_cnt; local_index++){
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiv)"));
+       if (setup_menu_tlv->icon_list.is_exist) {
+               g_variant_builder_init(&v_builder_icon_list_data, G_VARIANT_TYPE("a(iiiiis)"));
+               for (local_index = 0; local_index < (int)setup_menu_tlv->icon_list.icon_cnt; local_index++) {
                        g_variant_builder_add(&v_builder_icon_list_data, "(iiiiis)", (gint32) setup_menu_tlv->icon_list.icon_id_list[local_index], (gint32) setup_menu_tlv->icon_list.icon_info[local_index].width,
                                (gint32) setup_menu_tlv->icon_list.icon_info[local_index].height, setup_menu_tlv->icon_list.icon_info[local_index].ics, setup_menu_tlv->icon_list.icon_info[local_index].icon_data_len, setup_menu_tlv->icon_list.icon_info[local_index].icon_file);
                }
@@ -708,7 +681,7 @@ GVariant* sat_manager_display_text_noti(struct custom_data *ctx, const char *cp_
        struct sat_manager_queue_data q_data;
 
        gushort text_len = 0;
-       gint command_id = 0, duration= 0, tmp_duration = 0;
+       gint command_id = 0, duration = 0, tmp_duration = 0;
        gboolean immediately_rsp = FALSE, high_priority = FALSE, user_rsp_required = FALSE;
        gchar text[SAT_TEXT_STRING_LEN_MAX+1];
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -719,13 +692,13 @@ GVariant* sat_manager_display_text_noti(struct custom_data *ctx, const char *cp_
        memset(&text, 0 , SAT_TEXT_STRING_LEN_MAX+1);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       if(!display_text_tlv->text.string_length ||
-               (display_text_tlv->text.string_length > 0 && decode_error != TCORE_SAT_SUCCESS)){
+       if (!display_text_tlv->text.string_length ||
+               (display_text_tlv->text.string_length > 0 && decode_error != TCORE_SAT_SUCCESS)) {
                struct treq_sat_terminal_rsp_data tr;
 
                dbg("displat text - invalid parameter of TLVs is found!!");
@@ -746,44 +719,41 @@ GVariant* sat_manager_display_text_noti(struct custom_data *ctx, const char *cp_
                return NULL;
        }
 
-       //user resp required & time_duration
-       if(display_text_tlv->command_detail.cmd_qualifier.display_text.text_clear_type == TEXT_WAIT_FOR_USER_TO_CLEAR_MSG){
+       /* user resp required & time_duration */
+       if (display_text_tlv->command_detail.cmd_qualifier.display_text.text_clear_type == TEXT_WAIT_FOR_USER_TO_CLEAR_MSG) {
                user_rsp_required = TRUE;
                duration = SAT_TIME_OUT;
-       }
-       else{
+       } else {
                /* Set by default if duration is not provided. */
                duration = TIZEN_SAT_DELAY_TO_CLEAN_MSG;
        }
 
-       //immediate response requested
+       /* immediate response requested */
        if (display_text_tlv->immediate_response_requested)
                immediately_rsp = TRUE;
 
-       //high priority
+       /* high priority */
        if (display_text_tlv->command_detail.cmd_qualifier.display_text.text_priority == TEXT_PRIORITY_HIGH)
                high_priority = TRUE;
 
-       //get text
-       tcore_util_convert_string_to_utf8((unsigned char*) &text, (unsigned short *) &text_len,
-                       display_text_tlv->text.dcs.a_format,
-                       (unsigned char*) &display_text_tlv->text.string,
-                       (unsigned short) display_text_tlv->text.string_length);
-       dbg("sat display text(%s)",text);
+       /* get text */
+       tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+               display_text_tlv->text.dcs.a_format,
+               (unsigned char*) &display_text_tlv->text.string,
+               (unsigned short) display_text_tlv->text.string_length);
+       dbg("sat display text(%s)", text);
 
-       //duration
-       if(display_text_tlv->duration.time_interval){
+       /* duration */
+       if (display_text_tlv->duration.time_interval)
                tmp_duration = _get_time_in_ms(&display_text_tlv->duration);
-       }
 
        /* duration is required only when clear message after a delay
-        * 27.22.4.1.7.4.2 DISPLAY TEXT ( Variable Timeout )
+        * 27.22.4.1.7.4.2 DISPLAY TEXT (Variable Timeout)
         */
-       if(tmp_duration > 0) {
+       if (tmp_duration > 0)
                duration = tmp_duration;
-       }
 
-       if(immediately_rsp && user_rsp_required)
+       if (immediately_rsp && user_rsp_required)
                duration = 0;
 
        dbg("user rsp required(%d), immediately rsp(%d) duration (%d), priority(%d)",
@@ -799,20 +769,19 @@ GVariant* sat_manager_display_text_noti(struct custom_data *ctx, const char *cp_
                ctx->help_requested = FALSE;
        }*/
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_DISPLAY_TEXT;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.displayTextInd), display_text_tlv, sizeof(struct tel_sat_display_text_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(display_text_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (display_text_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", display_text_tlv->icon_id.is_exist, display_text_tlv->icon_id.icon_qualifer, (gint32) display_text_tlv->icon_id.icon_identifier, (gint32) display_text_tlv->icon_id.icon_info.width,
                        (gint32) display_text_tlv->icon_id.icon_info.height, display_text_tlv->icon_id.icon_info.ics, display_text_tlv->icon_id.icon_info.icon_data_len, display_text_tlv->icon_id.icon_info.icon_file);
        }
@@ -854,12 +823,12 @@ GVariant* sat_manager_select_item_noti(struct custom_data *ctx, const char *cp_n
        memset(&text, 0 , SAT_TEXT_STRING_LEN_MAX+1);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       if(!select_item_tlv->menu_item_cnt || !select_item_tlv->menu_item[0].text_len){
+       if (!select_item_tlv->menu_item_cnt || !select_item_tlv->menu_item[0].text_len) {
                struct treq_sat_terminal_rsp_data tr;
 
                dbg("select item - mandatory field does not exist");
@@ -880,72 +849,71 @@ GVariant* sat_manager_select_item_noti(struct custom_data *ctx, const char *cp_n
                return NULL;
        }
 
-       // help info
+       /* help info */
        help_info = select_item_tlv->command_detail.cmd_qualifier.select_item.help_info;
 
-       if(!select_item_tlv->alpha_id.is_exist){
+       if (!select_item_tlv->alpha_id.is_exist) {
                dbg("set the item dcs value to ALPHABET_FORMAT_8BIT_DATA");
                select_item_tlv->alpha_id.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
        }
 
-       // select item text
-       if(select_item_tlv->alpha_id.is_exist && select_item_tlv->alpha_id.alpha_data_len > 0)
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
-                               select_item_tlv->alpha_id.dcs.a_format,
-                               (unsigned char*)&select_item_tlv->alpha_id.alpha_data,
-                               (unsigned short)select_item_tlv->alpha_id.alpha_data_len);
-       dbg("select item text(%s)",text);
+       /* select item text */
+       if (select_item_tlv->alpha_id.is_exist && select_item_tlv->alpha_id.alpha_data_len > 0)
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+                       select_item_tlv->alpha_id.dcs.a_format,
+                       (unsigned char*)&select_item_tlv->alpha_id.alpha_data,
+                       (unsigned short)select_item_tlv->alpha_id.alpha_data_len);
+       dbg("select item text(%s)", text);
 
-       //default item id
+       /* default item id */
        default_item_id = select_item_tlv->item_identifier.item_identifier;
-       dbg( "default item id(%d)", default_item_id);
+       dbg("default item id(%d)", default_item_id);
 
-       //item count
+       /* item count */
        menu_cnt = select_item_tlv->menu_item_cnt;
-       dbg( "menu item count(%d)", menu_cnt);
+       dbg("menu item count(%d)", menu_cnt);
 
-       //items
-       g_variant_builder_init(&v_builder, G_VARIANT_TYPE ("a(iis)"));
-       for(local_index= 0; local_index< menu_cnt; local_index++){
+       /* items */
+       g_variant_builder_init(&v_builder, G_VARIANT_TYPE("a(iis)"));
+       for (local_index = 0; local_index < menu_cnt; local_index++) {
                gushort item_len;
                gchar item_str[SAT_ITEM_TEXT_LEN_MAX + 1];
 
                memset(&item_str, 0 , SAT_ITEM_TEXT_LEN_MAX + 1);
 
                tcore_util_convert_string_to_utf8((unsigned char*) &item_str, (unsigned short *) &item_len,
-                               select_item_tlv->menu_item[local_index].dcs.a_format,
-                               (unsigned char*) &select_item_tlv->menu_item[local_index].text,
-                               (unsigned short) select_item_tlv->menu_item[local_index].text_len);
+                       select_item_tlv->menu_item[local_index].dcs.a_format,
+                       (unsigned char*) &select_item_tlv->menu_item[local_index].text,
+                       (unsigned short) select_item_tlv->menu_item[local_index].text_len);
 
-               dbg( "index(%d) item_id(%d) item_len(%d) item_string(%s)", local_index, select_item_tlv->menu_item[local_index].item_id, item_len, item_str);
+               dbg("index(%d) item_id(%d) item_len(%d) item_string(%s)", local_index, select_item_tlv->menu_item[local_index].item_id, item_len, item_str);
                g_variant_builder_add(&v_builder, "(iis)", (gint32)(select_item_tlv->menu_item[local_index].item_id), item_len, item_str);
        }
        menu_items = g_variant_builder_end(&v_builder);
 
-       // generate command id
+       /* generate command id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_SELECT_ITEM;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.selectItemInd), select_item_tlv, sizeof(struct tel_sat_select_item_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(select_item_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (select_item_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", select_item_tlv->icon_id.is_exist, select_item_tlv->icon_id.icon_qualifer, (gint32) select_item_tlv->icon_id.icon_identifier, (gint32) select_item_tlv->icon_id.icon_info.width,
                        (gint32) select_item_tlv->icon_id.icon_info.height, select_item_tlv->icon_id.icon_info.ics, select_item_tlv->icon_id.icon_info.icon_data_len, select_item_tlv->icon_id.icon_info.icon_file);
        }
        icon_id = g_variant_builder_end(&v_builder_icon);
 
        /* Icon list data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiv)"));
-       if(select_item_tlv->icon_list.is_exist) {
-               g_variant_builder_init(&v_builder_icon_list, G_VARIANT_TYPE ("a(iiiiis)"));
-               for(local_index= 0; local_index< (int)select_item_tlv->icon_list.icon_cnt; local_index++){
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiv)"));
+       if (select_item_tlv->icon_list.is_exist) {
+               g_variant_builder_init(&v_builder_icon_list, G_VARIANT_TYPE("a(iiiiis)"));
+               for (local_index = 0; local_index < (int)select_item_tlv->icon_list.icon_cnt; local_index++) {
                        g_variant_builder_add(&v_builder_icon_list, "(iiiiis)", (gint32) select_item_tlv->icon_list.icon_id_list[local_index], (gint32) select_item_tlv->icon_list.icon_info[local_index].width,
                                (gint32) select_item_tlv->icon_list.icon_info[local_index].height, select_item_tlv->icon_list.icon_info[local_index].ics, select_item_tlv->icon_list.icon_info[local_index].icon_data_len, select_item_tlv->icon_list.icon_info[local_index].icon_file);
                }
@@ -984,13 +952,13 @@ GVariant* sat_manager_get_inkey_noti(struct custom_data *ctx, const char *cp_nam
        memset(&text, 0 , SAT_TEXT_STRING_LEN_MAX+1);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       if(!get_inkey_tlv->text.string_length ||
-               (get_inkey_tlv->text.string_length > 0 && decode_error != TCORE_SAT_SUCCESS)){
+       if (!get_inkey_tlv->text.string_length ||
+               (get_inkey_tlv->text.string_length > 0 && decode_error != TCORE_SAT_SUCCESS)) {
                struct treq_sat_terminal_rsp_data tr;
 
                dbg("get inkey - invalid parameter of TLVs is found!!");
@@ -1011,51 +979,50 @@ GVariant* sat_manager_get_inkey_noti(struct custom_data *ctx, const char *cp_nam
                return NULL;
        }
 
-       //key type
+       /* key type */
        key_type = get_inkey_tlv->command_detail.cmd_qualifier.get_inkey.inkey_type;
 
-       //time duration
+       /* time duration */
        duration = SAT_TIME_OUT;
        tmp_duration = _get_time_in_ms(&get_inkey_tlv->duration);
        if (tmp_duration > 0)
                duration = tmp_duration;
 
-       //input mode
+       /* input mode */
        input_character_mode = get_inkey_tlv->command_detail.cmd_qualifier.get_inkey.alphabet_type;
 
-       //numeric
+       /* numeric */
        b_numeric = !get_inkey_tlv->command_detail.cmd_qualifier.get_inkey.alphabet_set;
 
-       //help info
+       /* help info */
        b_help_info = get_inkey_tlv->command_detail.cmd_qualifier.get_inkey.help_info;
 
-       //text & text len
-       tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
-                                                               get_inkey_tlv->text.dcs.a_format ,
-                                                               (unsigned char*)&get_inkey_tlv->text.string,
-                                                               (unsigned short)get_inkey_tlv->text.string_length);
+       /* text & text len */
+       tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+               get_inkey_tlv->text.dcs.a_format ,
+               (unsigned char*)&get_inkey_tlv->text.string,
+               (unsigned short)get_inkey_tlv->text.string_length);
 
-       dbg("get inkey text(%s)",text);
+       dbg("get inkey text(%s)", text);
 
        if (get_inkey_tlv->command_detail.cmd_qualifier.get_inkey.immediate_rsp_required) {
                dbg("get_inkey immediate_rsp_require is TRUE");
-               //Send TR if UI display success
+               /* Send TR if UI display success */
        }
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_GET_INKEY;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.getInkeyInd), get_inkey_tlv, sizeof(struct tel_sat_get_inkey_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(get_inkey_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (get_inkey_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", get_inkey_tlv->icon_id.is_exist, get_inkey_tlv->icon_id.icon_qualifer, (gint32) get_inkey_tlv->icon_id.icon_identifier, (gint32) get_inkey_tlv->icon_id.icon_info.width,
                                (gint32) get_inkey_tlv->icon_id.icon_info.height, get_inkey_tlv->icon_id.icon_info.ics, get_inkey_tlv->icon_id.icon_info.icon_data_len, get_inkey_tlv->icon_id.icon_info.icon_file);
        }
@@ -1091,19 +1058,19 @@ GVariant* sat_manager_get_input_noti(struct custom_data *ctx, const char *cp_nam
        memset(&def_text, 0 , SAT_TEXT_STRING_LEN_MAX+1);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-#if GCF //disable the text length prb for GCF
-       if(
+#if GCF /* disable the text length prb for GCF */
+       if (
                (get_input_tlv->text.string_length > 0 && decode_error != TCORE_SAT_SUCCESS) ||
-               (!get_input_tlv->rsp_len.max) || (get_input_tlv->rsp_len.min > get_input_tlv->rsp_len.max)){
+               (!get_input_tlv->rsp_len.max) || (get_input_tlv->rsp_len.min > get_input_tlv->rsp_len.max)) {
 #else
-       if(!get_input_tlv->text.string_length ||
+       if (!get_input_tlv->text.string_length ||
                (get_input_tlv->text.string_length > 0 && decode_error != TCORE_SAT_SUCCESS) ||
-               (!get_input_tlv->rsp_len.max) || (get_input_tlv->rsp_len.min > get_input_tlv->rsp_len.max)){
+               (!get_input_tlv->rsp_len.max) || (get_input_tlv->rsp_len.min > get_input_tlv->rsp_len.max)) {
 #endif
                struct treq_sat_terminal_rsp_data tr;
 
@@ -1125,66 +1092,65 @@ GVariant* sat_manager_get_input_noti(struct custom_data *ctx, const char *cp_nam
                return NULL;
        }
 
-       dbg( "[SAT]  is SMS7 packing required [%d]",get_input_tlv->command_detail.cmd_qualifier.get_input.user_input_unpacked_format);
+       dbg("[SAT]  is SMS7 packing required [%d]", get_input_tlv->command_detail.cmd_qualifier.get_input.user_input_unpacked_format);
 
-       //input mode
+       /* input mode */
        input_character_mode =  get_input_tlv->command_detail.cmd_qualifier.get_input.alphabet_type;
 
-       //numeric
+       /* numeric */
        b_numeric = !get_input_tlv->command_detail.cmd_qualifier.get_input.alphabet_set;
 
-       //help info
+       /* help info */
        b_help_info = get_input_tlv->command_detail.cmd_qualifier.get_input.help_info;
 
-       //echo input
+       /* echo input */
        b_echo_input = get_input_tlv->command_detail.cmd_qualifier.get_input.me_echo_user_input;
        dbg("numeric (%d), help info(%d), echo input(%d)", b_numeric, b_help_info, b_echo_input);
 
-       //text & text len
-       if(get_input_tlv->text.string_length){
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
-                               get_input_tlv->text.dcs.a_format ,
-                               (unsigned char*)&get_input_tlv->text.string,
-                               (unsigned short)get_input_tlv->text.string_length);
-               dbg("get input text(%s)",text);
+       /* text & text len */
+       if (get_input_tlv->text.string_length) {
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+                       get_input_tlv->text.dcs.a_format ,
+                       (unsigned char*)&get_input_tlv->text.string,
+                       (unsigned short)get_input_tlv->text.string_length);
+               dbg("get input text(%s)", text);
        }
 
-       //response length min & max
+       /* response length min & max */
        rsp_len_min = get_input_tlv->rsp_len.min;
        rsp_len_max = get_input_tlv->rsp_len.max;
 
        /* 27.22.4.3.4 Expected Seq.4.2 */
-       if(input_character_mode == INPUT_ALPHABET_TYPE_UCS2 && rsp_len_max > SAT_USC2_INPUT_LEN_MAX)
+       if (input_character_mode == INPUT_ALPHABET_TYPE_UCS2 && rsp_len_max > SAT_USC2_INPUT_LEN_MAX)
                rsp_len_max = SAT_USC2_INPUT_LEN_MAX;
 
-       //default text & default text len
-       if(get_input_tlv->default_text.string_length){
+       /* default text & default text len */
+       if (get_input_tlv->default_text.string_length) {
                int temp_len = get_input_tlv->default_text.string_length;
-               if(temp_len > rsp_len_max) {
+               if (temp_len > rsp_len_max) {
                        dbg("get input def_text_len(%d) is larger than rsp_len_max(%d)", temp_len, rsp_len_max);
                        get_input_tlv->default_text.string_length = rsp_len_max;
                }
-               tcore_util_convert_string_to_utf8((unsigned char*)&def_text,(unsigned short *)&def_text_len,
-                               get_input_tlv->default_text.dcs.a_format ,
-                               (unsigned char*)&get_input_tlv->default_text.string,
-                               (unsigned short)get_input_tlv->default_text.string_length);
-               dbg("get input default text(%s)",def_text);
+               tcore_util_convert_string_to_utf8((unsigned char*)&def_text, (unsigned short *)&def_text_len,
+                       get_input_tlv->default_text.dcs.a_format ,
+                       (unsigned char*)&get_input_tlv->default_text.string,
+                       (unsigned short)get_input_tlv->default_text.string_length);
+               dbg("get input default text(%s)", def_text);
        }
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_GET_INPUT;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.getInputInd), get_input_tlv, sizeof(struct tel_sat_get_input_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(get_input_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (get_input_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", get_input_tlv->icon_id.is_exist, get_input_tlv->icon_id.icon_qualifer, (gint32) get_input_tlv->icon_id.icon_identifier, (gint32) get_input_tlv->icon_id.icon_info.width,
                                        (gint32) get_input_tlv->icon_id.icon_info.height, get_input_tlv->icon_id.icon_info.ics, get_input_tlv->icon_id.icon_info.icon_data_len, get_input_tlv->icon_id.icon_info.icon_file);
        }
@@ -1216,43 +1182,42 @@ GVariant* sat_manager_play_tone_noti(struct custom_data *ctx, const char *cp_nam
        memset(&text, 0 , SAT_TEXT_STRING_LEN_MAX+1);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       //text and text len
-       if( play_tone_tlv->alpha_id.is_exist && play_tone_tlv->alpha_id.alpha_data_len){
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
-                               play_tone_tlv->alpha_id.dcs.a_format,
-                               (unsigned char*)&play_tone_tlv->alpha_id.alpha_data,
-                               (unsigned short)play_tone_tlv->alpha_id.alpha_data_len);
-               dbg("play tone ui display text (%s)",text);
+       /* text and text len */
+       if (play_tone_tlv->alpha_id.is_exist && play_tone_tlv->alpha_id.alpha_data_len) {
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+                       play_tone_tlv->alpha_id.dcs.a_format,
+                       (unsigned char*)&play_tone_tlv->alpha_id.alpha_data,
+                       (unsigned short)play_tone_tlv->alpha_id.alpha_data_len);
+               dbg("play tone ui display text (%s)", text);
        }
 
-       //tone type
+       /* tone type */
        tone_type = play_tone_tlv->tone.tone_type;
 
-       //time duration
+       /* time duration */
        duration = SAT_TIME_OUT;
        tmp_duration = _get_time_in_ms(&play_tone_tlv->duration);
        if (tmp_duration > 0)
                duration = tmp_duration;
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_PLAY_TONE;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.play_tone), play_tone_tlv, sizeof(struct tel_sat_play_tone_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(play_tone_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (play_tone_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", play_tone_tlv->icon_id.is_exist, play_tone_tlv->icon_id.icon_qualifer, (gint32) play_tone_tlv->icon_id.icon_identifier, (gint32) play_tone_tlv->icon_id.icon_info.width,
                                        (gint32) play_tone_tlv->icon_id.icon_info.height, play_tone_tlv->icon_id.icon_info.ics, play_tone_tlv->icon_id.icon_info.icon_data_len, play_tone_tlv->icon_id.icon_info.icon_file);
        }
@@ -1274,7 +1239,7 @@ GVariant* sat_manager_send_sms_noti(struct custom_data *ctx, const char *cp_name
        int local_index = 0;
        gint command_id = 0, ton = 0, npi = 0, tpdu_type = 0;
        gboolean b_packing_required = FALSE;
-       gushort text_len = 0, number_len = 0, tpdu_data_len= 0;
+       gushort text_len = 0, number_len = 0, tpdu_data_len = 0;
        gchar text[SAT_TEXT_STRING_LEN_MAX], dialling_number[SAT_DIALING_NUMBER_LEN_MAX];
        GVariantBuilder builder;
        GVariant *tpdu_data = NULL;
@@ -1287,56 +1252,53 @@ GVariant* sat_manager_send_sms_noti(struct custom_data *ctx, const char *cp_name
        memset(&dialling_number, 0 , SAT_DIALING_NUMBER_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       //text and text len
-       if( send_sms_tlv->alpha_id.is_exist && send_sms_tlv->alpha_id.alpha_data_len){
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
-                               send_sms_tlv->alpha_id.dcs.a_format,
-                               (unsigned char*)&send_sms_tlv->alpha_id.alpha_data,
-                               (unsigned short)send_sms_tlv->alpha_id.alpha_data_len);
-               dbg("send sms ui display text (%s)",text);
-       }
-       else{
-               memcpy(text,"",1);
+       /* text and text len */
+       if (send_sms_tlv->alpha_id.is_exist && send_sms_tlv->alpha_id.alpha_data_len) {
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+                       send_sms_tlv->alpha_id.dcs.a_format,
+                       (unsigned char*)&send_sms_tlv->alpha_id.alpha_data,
+                       (unsigned short)send_sms_tlv->alpha_id.alpha_data_len);
+               dbg("send sms ui display text (%s)", text);
+       } else {
+               memcpy(text, "", 1);
                text_len = 0;
        }
 
-       //packing required
+       /* packing required */
        b_packing_required = send_sms_tlv->command_detail.cmd_qualifier.send_sms.packing_by_me_required;
 
-       //address : ton, npi, dialling number, number len
+       /* address : ton, npi, dialling number, number len */
        ton = send_sms_tlv->address.ton;
        npi = send_sms_tlv->address.npi;
        number_len = send_sms_tlv->address.dialing_number_len;
        memcpy(dialling_number, send_sms_tlv->address.dialing_number, SAT_DIALING_NUMBER_LEN_MAX);
 
-       //tpdu data : type, data, data len
+       /* tpdu data : type, data, data len */
        tpdu_type = send_sms_tlv->sms_tpdu.tpdu_type;
        tpdu_data_len = send_sms_tlv->sms_tpdu.data_len;
-       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-       for (local_index= 0; local_index < tpdu_data_len; local_index++) {
+       g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+       for (local_index = 0; local_index < tpdu_data_len; local_index++)
                g_variant_builder_add(&builder, "y", send_sms_tlv->sms_tpdu.data[local_index]);
-       }
        tpdu_data = g_variant_builder_end(&builder);
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_SEND_SMS;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.sendSMSInd), send_sms_tlv, sizeof(struct tel_sat_send_sms_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(send_sms_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (send_sms_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", send_sms_tlv->icon_id.is_exist, send_sms_tlv->icon_id.icon_qualifer, (gint32) send_sms_tlv->icon_id.icon_identifier, (gint32) send_sms_tlv->icon_id.icon_info.width,
                                        (gint32) send_sms_tlv->icon_id.icon_info.height, send_sms_tlv->icon_id.icon_info.ics, send_sms_tlv->icon_id.icon_info.icon_data_len, send_sms_tlv->icon_id.icon_info.icon_file);
        }
@@ -1370,13 +1332,13 @@ GVariant* sat_manager_send_ss_noti(struct custom_data *ctx, const char *cp_name,
        memset(&ss_string, 0 , SAT_SS_STRING_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       if(!send_ss_tlv->alpha_id.is_exist &&
-               (send_ss_tlv->icon_id.is_exist && send_ss_tlv->icon_id.icon_qualifer != ICON_QUALI_SELF_EXPLANATORY)){
+       if (!send_ss_tlv->alpha_id.is_exist &&
+               (send_ss_tlv->icon_id.is_exist && send_ss_tlv->icon_id.icon_qualifer != ICON_QUALI_SELF_EXPLANATORY)) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("no alpha id and no self explanatory");
 
@@ -1393,22 +1355,22 @@ GVariant* sat_manager_send_ss_noti(struct custom_data *ctx, const char *cp_name,
                return NULL;
        }
 
-       //text and text len
-       if( send_ss_tlv->alpha_id.is_exist && send_ss_tlv->alpha_id.alpha_data_len){
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
-                               send_ss_tlv->alpha_id.dcs.a_format,
-                               (unsigned char*)&send_ss_tlv->alpha_id.alpha_data,
-                               (unsigned short)send_ss_tlv->alpha_id.alpha_data_len);
-               dbg("send ss ui display text (%s)",text);
+       /* text and text len */
+       if (send_ss_tlv->alpha_id.is_exist && send_ss_tlv->alpha_id.alpha_data_len) {
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+                       send_ss_tlv->alpha_id.dcs.a_format,
+                       (unsigned char*)&send_ss_tlv->alpha_id.alpha_data,
+                       (unsigned short)send_ss_tlv->alpha_id.alpha_data_len);
+               dbg("send ss ui display text (%s)", text);
        }
 
-       //ss string: ton, npi, ss string len, ss string
+       /* ss string: ton, npi, ss string len, ss string */
        ton = send_ss_tlv->ss_string.ton;
        npi = send_ss_tlv->ss_string.npi;
        ss_str_len = send_ss_tlv->ss_string.string_len;
        memcpy(ss_string, send_ss_tlv->ss_string.ss_string, SAT_SS_STRING_LEN_MAX);
 
-       if(!ss_str_len || (ss_str_len > SAT_SS_STRING_LEN_MAX) ){
+       if (!ss_str_len || (ss_str_len > SAT_SS_STRING_LEN_MAX)) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("no ss string");
 
@@ -1425,20 +1387,19 @@ GVariant* sat_manager_send_ss_noti(struct custom_data *ctx, const char *cp_name,
                return NULL;
        }
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_SEND_SS;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.send_ss), send_ss_tlv, sizeof(struct tel_sat_send_ss_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(send_ss_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (send_ss_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", send_ss_tlv->icon_id.is_exist, send_ss_tlv->icon_id.icon_qualifer, (gint32) send_ss_tlv->icon_id.icon_identifier, (gint32) send_ss_tlv->icon_id.icon_info.width,
                                        (gint32) send_ss_tlv->icon_id.icon_info.height, send_ss_tlv->icon_id.icon_info.ics, send_ss_tlv->icon_id.icon_info.icon_data_len, send_ss_tlv->icon_id.icon_info.icon_file);
        }
@@ -1470,13 +1431,13 @@ GVariant* sat_manager_send_ussd_noti(struct custom_data *ctx, const char *cp_nam
        memset(&ussd_string, 0 , SAT_USSD_STRING_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       if(!send_ussd_tlv->alpha_id.is_exist &&
-               (send_ussd_tlv->icon_id.is_exist && send_ussd_tlv->icon_id.icon_qualifer != ICON_QUALI_SELF_EXPLANATORY)){
+       if (!send_ussd_tlv->alpha_id.is_exist &&
+               (send_ussd_tlv->icon_id.is_exist && send_ussd_tlv->icon_id.icon_qualifer != ICON_QUALI_SELF_EXPLANATORY)) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("no alpha id and no self explanatory");
 
@@ -1493,24 +1454,24 @@ GVariant* sat_manager_send_ussd_noti(struct custom_data *ctx, const char *cp_nam
                return NULL;
        }
 
-       //text and text len
-       if( send_ussd_tlv->alpha_id.is_exist && send_ussd_tlv->alpha_id.alpha_data_len){
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
-                               send_ussd_tlv->alpha_id.dcs.a_format,
-                               (unsigned char*)&send_ussd_tlv->alpha_id.alpha_data,
-                               (unsigned short)send_ussd_tlv->alpha_id.alpha_data_len);
-               dbg("send ussd ui display text (%s)",text);
+       /* text and text len */
+       if (send_ussd_tlv->alpha_id.is_exist && send_ussd_tlv->alpha_id.alpha_data_len) {
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+                       send_ussd_tlv->alpha_id.dcs.a_format,
+                       (unsigned char*)&send_ussd_tlv->alpha_id.alpha_data,
+                       (unsigned short)send_ussd_tlv->alpha_id.alpha_data_len);
+               dbg("send ussd ui display text (%s)", text);
        }
 
-       //ussd string
+       /* ussd string */
        dcs = send_ussd_tlv->ussd_string.dsc.raw_dcs;
-       tcore_util_convert_string_to_utf8((unsigned char*)&ussd_string,(unsigned short *)&ussd_str_len,
-                               send_ussd_tlv->ussd_string.dsc.a_format,
-                               (unsigned char*)&send_ussd_tlv->ussd_string.ussd_string,
-                               (unsigned short)send_ussd_tlv->ussd_string.string_len);
+       tcore_util_convert_string_to_utf8((unsigned char*)&ussd_string, (unsigned short *)&ussd_str_len,
+               send_ussd_tlv->ussd_string.dsc.a_format,
+               (unsigned char*)&send_ussd_tlv->ussd_string.ussd_string,
+               (unsigned short)send_ussd_tlv->ussd_string.string_len);
 
 
-       if(!ussd_str_len || (ussd_str_len > SAT_USSD_STRING_LEN_MAX) ){
+       if (!ussd_str_len || (ussd_str_len > SAT_USSD_STRING_LEN_MAX)) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("no ss string");
 
@@ -1527,20 +1488,19 @@ GVariant* sat_manager_send_ussd_noti(struct custom_data *ctx, const char *cp_nam
                return NULL;
        }
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_SEND_USSD;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.send_ussd), send_ussd_tlv, sizeof(struct tel_sat_send_ussd_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(send_ussd_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (send_ussd_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", send_ussd_tlv->icon_id.is_exist, send_ussd_tlv->icon_id.icon_qualifer, (gint32) send_ussd_tlv->icon_id.icon_identifier, (gint32) send_ussd_tlv->icon_id.icon_info.width,
                                        (gint32) send_ussd_tlv->icon_id.icon_info.height, send_ussd_tlv->icon_id.icon_info.ics, send_ussd_tlv->icon_id.icon_info.icon_data_len, send_ussd_tlv->icon_id.icon_info.icon_file);
        }
@@ -1574,36 +1534,32 @@ GVariant* sat_manager_setup_call_noti(struct custom_data *ctx, const char *cp_na
        memset(&tr, 0, sizeof(struct treq_sat_terminal_rsp_data));
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       if(setup_call_tlv->duration.time_interval > 0)
-       {
+       if (setup_call_tlv->duration.time_interval > 0) {
                dbg("[SAT] redial is not supported.\n");
                tr.terminal_rsp_data.setup_call.result_type = RESULT_BEYOND_ME_CAPABILITIES;
                goto SEND_TR;
        }
 
-       //check for subaddress field
-       if(setup_call_tlv->subaddress.subaddress_len > 0)
-       {
+       /* check for subaddress field */
+       if (setup_call_tlv->subaddress.subaddress_len > 0) {
                dbg("[SAT] Sub address is not supported > 0)");
                tr.terminal_rsp_data.setup_call.result_type = RESULT_BEYOND_ME_CAPABILITIES;
                goto SEND_TR;
                return NULL;
        }
 
-       if(setup_call_tlv->command_detail.cmd_qualifier.setup_call.setup_call == SETUP_CALL_IF_ANOTHER_CALL_NOT_BUSY ||
-          setup_call_tlv->command_detail.cmd_qualifier.setup_call.setup_call == SETUP_CALL_IF_ANOTHER_CALL_NOT_BUSY_WITH_REDIAL)
-       {
+       if (setup_call_tlv->command_detail.cmd_qualifier.setup_call.setup_call == SETUP_CALL_IF_ANOTHER_CALL_NOT_BUSY || setup_call_tlv->command_detail.cmd_qualifier.setup_call.setup_call == SETUP_CALL_IF_ANOTHER_CALL_NOT_BUSY_WITH_REDIAL) {
                GSList *co_list = NULL;
                CoreObject *co_call = NULL;
                int total_call_cnt = 0;
 
                co_list = tcore_plugin_get_core_objects_bytype(plg, CORE_OBJECT_TYPE_CALL);
-               if ( !co_list ) {
+               if (!co_list) {
                        dbg("[ error ] co_list : 0");
                        tr.terminal_rsp_data.setup_call.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
                        goto SEND_TR;
@@ -1612,7 +1568,7 @@ GVariant* sat_manager_setup_call_noti(struct custom_data *ctx, const char *cp_na
                co_call = (CoreObject *)co_list->data;
                g_slist_free(co_list);
                total_call_cnt = tcore_call_object_total_length(co_call);
-               if (total_call_cnt){
+               if (total_call_cnt) {
                        dbg("[SAT] Another call in progress hence rejecting. total_call_cnt: %d", total_call_cnt);
                        tr.terminal_rsp_data.setup_call.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
                        tr.terminal_rsp_data.setup_call.me_problem_type = ME_PROBLEM_ME_BUSY_ON_CALL;
@@ -1620,53 +1576,51 @@ GVariant* sat_manager_setup_call_noti(struct custom_data *ctx, const char *cp_na
                }
        }
 
-       //call type
+       /* call type */
        call_type = setup_call_tlv->command_detail.cmd_qualifier.setup_call.setup_call;
 
-       //call display data
-       if(setup_call_tlv->call_setup_alpha_id.alpha_data_len != 0){
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
-                               setup_call_tlv->call_setup_alpha_id.dcs.a_format,
-                               (unsigned char*)&setup_call_tlv->call_setup_alpha_id.alpha_data,
-                               (unsigned short)setup_call_tlv->call_setup_alpha_id.alpha_data_len);
+       /* call display data */
+       if (setup_call_tlv->call_setup_alpha_id.alpha_data_len != 0) {
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+                       setup_call_tlv->call_setup_alpha_id.dcs.a_format,
+                       (unsigned char*)&setup_call_tlv->call_setup_alpha_id.alpha_data,
+                       (unsigned short)setup_call_tlv->call_setup_alpha_id.alpha_data_len);
        }
-       dbg("setup call display text (%s)",text);
+       dbg("setup call display text (%s)", text);
 
-       if(setup_call_tlv->user_confirm_alpha_id.alpha_data_len != 0){
-               tcore_util_convert_string_to_utf8((unsigned char*)&confirm_text,(unsigned short *)&confirm_text_len,
-                               setup_call_tlv->user_confirm_alpha_id.dcs.a_format,
-                               (unsigned char*)&setup_call_tlv->user_confirm_alpha_id.alpha_data,
-                               (unsigned short)setup_call_tlv->user_confirm_alpha_id.alpha_data_len);
+       if (setup_call_tlv->user_confirm_alpha_id.alpha_data_len != 0) {
+               tcore_util_convert_string_to_utf8((unsigned char*)&confirm_text, (unsigned short *)&confirm_text_len,
+                       setup_call_tlv->user_confirm_alpha_id.dcs.a_format,
+                       (unsigned char*)&setup_call_tlv->user_confirm_alpha_id.alpha_data,
+                       (unsigned short)setup_call_tlv->user_confirm_alpha_id.alpha_data_len);
        }
 
-       //call number
-       if(setup_call_tlv->address.ton == TON_INTERNATIONAL){
+       /* call number */
+       if (setup_call_tlv->address.ton == TON_INTERNATIONAL) {
                call_number[0] = '+';
-               memcpy(&call_number[1],setup_call_tlv->address.dialing_number, setup_call_tlv->address.dialing_number_len);
-       }
-       else{
-               memcpy(call_number,setup_call_tlv->address.dialing_number, setup_call_tlv->address.dialing_number_len);
+               memcpy(&call_number[1], setup_call_tlv->address.dialing_number, setup_call_tlv->address.dialing_number_len);
+       } else {
+               memcpy(call_number, setup_call_tlv->address.dialing_number, setup_call_tlv->address.dialing_number_len);
        }
-       dbg("setup call call number: origin(%s), final(%s)",setup_call_tlv->address.dialing_number, call_number);
+       dbg("setup call call number: origin(%s), final(%s)", setup_call_tlv->address.dialing_number, call_number);
 
-       //duration
-       if(setup_call_tlv->duration.time_interval > 0)
+       /* duration */
+       if (setup_call_tlv->duration.time_interval > 0)
                duration = _get_time_in_ms(&setup_call_tlv->duration);
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_SETUP_CALL;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.setup_call), setup_call_tlv, sizeof(struct tel_sat_setup_call_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(setup_call_tlv->call_setup_icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (setup_call_tlv->call_setup_icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", setup_call_tlv->call_setup_icon_id.is_exist, setup_call_tlv->call_setup_icon_id.icon_qualifer, (gint32) setup_call_tlv->call_setup_icon_id.icon_identifier, (gint32) setup_call_tlv->call_setup_icon_id.icon_info.width,
                                        (gint32) setup_call_tlv->call_setup_icon_id.icon_info.height, setup_call_tlv->call_setup_icon_id.icon_info.ics, setup_call_tlv->call_setup_icon_id.icon_info.icon_data_len, setup_call_tlv->call_setup_icon_id.icon_info.icon_file);
        }
@@ -1703,22 +1657,22 @@ GVariant* sat_manager_setup_event_list_noti(struct custom_data *ctx, const char
        dbg("interpreting event list notification");
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       //event cnt
+       /* event cnt */
        event_cnt = event_list_tlv->event_list.event_list_cnt;
        dbg("event cnt(%d)", event_cnt);
-       // reset evnet list
+       /* reset evnet list */
        memset(g_evt_list, 0, SAT_EVENT_DOWNLOAD_MAX);
 
-       //get event
-       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ai"));
+       /* get event */
+       g_variant_builder_init(&builder, G_VARIANT_TYPE("ai"));
        for (local_index = 0; local_index < event_cnt; local_index++) {
                g_variant_builder_add(&builder, "i", event_list_tlv->event_list.evt_list[local_index]);
-               if(event_list_tlv->event_list.evt_list[local_index] >= SAT_EVENT_DOWNLOAD_MAX)
+               if (event_list_tlv->event_list.evt_list[local_index] >= SAT_EVENT_DOWNLOAD_MAX)
                        continue;
                g_evt_list[event_list_tlv->event_list.evt_list[local_index]] = TRUE;
        }
@@ -1726,8 +1680,11 @@ GVariant* sat_manager_setup_event_list_noti(struct custom_data *ctx, const char
 
        event_list = g_variant_new("(iv)", event_cnt, evt_list);
 
-       //send TR - does not need from application's response
+       /* send TR - does not need from application's response */
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return NULL;
+
        tr->cmd_number = event_list_tlv->command_detail.cmd_num;
        tr->cmd_type = event_list_tlv->command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.setup_event_list.command_detail, &event_list_tlv->command_detail, sizeof(struct tel_sat_cmd_detail_info));
@@ -1762,13 +1719,13 @@ GVariant* sat_manager_setup_idle_mode_text_noti(struct custom_data *ctx, const c
        memset(&text, 0 , SAT_TEXT_STRING_LEN_MAX+1);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
 
-       if(!idle_mode_tlv->text.string_length && decode_error != TCORE_SAT_SUCCESS){
+       if (!idle_mode_tlv->text.string_length && decode_error != TCORE_SAT_SUCCESS) {
                struct treq_sat_terminal_rsp_data tr;
 
                dbg("setup idle mode text - invalid parameter of TLVs is found!!");
@@ -1789,27 +1746,26 @@ GVariant* sat_manager_setup_idle_mode_text_noti(struct custom_data *ctx, const c
                return NULL;
        }
 
-       tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
-                       idle_mode_tlv->text.dcs.a_format,
-                       (unsigned char*)&idle_mode_tlv->text.string,
-                       (unsigned short)idle_mode_tlv->text.string_length);
+       tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
+               idle_mode_tlv->text.dcs.a_format,
+               (unsigned char*)&idle_mode_tlv->text.string,
+               (unsigned short)idle_mode_tlv->text.string_length);
 
-       dbg("setup idle mode text display text (%s)",text);
+       dbg("setup idle mode text display text (%s)", text);
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.idle_mode), idle_mode_tlv, sizeof(struct tel_sat_setup_idle_mode_text_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(idle_mode_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (idle_mode_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", idle_mode_tlv->icon_id.is_exist, idle_mode_tlv->icon_id.icon_qualifer, (gint32) idle_mode_tlv->icon_id.icon_identifier, (gint32) idle_mode_tlv->icon_id.icon_info.width,
                                        (gint32) idle_mode_tlv->icon_id.icon_info.height, idle_mode_tlv->icon_id.icon_info.ics, idle_mode_tlv->icon_id.icon_info.icon_data_len, idle_mode_tlv->icon_id.icon_info.icon_file);
        }
@@ -1850,14 +1806,14 @@ GVariant* sat_manager_open_channel_noti(struct custom_data *ctx, const char *cp_
        memset(&dest_address, 0 , SAT_OTHER_ADDR_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
        co_call = tcore_plugin_ref_core_object(plg, CORE_OBJECT_TYPE_CALL);
        co_network = tcore_plugin_ref_core_object(plg, CORE_OBJECT_TYPE_NETWORK);
-       if(!co_call || !co_network){
+       if (!co_call || !co_network) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("call or network co_obj does not exist");
 
@@ -1878,8 +1834,8 @@ GVariant* sat_manager_open_channel_noti(struct custom_data *ctx, const char *cp_
        }
 
        call_active_list = tcore_call_object_find_by_status(co_call, TCORE_CALL_STATUS_ACTIVE);
-       tcore_network_get_access_technology(co_network,&result);
-       if(result < NETWORK_ACT_UMTS && call_active_list){
+       tcore_network_get_access_technology(co_network, &result);
+       if (result < NETWORK_ACT_UMTS && call_active_list) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("call is busy in not 3G state atc(%d)", result);
 
@@ -1900,214 +1856,210 @@ GVariant* sat_manager_open_channel_noti(struct custom_data *ctx, const char *cp_
        }
 
 
-       //immediate link
+       /* immediate link */
        immediate_link = open_channel_tlv->command_detail.cmd_qualifier.open_channel.immediate_link;
 
-       //auto reconnection
+       /* auto reconnection */
        auto_reconnection = open_channel_tlv->command_detail.cmd_qualifier.open_channel.automatic_reconnection;
 
-       //back ground mode
+       /* back ground mode */
        bg_mode = open_channel_tlv->command_detail.cmd_qualifier.open_channel.background_mode;
 
-       //open channel text
-       if(open_channel_tlv->alpha_id.is_exist && open_channel_tlv->alpha_id.alpha_data_len > 0)
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
+       /* open channel text */
+       if (open_channel_tlv->alpha_id.is_exist && open_channel_tlv->alpha_id.alpha_data_len > 0)
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
                                open_channel_tlv->alpha_id.dcs.a_format,
                                (unsigned char*)&open_channel_tlv->alpha_id.alpha_data,
                                (unsigned short)open_channel_tlv->alpha_id.alpha_data_len);
-       dbg("open channel text(%s)",text);
+       dbg("open channel text(%s)", text);
 
-       //buffer size
+       /* buffer size */
        buffer_size = open_channel_tlv->buffer_size.size[0];
        buffer_size = buffer_size << 8;
        buffer_size += open_channel_tlv->buffer_size.size[1];
-       //memcpy(&buffer_size, open_channel_tlv->buffer_size.size, sizeof(unsigned char)*2);
+       /* memcpy(&buffer_size, open_channel_tlv->buffer_size.size, sizeof(unsigned char)*2); */
        dbg("buffer size(%d)", buffer_size);
 
-       //interface transport level
+       /* interface transport level */
        protocol_type = open_channel_tlv->interface_transport_level.protocol_type;
        port_number = open_channel_tlv->interface_transport_level.port_number;
 
-       //data destination address
+       /* data destination address */
        dest_addr_type = open_channel_tlv->data_destination_address.address_type;
        memcpy(dest_address,  open_channel_tlv->data_destination_address.address,
                        open_channel_tlv->data_destination_address.address_len);
        dbg("destination IP address (%s)", dest_address);
 
-       //bearer type
+       /* bearer type */
        bearer_type = open_channel_tlv->bearer_desc.bearer_type;
 
-       //bearer param & bearer detail
-       switch(bearer_type){
-               case BEARER_CSD:{
-                       //bearer param
-                       gint data_rate = 0, service_type = 0, conn_element_type = 0;
-
-                       //bearer detail
-                       gint ton = 0, npi = 0, time_duration1 = 0, time_duration2 = 0, other_addr_type = 0;
-                       gushort login_len = 0, pwd_len = 0;
-                       gchar dialling_number[SAT_DIALING_NUMBER_LEN_MAX], sub_addr[SAT_SUB_ADDR_LEN_MAX];
-                       gchar other_address[SAT_OTHER_ADDR_LEN_MAX];
-                       gchar login[SAT_TEXT_STRING_LEN_MAX], pwd[SAT_TEXT_STRING_LEN_MAX];
-
-                       memset(&dialling_number, 0 , SAT_DIALING_NUMBER_LEN_MAX);
-                       memset(&sub_addr, 0 , SAT_SUB_ADDR_LEN_MAX);
-                       memset(&other_address, 0 , SAT_OTHER_ADDR_LEN_MAX);
-                       memset(&login, 0 , SAT_TEXT_STRING_LEN_MAX);
-                       memset(&pwd, 0 , SAT_TEXT_STRING_LEN_MAX);
-
-                       //bearer parameter
-                       data_rate = open_channel_tlv->bearer_desc.bearer_parameter.cs_bearer_param.data_rate;
-                       service_type = open_channel_tlv->bearer_desc.bearer_parameter.cs_bearer_param.service_type;
-                       conn_element_type = open_channel_tlv->bearer_desc.bearer_parameter.cs_bearer_param.connection_element_type;
-
-                       bearer_param = g_variant_new("(iii)", data_rate, service_type, conn_element_type);
-
-                       //bearer detail
-                       ton = open_channel_tlv->bearer_detail.cs_bearer.address.ton;
-                       npi = open_channel_tlv->bearer_detail.cs_bearer.address.npi;
-                       memcpy(dialling_number, open_channel_tlv->bearer_detail.cs_bearer.address.dialing_number, open_channel_tlv->bearer_detail.cs_bearer.address.dialing_number_len);
-
-                       memcpy(sub_addr, open_channel_tlv->bearer_detail.cs_bearer.subaddress.subaddress, open_channel_tlv->bearer_detail.cs_bearer.subaddress.subaddress_len);
-
-                       time_duration1 = _get_time_in_ms(&open_channel_tlv->bearer_detail.cs_bearer.duration1);
-                       time_duration2 = _get_time_in_ms(&open_channel_tlv->bearer_detail.cs_bearer.duration2);
-
-                       other_addr_type = open_channel_tlv->bearer_detail.cs_bearer.other_address.address_type;
-                       memcpy(other_address, open_channel_tlv->bearer_detail.cs_bearer.other_address.address, open_channel_tlv->bearer_detail.cs_bearer.other_address.address_len);
-
-                       tcore_util_convert_string_to_utf8((unsigned char*) &login, (unsigned short *) &login_len,
-                                       open_channel_tlv->bearer_detail.cs_bearer.text_user_login.dcs.a_format,
-                                       (unsigned char*) &open_channel_tlv->bearer_detail.cs_bearer.text_user_login.string,
-                                       (unsigned short) open_channel_tlv->bearer_detail.cs_bearer.text_user_login.string_length);
-
-                       tcore_util_convert_string_to_utf8((unsigned char*) &pwd, (unsigned short *) &pwd_len,
-                                       open_channel_tlv->bearer_detail.cs_bearer.text_user_pwd.dcs.a_format,
-                                       (unsigned char*) &open_channel_tlv->bearer_detail.cs_bearer.text_user_pwd.string,
-                                       (unsigned short) open_channel_tlv->bearer_detail.cs_bearer.text_user_pwd.string_length);
-
-                       bearer_detail= g_variant_new("(iissiiisss)", ton, npi, dialling_number, sub_addr, time_duration1, time_duration2,
-                                       other_addr_type, other_address, login, pwd);
-               } break;
-               case BEARER_GPRS:{
-                       //bearer param
-                       gint precedence_class = 0, delay_class = 0, reliability_class = 0;
-                       gint peak_class = 0, mean_class = 0, pdp_type = 0;
-
-                       //bearer detail
-                       gint other_addr_type = 0;
-                       gushort login_len = 0, pwd_len = 0;
-                       gchar network_access_name[SAT_NET_ACC_NAM_LEN_MAX];
-                       gchar other_address[SAT_OTHER_ADDR_LEN_MAX];
-                       gchar login[SAT_TEXT_STRING_LEN_MAX], pwd[SAT_TEXT_STRING_LEN_MAX];
-
-                       memset(&network_access_name, 0 , SAT_NET_ACC_NAM_LEN_MAX);
-                       memset(&other_address, 0 , SAT_OTHER_ADDR_LEN_MAX);
-                       memset(&login, 0 , SAT_TEXT_STRING_LEN_MAX);
-                       memset(&pwd, 0 , SAT_TEXT_STRING_LEN_MAX);
-
-                       //bearer parameter
-                       precedence_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.precedence_class;
-                       delay_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.delay_class;
-                       reliability_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.reliability_class;
-                       peak_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.peak_throughput_class;
-                       mean_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.mean_throughput_class;
-                       pdp_type = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.pdp_type;
-
-                       bearer_param = g_variant_new("(iiiiii)", precedence_class, delay_class, reliability_class, peak_class, mean_class, pdp_type);
-
-                       memcpy(network_access_name, open_channel_tlv->bearer_detail.ps_bearer.network_access_name.network_access_name,
-                                       open_channel_tlv->bearer_detail.ps_bearer.network_access_name.length);
-                       other_addr_type = open_channel_tlv->bearer_detail.ps_bearer.other_address.address_type;
-                       memcpy(other_address, open_channel_tlv->bearer_detail.ps_bearer.other_address.address, open_channel_tlv->bearer_detail.ps_bearer.other_address.address_len);
-
-                       tcore_util_convert_string_to_utf8((unsigned char*) &login, (unsigned short *) &login_len,
-                                       open_channel_tlv->bearer_detail.ps_bearer.text_user_login.dcs.a_format,
-                                       (unsigned char*) &open_channel_tlv->bearer_detail.ps_bearer.text_user_login.string,
-                                       (unsigned short) open_channel_tlv->bearer_detail.ps_bearer.text_user_login.string_length);
-
-                       tcore_util_convert_string_to_utf8((unsigned char*) &pwd, (unsigned short *) &pwd_len,
-                                       open_channel_tlv->bearer_detail.ps_bearer.text_user_pwd.dcs.a_format,
-                                       (unsigned char*) &open_channel_tlv->bearer_detail.ps_bearer.text_user_pwd.string,
-                                       (unsigned short) open_channel_tlv->bearer_detail.ps_bearer.text_user_pwd.string_length);
-
-                       bearer_detail= g_variant_new("(sisss)", network_access_name, other_addr_type, other_address, login, pwd);
-
-               } break;
-               case BEARER_DEFAULT_BEARER_FROM_TRANSPORT_LAYER:{
-                       //bearer param
-
-                       //bearer detail
-                       gint other_addr_type = 0;
-                       gushort login_len = 0, pwd_len = 0;
-                       gchar other_address[SAT_OTHER_ADDR_LEN_MAX];
-                       gchar login[SAT_TEXT_STRING_LEN_MAX], pwd[SAT_TEXT_STRING_LEN_MAX];
-
-                       memset(&other_address, 0 , SAT_OTHER_ADDR_LEN_MAX);
-                       memset(&login, 0 , SAT_TEXT_STRING_LEN_MAX);
-                       memset(&pwd, 0 , SAT_TEXT_STRING_LEN_MAX);
-
-                       //bearer parameter
-                       bearer_param = g_variant_new("()");
-
-                       other_addr_type = open_channel_tlv->bearer_detail.default_bearer.other_address.address_type;
-                       memcpy(other_address, open_channel_tlv->bearer_detail.default_bearer.other_address.address, open_channel_tlv->bearer_detail.default_bearer.other_address.address_len);
-
-                       tcore_util_convert_string_to_utf8((unsigned char*) &login, (unsigned short *) &login_len,
-                                       open_channel_tlv->bearer_detail.default_bearer.text_user_login.dcs.a_format,
-                                       (unsigned char*) &open_channel_tlv->bearer_detail.default_bearer.text_user_login.string,
-                                       (unsigned short) open_channel_tlv->bearer_detail.default_bearer.text_user_login.string_length);
-
-                       tcore_util_convert_string_to_utf8((unsigned char*) &pwd, (unsigned short *) &pwd_len,
-                                       open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.dcs.a_format,
-                                       (unsigned char*) &open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.string,
-                                       (unsigned short) open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.string_length);
-
-                       bearer_detail= g_variant_new("(isss)", other_addr_type, other_address, login, pwd);
-
-               } break;
-               case BEARER_LOCAL_LINK_TECHNOLOGY_INDEPENDENT:{
-                       //bearer param
-
-                       //bearer detail
-                       gushort pwd_len = 0;
-                       gint remote_address_type =0, time_duration1 = 0, time_duration2 = 0;
-                       gchar remote_address[SAT_REMOTE_ENTITY_ADDR_LEN_MAX];
-                       gchar pwd[SAT_TEXT_STRING_LEN_MAX];
-
-                       memset(&remote_address, 0 , SAT_REMOTE_ENTITY_ADDR_LEN_MAX);
-                       memset(&pwd, 0 , SAT_TEXT_STRING_LEN_MAX);
-
-                       //bearer parameter
-                       bearer_param = g_variant_new("()");
-
-                       time_duration1 = _get_time_in_ms(&open_channel_tlv->bearer_detail.local_bearer.duration1);
-                       time_duration2 = _get_time_in_ms(&open_channel_tlv->bearer_detail.local_bearer.duration2);
-
-                       tcore_util_convert_string_to_utf8((unsigned char*) &pwd, (unsigned short *) &pwd_len,
-                                                                                       open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.dcs.a_format,
-                                                                                       (unsigned char*) &open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.string,
-                                                                                       (unsigned short) open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.string_length);
-
-                       remote_address_type = open_channel_tlv->bearer_detail.local_bearer.remote_entity_address.coding_type;
-                       memcpy(remote_address, open_channel_tlv->bearer_detail.local_bearer.remote_entity_address.remote_entity_address, open_channel_tlv->bearer_detail.local_bearer.remote_entity_address.length);
-
-                       bearer_detail= g_variant_new("(iisis)", time_duration1, time_duration2, pwd, remote_address_type, remote_address);
-
+       /* bearer param & bearer detail */
+       switch (bearer_type) {
+       case BEARER_CSD: {
+               /* bearer param */
+               gint data_rate = 0, service_type = 0, conn_element_type = 0;
+
+               /* bearer detail */
+               gint ton = 0, npi = 0, time_duration1 = 0, time_duration2 = 0, other_addr_type = 0;
+               gushort login_len = 0, pwd_len = 0;
+               gchar dialling_number[SAT_DIALING_NUMBER_LEN_MAX], sub_addr[SAT_SUB_ADDR_LEN_MAX];
+               gchar other_address[SAT_OTHER_ADDR_LEN_MAX];
+               gchar login[SAT_TEXT_STRING_LEN_MAX], pwd[SAT_TEXT_STRING_LEN_MAX];
+
+               memset(&dialling_number, 0 , SAT_DIALING_NUMBER_LEN_MAX);
+               memset(&sub_addr, 0 , SAT_SUB_ADDR_LEN_MAX);
+               memset(&other_address, 0 , SAT_OTHER_ADDR_LEN_MAX);
+               memset(&login, 0 , SAT_TEXT_STRING_LEN_MAX);
+               memset(&pwd, 0 , SAT_TEXT_STRING_LEN_MAX);
+
+               /* bearer parameter */
+               data_rate = open_channel_tlv->bearer_desc.bearer_parameter.cs_bearer_param.data_rate;
+               service_type = open_channel_tlv->bearer_desc.bearer_parameter.cs_bearer_param.service_type;
+               conn_element_type = open_channel_tlv->bearer_desc.bearer_parameter.cs_bearer_param.connection_element_type;
+
+               bearer_param = g_variant_new("(iii)", data_rate, service_type, conn_element_type);
+
+               /* bearer detail */
+               ton = open_channel_tlv->bearer_detail.cs_bearer.address.ton;
+               npi = open_channel_tlv->bearer_detail.cs_bearer.address.npi;
+               memcpy(dialling_number, open_channel_tlv->bearer_detail.cs_bearer.address.dialing_number, open_channel_tlv->bearer_detail.cs_bearer.address.dialing_number_len);
+
+               memcpy(sub_addr, open_channel_tlv->bearer_detail.cs_bearer.subaddress.subaddress, open_channel_tlv->bearer_detail.cs_bearer.subaddress.subaddress_len);
+
+               time_duration1 = _get_time_in_ms(&open_channel_tlv->bearer_detail.cs_bearer.duration1);
+               time_duration2 = _get_time_in_ms(&open_channel_tlv->bearer_detail.cs_bearer.duration2);
+
+               other_addr_type = open_channel_tlv->bearer_detail.cs_bearer.other_address.address_type;
+               memcpy(other_address, open_channel_tlv->bearer_detail.cs_bearer.other_address.address, open_channel_tlv->bearer_detail.cs_bearer.other_address.address_len);
+
+               tcore_util_convert_string_to_utf8((unsigned char*) &login, (unsigned short *) &login_len,
+                       open_channel_tlv->bearer_detail.cs_bearer.text_user_login.dcs.a_format,
+                       (unsigned char*) &open_channel_tlv->bearer_detail.cs_bearer.text_user_login.string,
+                       (unsigned short) open_channel_tlv->bearer_detail.cs_bearer.text_user_login.string_length);
+
+               tcore_util_convert_string_to_utf8((unsigned char*) &pwd, (unsigned short *) &pwd_len,
+                       open_channel_tlv->bearer_detail.cs_bearer.text_user_pwd.dcs.a_format,
+                       (unsigned char*) &open_channel_tlv->bearer_detail.cs_bearer.text_user_pwd.string,
+                       (unsigned short) open_channel_tlv->bearer_detail.cs_bearer.text_user_pwd.string_length);
+
+               bearer_detail = g_variant_new("(iissiiisss)", ton, npi, dialling_number, sub_addr, time_duration1, time_duration2,
+                       other_addr_type, other_address, login, pwd);
                } break;
-               default:
-                       dbg("invalid bearer data");
-                       return NULL;
-       }//end of switch
+       case BEARER_GPRS:{
+               /* bearer param */
+               gint precedence_class = 0, delay_class = 0, reliability_class = 0;
+               gint peak_class = 0, mean_class = 0, pdp_type = 0;
+
+               /* bearer detail */
+               gint other_addr_type = 0;
+               gushort login_len = 0, pwd_len = 0;
+               gchar network_access_name[SAT_NET_ACC_NAM_LEN_MAX];
+               gchar other_address[SAT_OTHER_ADDR_LEN_MAX];
+               gchar login[SAT_TEXT_STRING_LEN_MAX], pwd[SAT_TEXT_STRING_LEN_MAX];
+
+               memset(&network_access_name, 0 , SAT_NET_ACC_NAM_LEN_MAX);
+               memset(&other_address, 0 , SAT_OTHER_ADDR_LEN_MAX);
+               memset(&login, 0 , SAT_TEXT_STRING_LEN_MAX);
+               memset(&pwd, 0 , SAT_TEXT_STRING_LEN_MAX);
+
+               /* bearer parameter */
+               precedence_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.precedence_class;
+               delay_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.delay_class;
+               reliability_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.reliability_class;
+               peak_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.peak_throughput_class;
+               mean_class = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.mean_throughput_class;
+               pdp_type = open_channel_tlv->bearer_desc.bearer_parameter.ps_bearer_param.pdp_type;
+
+               bearer_param = g_variant_new("(iiiiii)", precedence_class, delay_class, reliability_class, peak_class, mean_class, pdp_type);
+
+               memcpy(network_access_name, open_channel_tlv->bearer_detail.ps_bearer.network_access_name.network_access_name,
+                       open_channel_tlv->bearer_detail.ps_bearer.network_access_name.length);
+               other_addr_type = open_channel_tlv->bearer_detail.ps_bearer.other_address.address_type;
+               memcpy(other_address, open_channel_tlv->bearer_detail.ps_bearer.other_address.address, open_channel_tlv->bearer_detail.ps_bearer.other_address.address_len);
+
+               tcore_util_convert_string_to_utf8((unsigned char*) &login, (unsigned short *) &login_len,
+                       open_channel_tlv->bearer_detail.ps_bearer.text_user_login.dcs.a_format,
+                       (unsigned char*) &open_channel_tlv->bearer_detail.ps_bearer.text_user_login.string,
+                       (unsigned short) open_channel_tlv->bearer_detail.ps_bearer.text_user_login.string_length);
+
+               tcore_util_convert_string_to_utf8((unsigned char*) &pwd, (unsigned short *) &pwd_len,
+                       open_channel_tlv->bearer_detail.ps_bearer.text_user_pwd.dcs.a_format,
+                       (unsigned char*) &open_channel_tlv->bearer_detail.ps_bearer.text_user_pwd.string,
+                       (unsigned short) open_channel_tlv->bearer_detail.ps_bearer.text_user_pwd.string_length);
+
+               bearer_detail = g_variant_new("(sisss)", network_access_name, other_addr_type, other_address, login, pwd);
+       } break;
+       case BEARER_DEFAULT_BEARER_FROM_TRANSPORT_LAYER:{
+               /* bearer param */
+
+               /* bearer detail */
+               gint other_addr_type = 0;
+               gushort login_len = 0, pwd_len = 0;
+               gchar other_address[SAT_OTHER_ADDR_LEN_MAX];
+               gchar login[SAT_TEXT_STRING_LEN_MAX], pwd[SAT_TEXT_STRING_LEN_MAX];
+
+               memset(&other_address, 0 , SAT_OTHER_ADDR_LEN_MAX);
+               memset(&login, 0 , SAT_TEXT_STRING_LEN_MAX);
+               memset(&pwd, 0 , SAT_TEXT_STRING_LEN_MAX);
+
+               /* bearer parameter */
+               bearer_param = g_variant_new("()");
+
+               other_addr_type = open_channel_tlv->bearer_detail.default_bearer.other_address.address_type;
+               memcpy(other_address, open_channel_tlv->bearer_detail.default_bearer.other_address.address, open_channel_tlv->bearer_detail.default_bearer.other_address.address_len);
+
+               tcore_util_convert_string_to_utf8((unsigned char*) &login, (unsigned short *) &login_len,
+                       open_channel_tlv->bearer_detail.default_bearer.text_user_login.dcs.a_format,
+                       (unsigned char*) &open_channel_tlv->bearer_detail.default_bearer.text_user_login.string,
+                       (unsigned short) open_channel_tlv->bearer_detail.default_bearer.text_user_login.string_length);
+
+               tcore_util_convert_string_to_utf8((unsigned char*) &pwd, (unsigned short *) &pwd_len,
+                       open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.dcs.a_format,
+                       (unsigned char*) &open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.string,
+                       (unsigned short) open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.string_length);
+
+               bearer_detail = g_variant_new("(isss)", other_addr_type, other_address, login, pwd);
+       } break;
+       case BEARER_LOCAL_LINK_TECHNOLOGY_INDEPENDENT:{
+               /* bearer param */
+
+               /* bearer detail */
+               gushort pwd_len = 0;
+               gint remote_address_type = 0, time_duration1 = 0, time_duration2 = 0;
+               gchar remote_address[SAT_REMOTE_ENTITY_ADDR_LEN_MAX];
+               gchar pwd[SAT_TEXT_STRING_LEN_MAX];
+
+               memset(&remote_address, 0 , SAT_REMOTE_ENTITY_ADDR_LEN_MAX);
+               memset(&pwd, 0 , SAT_TEXT_STRING_LEN_MAX);
+
+               /* bearer parameter */
+               bearer_param = g_variant_new("()");
+
+               time_duration1 = _get_time_in_ms(&open_channel_tlv->bearer_detail.local_bearer.duration1);
+               time_duration2 = _get_time_in_ms(&open_channel_tlv->bearer_detail.local_bearer.duration2);
+
+               tcore_util_convert_string_to_utf8((unsigned char*) &pwd, (unsigned short *) &pwd_len,
+                       open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.dcs.a_format,
+                       (unsigned char*) &open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.string,
+                       (unsigned short) open_channel_tlv->bearer_detail.default_bearer.text_user_pwd.string_length);
+
+               remote_address_type = open_channel_tlv->bearer_detail.local_bearer.remote_entity_address.coding_type;
+               memcpy(remote_address, open_channel_tlv->bearer_detail.local_bearer.remote_entity_address.remote_entity_address, open_channel_tlv->bearer_detail.local_bearer.remote_entity_address.length);
+
+               bearer_detail = g_variant_new("(iisis)", time_duration1, time_duration2, pwd, remote_address_type, remote_address);
+       } break;
+       default:
+               dbg("invalid bearer data");
+               return NULL;
+       }
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_OPEN_CHANNEL;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.open_channel), open_channel_tlv, sizeof(struct tel_sat_open_channel_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_STK_HIDE_ALPHA_ID)
@@ -2118,14 +2070,14 @@ GVariant* sat_manager_open_channel_noti(struct custom_data *ctx, const char *cp_
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(open_channel_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (open_channel_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", open_channel_tlv->icon_id.is_exist, open_channel_tlv->icon_id.icon_qualifer, (gint32) open_channel_tlv->icon_id.icon_identifier, (gint32) open_channel_tlv->icon_id.icon_info.width,
                                        (gint32) open_channel_tlv->icon_id.icon_info.height, open_channel_tlv->icon_id.icon_info.ics, open_channel_tlv->icon_id.icon_info.icon_data_len, open_channel_tlv->icon_id.icon_info.icon_file);
        }
        icon_id = g_variant_builder_end(&v_builder_icon);
-       //execute bip
-       //sat_ui_support_exec_bip();
+       /* execute bip */
+       /* sat_ui_support_exec_bip(); */
 
        open_channel = g_variant_new("(isivbbbiviiiisv)", command_id, text, text_len, icon_id, immediate_link, auto_reconnection, bg_mode,
                        bearer_type, bearer_param, buffer_size, protocol_type, port_number, dest_addr_type, dest_address, bearer_detail);
@@ -2153,36 +2105,35 @@ GVariant* sat_manager_close_channel_noti(struct custom_data *ctx, const char *cp
        memset(&text, 0 , SAT_ALPHA_ID_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       //channel id
+       /* channel id */
        channel_id = close_channel_tlv->device_id.dest;
 
-       //close channel text
-       if(close_channel_tlv->alpha_id.is_exist && close_channel_tlv->alpha_id.alpha_data_len > 0)
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
+       /* close channel text */
+       if (close_channel_tlv->alpha_id.is_exist && close_channel_tlv->alpha_id.alpha_data_len > 0)
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
                                close_channel_tlv->alpha_id.dcs.a_format,
                                (unsigned char*)&close_channel_tlv->alpha_id.alpha_data,
                                (unsigned short)close_channel_tlv->alpha_id.alpha_data_len);
-       dbg("close channel text(%s)",text);
+       dbg("close channel text(%s)", text);
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_CLOSE_CHANNEL;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.close_channel), close_channel_tlv, sizeof(struct tel_sat_close_channel_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(close_channel_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (close_channel_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", close_channel_tlv->icon_id.is_exist, close_channel_tlv->icon_id.icon_qualifer, (gint32) close_channel_tlv->icon_id.icon_identifier, (gint32) close_channel_tlv->icon_id.icon_info.width,
                                        (gint32) close_channel_tlv->icon_id.icon_info.height, close_channel_tlv->icon_id.icon_info.ics, close_channel_tlv->icon_id.icon_info.icon_data_len, close_channel_tlv->icon_id.icon_info.icon_file);
        }
@@ -2213,38 +2164,37 @@ GVariant* sat_manager_receive_data_noti(struct custom_data *ctx, const char *cp_
        memset(&text, 0 , SAT_ALPHA_ID_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       //channel id
+       /* channel id */
        channel_id = receive_data_tlv->device_id.dest;
 
-       //receive data text
-       if(receive_data_tlv->alpha_id.is_exist && receive_data_tlv->alpha_id.alpha_data_len > 0)
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
+       /* receive data text */
+       if (receive_data_tlv->alpha_id.is_exist && receive_data_tlv->alpha_id.alpha_data_len > 0)
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
                                receive_data_tlv->alpha_id.dcs.a_format,
                                (unsigned char*)&receive_data_tlv->alpha_id.alpha_data,
                                (unsigned short)receive_data_tlv->alpha_id.alpha_data_len);
-       dbg("receive data text(%s)",text);
+       dbg("receive data text(%s)", text);
 
        channel_data_len = receive_data_tlv->channel_data_len.data_len;
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_RECEIVE_DATA;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.receive_data), receive_data_tlv, sizeof(struct tel_sat_receive_channel_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(receive_data_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (receive_data_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", receive_data_tlv->icon_id.is_exist, receive_data_tlv->icon_id.icon_qualifer, (gint32) receive_data_tlv->icon_id.icon_identifier, (gint32) receive_data_tlv->icon_id.icon_info.width,
                                        (gint32) receive_data_tlv->icon_id.icon_info.height, receive_data_tlv->icon_id.icon_info.ics, receive_data_tlv->icon_id.icon_info.icon_data_len, receive_data_tlv->icon_id.icon_info.icon_file);
        }
@@ -2278,48 +2228,47 @@ GVariant* sat_manager_send_data_noti(struct custom_data *ctx, const char *cp_nam
        memset(&text, 0 , SAT_ALPHA_ID_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       //send data immediately
+       /* send data immediately */
        send_data_immediately = send_data_tlv->command_detail.cmd_qualifier.send_data.send_data_immediately;
 
-       //channel id
+       /* channel id */
        channel_id = send_data_tlv->device_id.dest;
 
-       //send data text
-       if(send_data_tlv->alpha_id.is_exist && send_data_tlv->alpha_id.alpha_data_len > 0)
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
+       /* send data text */
+       if (send_data_tlv->alpha_id.is_exist && send_data_tlv->alpha_id.alpha_data_len > 0)
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
                                send_data_tlv->alpha_id.dcs.a_format,
                                (unsigned char*)&send_data_tlv->alpha_id.alpha_data,
                                (unsigned short)send_data_tlv->alpha_id.alpha_data_len);
-       dbg("send data text(%s)",text);
+       dbg("send data text(%s)", text);
 
-       //channel data, data len
+       /* channel data, data len */
        data_len = send_data_tlv->channel_data.data_string_len;
-       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
+       g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
        for (local_index = 0; local_index < data_len; local_index++) {
-               //dbg("send data index(%d) data(0x%x)",index, send_data_tlv->channel_data.data_string[index]);
+               /* dbg("send data index(%d) data(0x%x)",index, send_data_tlv->channel_data.data_string[index]); */
                g_variant_builder_add(&builder, "y", send_data_tlv->channel_data.data_string[local_index]);
        }
        channel_data = g_variant_builder_end(&builder);
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_SEND_DATA;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.send_data), send_data_tlv, sizeof(struct tel_sat_send_channel_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(send_data_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (send_data_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", send_data_tlv->icon_id.is_exist, send_data_tlv->icon_id.icon_qualifer, (gint32) send_data_tlv->icon_id.icon_identifier, (gint32) send_data_tlv->icon_id.icon_info.width,
                                        (gint32) send_data_tlv->icon_id.icon_info.height, send_data_tlv->icon_id.icon_info.ics, send_data_tlv->icon_id.icon_info.icon_data_len, send_data_tlv->icon_id.icon_info.icon_file);
        }
@@ -2343,19 +2292,18 @@ GVariant* sat_manager_get_channel_status_noti(struct custom_data *ctx, const cha
        dbg("interpreting get channel status notification");
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_GET_CHANNEL_STATUS;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.get_channel_status), get_channel_status_tlv, sizeof(struct tel_sat_get_channel_status_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
        get_channel_status = g_variant_new("(i)", command_id);
@@ -2372,7 +2320,7 @@ GVariant* sat_manager_refresh_noti(struct custom_data *ctx, const char *cp_name,
 #endif
 
        gint command_id = 0;
-       gint refresh_type =0;
+       gint refresh_type = 0;
        GVariantBuilder builder;
        GVariant *file_list = NULL;
        int local_index = 0;
@@ -2380,33 +2328,31 @@ GVariant* sat_manager_refresh_noti(struct custom_data *ctx, const char *cp_name,
        dbg("interpreting refresh notification");
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
        refresh_type = refresh_tlv->command_detail.cmd_qualifier.refresh.refresh;
 
-       if(refresh_type != SIM_REFRESH_CMD_FCN) {
+       if (refresh_type != SIM_REFRESH_CMD_FCN) {
                dbg("reset event list.");
                memset(g_evt_list, 0, SAT_EVENT_DOWNLOAD_MAX);
        }
 
-       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ai"));
-       for (local_index = 0; local_index < refresh_tlv->file_list.file_count; local_index++) {
+       g_variant_builder_init(&builder, G_VARIANT_TYPE("ai"));
+       for (local_index = 0; local_index < refresh_tlv->file_list.file_count; local_index++)
                g_variant_builder_add(&builder, "i", refresh_tlv->file_list.file_id[local_index]);
-       }
        file_list = g_variant_builder_end(&builder);
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
 #if !defined(TIZEN_SUPPORT_STK_HIDE_ALPHA_ID)
                memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
                q_data.cmd_type = SAT_PROATV_CMD_REFRESH;
                q_data.cp_name = g_strdup(cp_name);
                memcpy((void*)&(q_data.cmd_data.refresh), refresh_tlv, sizeof(struct tel_sat_refresh_tlv));
-               if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+               if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                        g_free(q_data.cp_name);
-               }
                command_id = q_data.cmd_id;
 #endif
 
@@ -2423,12 +2369,12 @@ void sat_manager_more_time_noti(struct custom_data *ctx, const char *cp_name, st
        dbg("interpreting more time notification");
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return;
        }
 
-       //send TR - does not need from application's response
+       /* send TR - does not need from application's response */
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
        if (!tr)
                return;
@@ -2457,8 +2403,8 @@ GVariant* sat_manager_send_dtmf_noti(struct custom_data *ctx, const char *cp_nam
        struct sat_manager_queue_data q_data;
 
        gint command_id = 0;
-       gushort text_len =0;
-       gint dtmf_str_len =0;
+       gushort text_len = 0;
+       gint dtmf_str_len = 0;
        gchar text[SAT_TEXT_STRING_LEN_MAX], dtmf_str[SAT_DTMF_STRING_LEN_MAX];
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        GVariant *icon_id = NULL;
@@ -2469,13 +2415,13 @@ GVariant* sat_manager_send_dtmf_noti(struct custom_data *ctx, const char *cp_nam
        memset(&dtmf_str, 0 , SAT_DTMF_STRING_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
        co_call = tcore_plugin_ref_core_object(plg, CORE_OBJECT_TYPE_CALL);
-       if(!co_call){
+       if (!co_call) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("call object does not exist");
 
@@ -2493,7 +2439,7 @@ GVariant* sat_manager_send_dtmf_noti(struct custom_data *ctx, const char *cp_nam
        }
 
        call_active_list = tcore_call_object_find_by_status(co_call, TCORE_CALL_STATUS_ACTIVE);
-       if(!call_active_list){
+       if (!call_active_list) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("no active call");
 
@@ -2512,33 +2458,32 @@ GVariant* sat_manager_send_dtmf_noti(struct custom_data *ctx, const char *cp_nam
        }
        g_slist_free(call_active_list);
 
-       //text and text len
-       if( send_dtmf_tlv->alpha_id.is_exist && send_dtmf_tlv->alpha_id.alpha_data_len){
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
+       /* text and text len */
+       if (send_dtmf_tlv->alpha_id.is_exist && send_dtmf_tlv->alpha_id.alpha_data_len) {
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
                                send_dtmf_tlv->alpha_id.dcs.a_format,
                                (unsigned char*)&send_dtmf_tlv->alpha_id.alpha_data,
                                (unsigned short)send_dtmf_tlv->alpha_id.alpha_data_len);
-               dbg("send dtmf ui display text (%s)",text);
+               dbg("send dtmf ui display text (%s)", text);
        }
 
-       //dtmf string len, dtmf string
+       /* dtmf string len, dtmf string */
        dtmf_str_len = send_dtmf_tlv->dtmf_string.dtmf_length;
        memcpy(dtmf_str, send_dtmf_tlv->dtmf_string.dtmf_string, SAT_DTMF_STRING_LEN_MAX);
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_SEND_DTMF;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.send_dtmf), send_dtmf_tlv, sizeof(struct tel_sat_send_dtmf_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(send_dtmf_tlv->icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (send_dtmf_tlv->icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", send_dtmf_tlv->icon_id.is_exist, send_dtmf_tlv->icon_id.icon_qualifer, (gint32) send_dtmf_tlv->icon_id.icon_identifier, (gint32) send_dtmf_tlv->icon_id.icon_info.width,
                                        (gint32) send_dtmf_tlv->icon_id.icon_info.height, send_dtmf_tlv->icon_id.icon_info.ics, send_dtmf_tlv->icon_id.icon_info.icon_data_len, send_dtmf_tlv->icon_id.icon_info.icon_file);
        }
@@ -2562,8 +2507,8 @@ GVariant* sat_manager_launch_browser_noti(struct custom_data *ctx, const char *c
 #endif
        gint command_id = 0;
        gint browser_launch_type = 0, browser_id = 0;
-       gint url_len =0;
-       gushort text_len =0, gateway_proxy_len =0;
+       gint url_len = 0;
+       gushort text_len = 0, gateway_proxy_len = 0;
        gchar url[SAT_URL_LEN_MAX], text[SAT_TEXT_STRING_LEN_MAX], gateway_proxy[SAT_TEXT_STRING_LEN_MAX];
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        GVariant *icon_id = NULL;
@@ -2575,13 +2520,13 @@ GVariant* sat_manager_launch_browser_noti(struct custom_data *ctx, const char *c
        memset(&gateway_proxy, 0 , SAT_TEXT_STRING_LEN_MAX);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       if(!launch_browser_tlv->user_confirm_alpha_id.is_exist &&
-               (launch_browser_tlv->user_confirm_icon_id.is_exist && launch_browser_tlv->user_confirm_icon_id.icon_qualifer != ICON_QUALI_SELF_EXPLANATORY)){
+       if (!launch_browser_tlv->user_confirm_alpha_id.is_exist &&
+               (launch_browser_tlv->user_confirm_icon_id.is_exist && launch_browser_tlv->user_confirm_icon_id.icon_qualifer != ICON_QUALI_SELF_EXPLANATORY)) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("no alpha id and no self explanatory");
 
@@ -2601,7 +2546,7 @@ GVariant* sat_manager_launch_browser_noti(struct custom_data *ctx, const char *c
 #if GCF_SAT_BROWSER_WITH_SINGLE_SESSION
        b_app_running = sat_ui_check_app_is_running("org.tizen.browser");
 #endif
-       //browser launch type
+       /* browser launch type */
        browser_launch_type = launch_browser_tlv->command_detail.cmd_qualifier.launch_browser.launch_browser;
 
        /* ORA PLM P131004-00081:Launch browser while session already opened.
@@ -2612,7 +2557,7 @@ GVariant* sat_manager_launch_browser_noti(struct custom_data *ctx, const char *c
         * therefore disabled here.
         */
 #if GCF_SAT_BROWSER_WITH_SINGLE_SESSION
-       if(browser_launch_type == LAUNCH_BROWSER_IF_NOT_ALREADY_LAUNCHED && b_app_running){
+       if (browser_launch_type == LAUNCH_BROWSER_IF_NOT_ALREADY_LAUNCHED && b_app_running) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("browser is already running type(%d)", browser_launch_type);
 
@@ -2629,8 +2574,7 @@ GVariant* sat_manager_launch_browser_noti(struct custom_data *ctx, const char *c
                sat_manager_send_terminal_response(ctx->comm, plg, &tr);
 
                return NULL;
-       }
-       else if( (browser_launch_type == LAUNCH_BROWSER_USE_EXISTING_BROWSER || browser_launch_type == LAUNCH_BROWSER_CLOSE_AND_LAUNCH_NEW_BROWSER) && !b_app_running){
+       } else if ((browser_launch_type == LAUNCH_BROWSER_USE_EXISTING_BROWSER || browser_launch_type == LAUNCH_BROWSER_CLOSE_AND_LAUNCH_NEW_BROWSER) && !b_app_running) {
                struct treq_sat_terminal_rsp_data tr;
                dbg("browser is not running type(%d)", browser_launch_type);
 
@@ -2650,53 +2594,52 @@ GVariant* sat_manager_launch_browser_noti(struct custom_data *ctx, const char *c
        }
 #endif
 
-       //browser id
+       /* browser id */
        browser_id = launch_browser_tlv->browser_id;
 
-       //url and url len
-       if( launch_browser_tlv->url.url_length){
+       /* url and url len */
+       if (launch_browser_tlv->url.url_length) {
                url_len = launch_browser_tlv->url.url_length;
                memcpy(url, launch_browser_tlv->url.url, launch_browser_tlv->url.url_length);
-               dbg("launch browser url (%s)",url);
+               dbg("launch browser url (%s)", url);
        }
 
-       //gateway_proxy_text
-       if(launch_browser_tlv->gateway_proxy_text.is_digit_only) {
+       /* gateway_proxy_text */
+       if (launch_browser_tlv->gateway_proxy_text.is_digit_only) {
                memcpy(gateway_proxy, launch_browser_tlv->gateway_proxy_text.string, launch_browser_tlv->gateway_proxy_text.string_length);
-               dbg("launch browser gateway_proxy digit type string (%s)",gateway_proxy);
+               dbg("launch browser gateway_proxy digit type string (%s)", gateway_proxy);
        } else {
-               if( launch_browser_tlv->gateway_proxy_text.string_length){
-                       tcore_util_convert_string_to_utf8((unsigned char*)&gateway_proxy,(unsigned short *)&gateway_proxy_len,
+               if (launch_browser_tlv->gateway_proxy_text.string_length) {
+                       tcore_util_convert_string_to_utf8((unsigned char*)&gateway_proxy, (unsigned short *)&gateway_proxy_len,
                                        launch_browser_tlv->gateway_proxy_text.dcs.a_format,
                                        (unsigned char*)&launch_browser_tlv->gateway_proxy_text.string,
                                        (unsigned short)launch_browser_tlv->gateway_proxy_text.string_length);
-                       dbg("launch browser gateway_proxy_text (%s)",gateway_proxy);
+                       dbg("launch browser gateway_proxy_text (%s)", gateway_proxy);
                }
        }
 
-       //user confirm text and user confirm text len
-       if( launch_browser_tlv->user_confirm_alpha_id.is_exist && launch_browser_tlv->user_confirm_alpha_id.alpha_data_len){
-               tcore_util_convert_string_to_utf8((unsigned char*)&text,(unsigned short *)&text_len,
+       /* user confirm text and user confirm text len */
+       if (launch_browser_tlv->user_confirm_alpha_id.is_exist && launch_browser_tlv->user_confirm_alpha_id.alpha_data_len) {
+               tcore_util_convert_string_to_utf8((unsigned char*)&text, (unsigned short *)&text_len,
                                launch_browser_tlv->user_confirm_alpha_id.dcs.a_format,
                                (unsigned char*)&launch_browser_tlv->user_confirm_alpha_id.alpha_data,
                                (unsigned short)launch_browser_tlv->user_confirm_alpha_id.alpha_data_len);
-               dbg("launch browser user confirm text (%s)",text);
+               dbg("launch browser user confirm text (%s)", text);
        }
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_LAUNCH_BROWSER;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.launch_browser), launch_browser_tlv, sizeof(struct tel_sat_launch_browser_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        /* Icon data extraction */
-       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE ("a(biiiiiis)"));
-       if(launch_browser_tlv->user_confirm_icon_id.is_exist) {
+       g_variant_builder_init(&v_builder_icon, G_VARIANT_TYPE("a(biiiiiis)"));
+       if (launch_browser_tlv->user_confirm_icon_id.is_exist) {
                g_variant_builder_add(&v_builder_icon, "(biiiiiis)", launch_browser_tlv->user_confirm_icon_id.is_exist, launch_browser_tlv->user_confirm_icon_id.icon_qualifer, (gint32) launch_browser_tlv->user_confirm_icon_id.icon_identifier, (gint32) launch_browser_tlv->user_confirm_icon_id.icon_info.width,
                                        (gint32) launch_browser_tlv->user_confirm_icon_id.icon_info.height, launch_browser_tlv->user_confirm_icon_id.icon_info.ics, launch_browser_tlv->user_confirm_icon_id.icon_info.icon_data_len, launch_browser_tlv->user_confirm_icon_id.icon_info.icon_file);
        }
@@ -2716,20 +2659,20 @@ GVariant* sat_manager_provide_local_info_noti(struct custom_data *ctx, const cha
        TcorePlugin *plg = NULL;
        GVariant *provide_info = NULL;
 
-       gint info_type =0;
+       gint info_type = 0;
        struct treq_sat_terminal_rsp_data *tr = NULL;
 
        dbg("interpreting provide local info notification");
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
        provide_info = g_variant_new("(i)", info_type);
 
-       //send TR - does not need from application's response
+       /* send TR - does not need from application's response */
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
        if (!tr)
                return NULL;
@@ -2743,86 +2686,83 @@ GVariant* sat_manager_provide_local_info_noti(struct custom_data *ctx, const cha
 
        info_type = provide_local_info_tlv->command_detail.cmd_qualifier.provide_local_info.provide_local_info;
 
-       switch(info_type){
-               case LOCAL_INFO_DATE_TIME_AND_TIMEZONE:{
-                       int err = 0; int gmt = 0, n_flg = 0;
-                       struct timezone c_tz;
-                       struct timeval c_time;
+       switch (info_type) {
+       case LOCAL_INFO_DATE_TIME_AND_TIMEZONE:{
+               int err = 0; int gmt = 0, n_flg = 0;
+               struct timezone c_tz;
+               struct timeval c_time;
 
-                       time_t time_val;
-                       struct tm time_info;
+               time_t time_val;
+               struct tm time_info;
 
-                       time(&time_val);
+               time(&time_val);
 
-                       tzset();
-                       err = gettimeofday(&c_time, &c_tz);
-                       localtime_r(&time_val, &time_info);
+               tzset();
+               err = gettimeofday(&c_time, &c_tz);
+               localtime_r(&time_val, &time_info);
 
-                       //set the time information
-                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.year =
-                               _convert_decimal_to_bcd(time_info.tm_year+1900-2000);
+               /* set the time information */
+               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.year =
+                       _convert_decimal_to_bcd(time_info.tm_year+1900-2000);
 
-                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.month =
-                                       _convert_decimal_to_bcd(time_info.tm_mon+1);
+               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.month =
+                               _convert_decimal_to_bcd(time_info.tm_mon+1);
 
-                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.day =
-                                       _convert_decimal_to_bcd(time_info.tm_mday);
+               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.day =
+                               _convert_decimal_to_bcd(time_info.tm_mday);
 
-                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.hour =
-                                       _convert_decimal_to_bcd(time_info.tm_hour);
+               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.hour =
+                               _convert_decimal_to_bcd(time_info.tm_hour);
 
-                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.minute =
-                                       _convert_decimal_to_bcd(time_info.tm_min);
+               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.minute =
+                               _convert_decimal_to_bcd(time_info.tm_min);
 
-                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.second =
-                                       _convert_decimal_to_bcd(time_info.tm_sec);
+               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.second =
+                               _convert_decimal_to_bcd(time_info.tm_sec);
 
-                       gmt = c_tz.tz_minuteswest/60;
-                       if(gmt < 0){
-                               gmt = gmt * -1;
-                               n_flg = 1;
-                       }
+               gmt = c_tz.tz_minuteswest / 60;
+               if (gmt < 0) {
+                       gmt = gmt * -1;
+                       n_flg = 1;
+               }
 
-                       if(err != 0){
-                               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.timeZone = 0xFF;
-                       }
-                       else{
-                               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.timeZone =
-                                       _convert_decimal_to_bcd(gmt);
+               if (err != 0) {
+                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.timeZone = 0xFF;
+               } else {
+                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.timeZone =
+                               _convert_decimal_to_bcd(gmt);
 
-                               if(n_flg == 1){
-                                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.timeZone += 0x80;
-                               }
+                       if (n_flg == 1)
+                               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.timeZone += 0x80;
 
-                               if(time_info.tm_isdst > 0){
-                                       tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.timeZone += 0x40;
-                               }
-                       }
+                       if (time_info.tm_isdst > 0)
+                               tr->terminal_rsp_data.provide_local_info.other.date_time_and_timezone.timeZone += 0x40;
+               }
 
-                       tr->terminal_rsp_data.provide_local_info.result_type = RESULT_SUCCESS;
-                       tr->terminal_rsp_data.provide_local_info.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               tr->terminal_rsp_data.provide_local_info.result_type = RESULT_SUCCESS;
+               tr->terminal_rsp_data.provide_local_info.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
                } break;
-               case LOCAL_INFO_LANGUAGE:{
-                       Server *s = NULL;
-                       static Storage *strg;
-                       gchar *lang_str = NULL;
-                       enum tel_sim_language_type lang_type = SIM_LANG_UNSPECIFIED;
-
-                       tr->terminal_rsp_data.provide_local_info.result_type = RESULT_SUCCESS;
-                       tr->terminal_rsp_data.provide_local_info.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-
-                       s = ctx->server;
-                       strg = tcore_server_find_storage(s, "vconf");
-                       lang_str = tcore_storage_get_string(strg, STORAGE_KEY_LANGUAGE_SET);
-                       if(lang_str)
-                               lang_type = _convert_string_to_sim_lang(lang_str);
-
-                       tr->terminal_rsp_data.provide_local_info.other.language = lang_type;
+       case LOCAL_INFO_LANGUAGE:{
+               Server *s = NULL;
+               static Storage *strg;
+               gchar *lang_str = NULL;
+               enum tel_sim_language_type lang_type = SIM_LANG_UNSPECIFIED;
+
+               tr->terminal_rsp_data.provide_local_info.result_type = RESULT_SUCCESS;
+               tr->terminal_rsp_data.provide_local_info.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+
+               s = ctx->server;
+               strg = tcore_server_find_storage(s, "vconf");
+               lang_str = tcore_storage_get_string(strg, STORAGE_KEY_LANGUAGE_SET);
+               if (lang_str)
+                       lang_type = _convert_string_to_sim_lang(lang_str);
+
+               tr->terminal_rsp_data.provide_local_info.other.language = lang_type;
                } break;
-               default :{
-                       tr->terminal_rsp_data.provide_local_info.other_info = FALSE;
-                       tr->terminal_rsp_data.provide_local_info.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.provide_local_info.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+       default: {
+               tr->terminal_rsp_data.provide_local_info.other_info = FALSE;
+               tr->terminal_rsp_data.provide_local_info.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.provide_local_info.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
                } break;
        }
 
@@ -2839,33 +2779,32 @@ GVariant* sat_manager_language_notification_noti(struct custom_data *ctx, const
        struct sat_manager_queue_data q_data;
 
        gint command_id = 0;
-       gint language =0;
+       gint language = 0;
        gboolean b_specified = FALSE;
 
        dbg("interpreting langauge notification");
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return NULL;
        }
 
-       if (language_notification_tlv->command_detail.cmd_qualifier.language_notification.specific_language == TRUE){
+       if (language_notification_tlv->command_detail.cmd_qualifier.language_notification.specific_language == TRUE) {
                b_specified = TRUE;
                language = language_notification_tlv->language;
        } else {
                b_specified = FALSE;
-               language =SIM_LANG_UNSPECIFIED;
+               language = SIM_LANG_UNSPECIFIED;
        }
 
-       //enqueue data and generate cmd_id
+       /* enqueue data and generate cmd_id */
        memset(&q_data, 0x00, sizeof(struct sat_manager_queue_data));
        q_data.cmd_type = SAT_PROATV_CMD_LANGUAGE_NOTIFICATION;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.language_notification), language_notification_tlv, sizeof(struct tel_sat_language_notification_tlv));
-       if(FALSE == sat_manager_enqueue_cmd(ctx, &q_data)){
+       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
                g_free(q_data.cp_name);
-       }
        command_id = q_data.cmd_id;
 
        language_noti = g_variant_new("(iib)", command_id, language, b_specified);
@@ -2881,7 +2820,7 @@ gboolean sat_manager_processing_unsupport_proactive_command(struct custom_data *
        dbg("[SAT] unsupport proactive command (%d)", unsupport_tlv->command_detail.cmd_type);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return FALSE;
        }
@@ -2909,7 +2848,7 @@ gboolean sat_manager_handle_sat_ui_launch_fail(struct custom_data *ctx, const ch
        dbg("[SAT] proactive command (%d)", p_ind->cmd_type);
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return FALSE;
        }
@@ -2919,85 +2858,85 @@ gboolean sat_manager_handle_sat_ui_launch_fail(struct custom_data *ctx, const ch
        tr.cmd_type = p_ind->cmd_type;
 
        switch (p_ind->cmd_type) {
-               case SAT_PROATV_CMD_DISPLAY_TEXT: {
-                       memcpy((void*)&tr.terminal_rsp_data.display_text.command_detail, &p_ind->proactive_ind_data.display_text.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.display_text.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.display_text.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.display_text.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_SELECT_ITEM: {
-                       memcpy((void*)&tr.terminal_rsp_data.select_item.command_detail, &p_ind->proactive_ind_data.select_item.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.select_item.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.select_item.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.select_item.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_GET_INKEY: {
-                       memcpy((void*)&tr.terminal_rsp_data.get_inkey.command_detail, &p_ind->proactive_ind_data.get_inkey.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.get_inkey.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.get_inkey.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.get_inkey.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_GET_INPUT: {
-                       memcpy((void*)&tr.terminal_rsp_data.get_input.command_detail, &p_ind->proactive_ind_data.get_input.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.get_input.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.get_input.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.get_input.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_PLAY_TONE: {
-                       memcpy((void*)&tr.terminal_rsp_data.play_tone.command_detail, &p_ind->proactive_ind_data.play_tone.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.play_tone.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.play_tone.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.play_tone.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_SEND_SMS: {
-                       memcpy((void*)&tr.terminal_rsp_data.send_sms.command_detail, &p_ind->proactive_ind_data.send_sms.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.send_sms.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.send_sms.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.send_sms.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_SEND_SS: {
-                       memcpy((void*)&tr.terminal_rsp_data.send_ss.command_detail, &p_ind->proactive_ind_data.send_ss.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.send_ss.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.send_ss.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.send_ss.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_SEND_USSD: {
-                       memcpy((void*)&tr.terminal_rsp_data.send_ussd.command_detail, &p_ind->proactive_ind_data.send_ussd.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.send_ussd.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.send_ussd.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.send_ussd.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_SETUP_CALL: {
-                       memcpy((void*)&tr.terminal_rsp_data.setup_call.command_detail, &p_ind->proactive_ind_data.setup_call.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.setup_call.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.setup_call.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.setup_call.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT: {
-                       memcpy((void*)&tr.terminal_rsp_data.setup_idle_mode_text.command_detail, &p_ind->proactive_ind_data.setup_idle_mode_text.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.setup_idle_mode_text.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.setup_idle_mode_text.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.setup_idle_mode_text.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_OPEN_CHANNEL: {
-                       memcpy((void*)&tr.terminal_rsp_data.open_channel.command_detail, &p_ind->proactive_ind_data.open_channel.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.open_channel.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.open_channel.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.open_channel.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               case SAT_PROATV_CMD_LAUNCH_BROWSER: {
-                       memcpy((void*)&tr.terminal_rsp_data.launch_browser.command_detail, &p_ind->proactive_ind_data.launch_browser.command_detail, sizeof(struct tel_sat_cmd_detail_info));
-                       tr.terminal_rsp_data.launch_browser.device_id.src = DEVICE_ID_ME;
-                       tr.terminal_rsp_data.launch_browser.device_id.dest = DEVICE_ID_SIM;
-                       tr.terminal_rsp_data.launch_browser.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-               } break;
-               default:
-                       dbg("unsupported command.");
-                       break;
+       case SAT_PROATV_CMD_DISPLAY_TEXT: {
+               memcpy((void*)&tr.terminal_rsp_data.display_text.command_detail, &p_ind->proactive_ind_data.display_text.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.display_text.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.display_text.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.display_text.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_SELECT_ITEM: {
+               memcpy((void*)&tr.terminal_rsp_data.select_item.command_detail, &p_ind->proactive_ind_data.select_item.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.select_item.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.select_item.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.select_item.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_GET_INKEY: {
+               memcpy((void*)&tr.terminal_rsp_data.get_inkey.command_detail, &p_ind->proactive_ind_data.get_inkey.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.get_inkey.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.get_inkey.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.get_inkey.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_GET_INPUT: {
+               memcpy((void*)&tr.terminal_rsp_data.get_input.command_detail, &p_ind->proactive_ind_data.get_input.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.get_input.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.get_input.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.get_input.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_PLAY_TONE: {
+               memcpy((void*)&tr.terminal_rsp_data.play_tone.command_detail, &p_ind->proactive_ind_data.play_tone.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.play_tone.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.play_tone.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.play_tone.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_SEND_SMS: {
+               memcpy((void*)&tr.terminal_rsp_data.send_sms.command_detail, &p_ind->proactive_ind_data.send_sms.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.send_sms.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.send_sms.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.send_sms.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_SEND_SS: {
+               memcpy((void*)&tr.terminal_rsp_data.send_ss.command_detail, &p_ind->proactive_ind_data.send_ss.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.send_ss.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.send_ss.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.send_ss.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_SEND_USSD: {
+               memcpy((void*)&tr.terminal_rsp_data.send_ussd.command_detail, &p_ind->proactive_ind_data.send_ussd.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.send_ussd.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.send_ussd.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.send_ussd.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_SETUP_CALL: {
+               memcpy((void*)&tr.terminal_rsp_data.setup_call.command_detail, &p_ind->proactive_ind_data.setup_call.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.setup_call.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.setup_call.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.setup_call.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT: {
+               memcpy((void*)&tr.terminal_rsp_data.setup_idle_mode_text.command_detail, &p_ind->proactive_ind_data.setup_idle_mode_text.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.setup_idle_mode_text.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.setup_idle_mode_text.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.setup_idle_mode_text.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_OPEN_CHANNEL: {
+               memcpy((void*)&tr.terminal_rsp_data.open_channel.command_detail, &p_ind->proactive_ind_data.open_channel.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.open_channel.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.open_channel.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.open_channel.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       case SAT_PROATV_CMD_LAUNCH_BROWSER: {
+               memcpy((void*)&tr.terminal_rsp_data.launch_browser.command_detail, &p_ind->proactive_ind_data.launch_browser.command_detail, sizeof(struct tel_sat_cmd_detail_info));
+               tr.terminal_rsp_data.launch_browser.device_id.src = DEVICE_ID_ME;
+               tr.terminal_rsp_data.launch_browser.device_id.dest = DEVICE_ID_SIM;
+               tr.terminal_rsp_data.launch_browser.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+       } break;
+       default:
+               dbg("unsupported command.");
+               break;
        }
 
        rv = sat_manager_send_terminal_response(ctx->comm, plg, &tr);
-       if(rv != TCORE_RETURN_SUCCESS)
+       if (rv != TCORE_RETURN_SUCCESS)
                return FALSE;
 
        return TRUE;
@@ -3019,12 +2958,12 @@ static gboolean _sat_manager_handle_setup_menu_result(struct custom_data *ctx, T
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] setup menu result data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -3047,35 +2986,35 @@ static gboolean _sat_manager_handle_setup_menu_result(struct custom_data *ctx, T
 
        dbg("[SAT] resp(%d)", resp);
 
-       switch(resp){
-               case RESULT_SUCCESS:
-                       tr->terminal_rsp_data.setup_menu.result_type = RESULT_SUCCESS;
+       switch (resp) {
+       case RESULT_SUCCESS:
+               tr->terminal_rsp_data.setup_menu.result_type = RESULT_SUCCESS;
 
-                       if(q_data.cmd_data.setupMenuInd.text_attribute.b_txt_attr || q_data.cmd_data.setupMenuInd.text_attribute_list.list_cnt > 0)
-                               tr->terminal_rsp_data.setup_menu.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
+               if (q_data.cmd_data.setupMenuInd.text_attribute.b_txt_attr || q_data.cmd_data.setupMenuInd.text_attribute_list.list_cnt > 0)
+                       tr->terminal_rsp_data.setup_menu.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
 
-                       if(q_data.cmd_data.setupMenuInd.icon_id.is_exist)
-                               tr->terminal_rsp_data.setup_menu.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+               if (q_data.cmd_data.setupMenuInd.icon_id.is_exist)
+                       tr->terminal_rsp_data.setup_menu.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-                       tr->terminal_rsp_data.setup_menu.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+               tr->terminal_rsp_data.setup_menu.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.setup_menu.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.setup_menu.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.setup_menu.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.setup_menu.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               default:
-                       //check the default case
-                       tr->terminal_rsp_data.setup_menu.result_type = resp;
-                       tr->terminal_rsp_data.setup_menu.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       dbg("[SAT] wrong result from app exec resp(%d)", resp);
-                       break;
+       default:
+               /* check the default case */
+               tr->terminal_rsp_data.setup_menu.result_type = resp;
+               tr->terminal_rsp_data.setup_menu.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               dbg("[SAT] wrong result from app exec resp(%d)", resp);
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -3101,18 +3040,18 @@ static gboolean _sat_manager_handle_display_text_result(struct custom_data *ctx,
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] display text result data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(ii)",&resp, &me_problem);
+       g_variant_get(exec_result, "(ii)", &resp, &me_problem);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
        if (!tr)
@@ -3125,33 +3064,33 @@ static gboolean _sat_manager_handle_display_text_result(struct custom_data *ctx,
        tr->terminal_rsp_data.display_text.device_id.dest = DEVICE_ID_SIM;
 
        switch (resp) {
-               case RESULT_SUCCESS:
-                       tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS;
+       case RESULT_SUCCESS:
+               tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS;
 
-                       if(q_data.cmd_data.displayTextInd.text_attribute.b_txt_attr)
-                               tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
+               if (q_data.cmd_data.displayTextInd.text_attribute.b_txt_attr)
+                       tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
 
-                       if (q_data.cmd_data.displayTextInd.icon_id.is_exist)
-                               tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+               if (q_data.cmd_data.displayTextInd.icon_id.is_exist)
+                       tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-                       tr->terminal_rsp_data.display_text.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+               tr->terminal_rsp_data.display_text.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.display_text.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.display_text.me_problem_type = me_problem;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.display_text.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.display_text.me_problem_type = me_problem;
+               break;
 
-               default:
-                       tr->terminal_rsp_data.display_text.result_type = resp;
-                       tr->terminal_rsp_data.display_text.me_problem_type = me_problem;
-                       dbg("[SAT] wrong result from app exec resp(%d) me_problem(%d)", resp, me_problem);
-                       break;
+       default:
+               tr->terminal_rsp_data.display_text.result_type = resp;
+               tr->terminal_rsp_data.display_text.me_problem_type = me_problem;
+               dbg("[SAT] wrong result from app exec resp(%d) me_problem(%d)", resp, me_problem);
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -3177,18 +3116,18 @@ static gboolean _sat_manager_handle_play_tone_result(struct custom_data *ctx, Tc
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] display text result data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(i)",&resp);
+       g_variant_get(exec_result, "(i)", &resp);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
        if (!tr)
@@ -3201,38 +3140,38 @@ static gboolean _sat_manager_handle_play_tone_result(struct custom_data *ctx, Tc
        tr->terminal_rsp_data.play_tone.device_id.dest = DEVICE_ID_SIM;
 
        switch (resp) {
-               case RESULT_SUCCESS:
-                       tr->terminal_rsp_data.play_tone.result_type = RESULT_SUCCESS;
+       case RESULT_SUCCESS:
+               tr->terminal_rsp_data.play_tone.result_type = RESULT_SUCCESS;
 
-                       if(q_data.cmd_data.play_tone.text_attribute.b_txt_attr)
-                               tr->terminal_rsp_data.play_tone.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
+               if (q_data.cmd_data.play_tone.text_attribute.b_txt_attr)
+                       tr->terminal_rsp_data.play_tone.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
 
-                       if (q_data.cmd_data.play_tone.icon_id.is_exist)
-                               tr->terminal_rsp_data.play_tone.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+               if (q_data.cmd_data.play_tone.icon_id.is_exist)
+                       tr->terminal_rsp_data.play_tone.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-                       tr->terminal_rsp_data.play_tone.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+               tr->terminal_rsp_data.play_tone.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.play_tone.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.play_tone.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.play_tone.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.play_tone.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER:
-                       tr->terminal_rsp_data.play_tone.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
-                       tr->terminal_rsp_data.play_tone.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER:
+               tr->terminal_rsp_data.play_tone.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
+               tr->terminal_rsp_data.play_tone.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               default:
-                       tr->terminal_rsp_data.play_tone.result_type = resp;
-                       tr->terminal_rsp_data.play_tone.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       dbg("[SAT] wrong result from app exec resp(%d)", resp);
-                       break;
+       default:
+               tr->terminal_rsp_data.play_tone.result_type = resp;
+               tr->terminal_rsp_data.play_tone.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               dbg("[SAT] wrong result from app exec resp(%d)", resp);
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -3257,18 +3196,18 @@ static gboolean _sat_manager_handle_send_sms_result(struct custom_data *ctx, Tco
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] send sms data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(i)",&resp);
+       g_variant_get(exec_result, "(i)", &resp);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
        if (!tr)
@@ -3281,69 +3220,69 @@ static gboolean _sat_manager_handle_send_sms_result(struct custom_data *ctx, Tco
        tr->terminal_rsp_data.send_sms.device_id.dest = q_data.cmd_data.sendSMSInd.device_id.src;
 
        switch (resp) {
-               case RESULT_SUCCESS:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_SUCCESS;
-                       if (q_data.cmd_data.sendSMSInd.icon_id.is_exist)
-                               tr->terminal_rsp_data.send_sms.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+       case RESULT_SUCCESS:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_SUCCESS;
+               if (q_data.cmd_data.sendSMSInd.icon_id.is_exist)
+                       tr->terminal_rsp_data.send_sms.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-                       break;
+               break;
 
-               case RESULT_INTRCTN_WITH_CC_OR_SMS_CTRL_PRMNT_PRBLM:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_INTRCTN_WITH_CC_OR_SMS_CTRL_PRMNT_PRBLM;
-                       tr->terminal_rsp_data.send_sms.cc_problem_type = CC_PROBLEM_ACTION_NOT_ALLOWED;
-                       break;
+       case RESULT_INTRCTN_WITH_CC_OR_SMS_CTRL_PRMNT_PRBLM:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_INTRCTN_WITH_CC_OR_SMS_CTRL_PRMNT_PRBLM;
+               tr->terminal_rsp_data.send_sms.cc_problem_type = CC_PROBLEM_ACTION_NOT_ALLOWED;
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_BEYOND_ME_CAPABILITIES:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_BEYOND_ME_CAPABILITIES;
-                       tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_BEYOND_ME_CAPABILITIES:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_BEYOND_ME_CAPABILITIES;
+               tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_COMMAND_TYPE_NOT_UNDERSTOOD_BY_ME:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_COMMAND_TYPE_NOT_UNDERSTOOD_BY_ME;
-                       tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_COMMAND_TYPE_NOT_UNDERSTOOD_BY_ME:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_COMMAND_TYPE_NOT_UNDERSTOOD_BY_ME;
+               tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_COMMAND_DATA_NOT_UNDERSTOOD_BY_ME:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_COMMAND_DATA_NOT_UNDERSTOOD_BY_ME;
-                       tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_COMMAND_DATA_NOT_UNDERSTOOD_BY_ME:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_COMMAND_DATA_NOT_UNDERSTOOD_BY_ME;
+               tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_ERROR_REQUIRED_VALUES_ARE_MISSING:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_ERROR_REQUIRED_VALUES_ARE_MISSING;
-                       tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_ERROR_REQUIRED_VALUES_ARE_MISSING:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_ERROR_REQUIRED_VALUES_ARE_MISSING;
+               tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_SMS_RP_ERROR:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_SMS_RP_ERROR;
-                       tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_SMS_RP_ERROR:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_SMS_RP_ERROR;
+               tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               default:
-                       tr->terminal_rsp_data.send_sms.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       default:
+               tr->terminal_rsp_data.send_sms.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.send_sms.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
 
        g_free(tr);
 
-/*     ifq_data.cmd_data.sendSMSInd.alpha_id.alpha_data_len && q_data.cmd_data.sendSMSInd.alpha_id.is_exist)
+/*     if (q_data.cmd_data.sendSMSInd.alpha_id.alpha_data_len && q_data.cmd_data.sendSMSInd.alpha_id.is_exist)
                sat_ui_support_terminate_sat_ui();*/
 
        return result;
@@ -3358,7 +3297,7 @@ static gboolean _sat_manager_handle_send_ss_result(struct custom_data *ctx, Tcor
        GVariant *ss_str = NULL;
        struct treq_sat_terminal_rsp_data *tr;
        struct sat_manager_queue_data q_data;
-       //call ctrl action, result data object, text
+       /* call ctrl action, result data object, text */
 
        memset(&q_data, 0, sizeof(struct sat_manager_queue_data));
 
@@ -3367,12 +3306,12 @@ static gboolean _sat_manager_handle_send_ss_result(struct custom_data *ctx, Tcor
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] send ss data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -3391,76 +3330,74 @@ static gboolean _sat_manager_handle_send_ss_result(struct custom_data *ctx, Tcor
        tr->terminal_rsp_data.send_ss.device_id.dest = q_data.cmd_data.send_ss.device_id.src;
 
        switch (resp) {
-               case RESULT_SUCCESS:
-                       tr->terminal_rsp_data.send_ss.result_type = RESULT_SUCCESS;
-                       if (q_data.cmd_data.send_ss.icon_id.is_exist)
-                               tr->terminal_rsp_data.send_ss.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
-
-                       if(ss_str_len > 0 && ss_str){
-                               int local_index = 0;
-                               guchar data;
-                               GVariantIter *iter = NULL;
-                               GVariant *intermediate = NULL;
-                               char *tmp = NULL;
-
-                               intermediate = g_variant_get_variant(ss_str);
-                               dbg("ss string format(%s)", g_variant_get_type_string(intermediate));
-
-                               g_variant_get(intermediate, "ay", &iter);
-                               while( g_variant_iter_loop (iter, "y", &data)){
-                                       dbg("index(%d) data(%c)", local_index, data);
-                                       tr->terminal_rsp_data.send_ss.text.string[local_index] = data;
-                                       local_index++;
-                               }
-                               g_variant_iter_free(iter);
-                               g_variant_unref(intermediate);
-
-                               tr->terminal_rsp_data.send_ss.text.string_length = local_index;
-                               tmp = _convert_hex_string_to_bytes(tr->terminal_rsp_data.send_ss.text.string);
-                               memset(tr->terminal_rsp_data.send_ss.text.string, 0x00,
-                                       sizeof(tr->terminal_rsp_data.send_ss.text.string));
-                               if(tmp) {
-                                       memcpy(tr->terminal_rsp_data.send_ss.text.string, tmp,
-                                               tr->terminal_rsp_data.send_ss.text.string_length);
-                                       g_free(tmp);
-                               }
-                               else {
-                                       err("memcpy failed");
-                               }
-                               dbg("SS string len:%d", tr->terminal_rsp_data.send_ss.text.string_length);
+       case RESULT_SUCCESS:
+               tr->terminal_rsp_data.send_ss.result_type = RESULT_SUCCESS;
+               if (q_data.cmd_data.send_ss.icon_id.is_exist)
+                       tr->terminal_rsp_data.send_ss.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+
+               if (ss_str_len > 0 && ss_str) {
+                       int local_index = 0;
+                       guchar data;
+                       GVariantIter *iter = NULL;
+                       GVariant *intermediate = NULL;
+                       char *tmp = NULL;
+
+                       intermediate = g_variant_get_variant(ss_str);
+                       dbg("ss string format(%s)", g_variant_get_type_string(intermediate));
+
+                       g_variant_get(intermediate, "ay", &iter);
+                       while (g_variant_iter_loop(iter, "y", &data)) {
+                               dbg("index(%d) data(%c)", local_index, data);
+                               tr->terminal_rsp_data.send_ss.text.string[local_index] = data;
+                               local_index++;
                        }
-                       break;
+                       g_variant_iter_free(iter);
+                       g_variant_unref(intermediate);
+
+                       tr->terminal_rsp_data.send_ss.text.string_length = local_index;
+                       tmp = _convert_hex_string_to_bytes(tr->terminal_rsp_data.send_ss.text.string);
+                       memset(tr->terminal_rsp_data.send_ss.text.string, 0x00,
+                               sizeof(tr->terminal_rsp_data.send_ss.text.string));
+                       if (tmp) {
+                               memcpy(tr->terminal_rsp_data.send_ss.text.string, tmp,
+                                       tr->terminal_rsp_data.send_ss.text.string_length);
+                               g_free(tmp);
+                       } else {
+                               err("memcpy failed");
+                       }
+                       dbg("SS string len:%d", tr->terminal_rsp_data.send_ss.text.string_length);
+               }
+               break;
 
-               case RESULT_SS_RETURN_ERROR:
-                       tr->terminal_rsp_data.send_ss.result_type = RESULT_SS_RETURN_ERROR;
-                       if (ss_cause == SATK_SS_PROBLEM_FACILITY_NOT_SUPPORTED) {
-                                tr->terminal_rsp_data.send_ss.ss_problem = SATK_SS_PROBLEM_FACILITY_NOT_SUPPORTED;
-                        } else {
-                                tr->terminal_rsp_data.send_ss.ss_problem = SATK_SS_PROBLEM_NO_SPECIFIC_CAUSE;
-                        }
-                       break;
+       case RESULT_SS_RETURN_ERROR:
+               tr->terminal_rsp_data.send_ss.result_type = RESULT_SS_RETURN_ERROR;
+               if (ss_cause == SATK_SS_PROBLEM_FACILITY_NOT_SUPPORTED)
+                       tr->terminal_rsp_data.send_ss.ss_problem = SATK_SS_PROBLEM_FACILITY_NOT_SUPPORTED;
+               else
+                       tr->terminal_rsp_data.send_ss.ss_problem = SATK_SS_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.send_ss.result_type = RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.send_ss.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.send_ss.result_type = RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.send_ss.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               default:
-                       tr->terminal_rsp_data.send_ss.result_type = RESULT_SS_RETURN_ERROR;
-                       tr->terminal_rsp_data.send_ss.ss_problem = SATK_SS_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       default:
+               tr->terminal_rsp_data.send_ss.result_type = RESULT_SS_RETURN_ERROR;
+               tr->terminal_rsp_data.send_ss.ss_problem = SATK_SS_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
        g_free(tr);
 
 #if defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-       if( q_data.cmd_data.send_ss.alpha_id.alpha_data_len && q_data.cmd_data.send_ss.alpha_id.is_exist ) {
+       if (q_data.cmd_data.send_ss.alpha_id.alpha_data_len && q_data.cmd_data.send_ss.alpha_id.is_exist) {
                char *path;
                const gchar *cp_name;
                TelephonySAT *sat;
@@ -3502,7 +3439,7 @@ static gboolean _sat_manager_handle_send_ussd_result(struct custom_data *ctx, Tc
        GVariant *ussd_str = NULL;
        struct treq_sat_terminal_rsp_data *tr;
        struct sat_manager_queue_data q_data;
-       //call ctrl action, result data object, text, result2, text2
+       /* call ctrl action, result data object, text, result2, text2 */
 
        memset(&q_data, 0, sizeof(struct sat_manager_queue_data));
 
@@ -3511,12 +3448,12 @@ static gboolean _sat_manager_handle_send_ussd_result(struct custom_data *ctx, Tc
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] send ss data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -3535,162 +3472,163 @@ static gboolean _sat_manager_handle_send_ussd_result(struct custom_data *ctx, Tc
        tr->terminal_rsp_data.send_ussd.device_id.dest = q_data.cmd_data.send_ussd.device_id.src;
 
        switch (resp) {
-               case RESULT_SUCCESS:
-                       tr->terminal_rsp_data.send_ussd.result_type = RESULT_SUCCESS;
-                       if (q_data.cmd_data.send_ussd.icon_id.is_exist)
-                               tr->terminal_rsp_data.send_ussd.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
-
-                       if(ussd_str_len > 0 && ussd_str){
-                               int local_index = 0, i = 0;
-                               guchar data;
-                               GVariantIter *iter = NULL;
-                               GVariant *intermediate = NULL;
-                               enum alphabet_format alpha_format;
-
-                               intermediate = g_variant_get_variant(ussd_str);
-                               dbg("ussd string format(%s)", g_variant_get_type_string(intermediate));
-
-                               g_variant_get(intermediate, "ay", &iter);
-                               while( g_variant_iter_loop (iter, "y", &data)){
-                                       dbg("local_index(%d) data(%c)", local_index, data);
-                                       tr->terminal_rsp_data.send_ussd.text.string[local_index] = data;
-                                       local_index++;
-                               }
+       case RESULT_SUCCESS:
+               tr->terminal_rsp_data.send_ussd.result_type = RESULT_SUCCESS;
+               if (q_data.cmd_data.send_ussd.icon_id.is_exist)
+                       tr->terminal_rsp_data.send_ussd.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+
+               if (ussd_str_len > 0 && ussd_str) {
+                       int local_index = 0, i = 0;
+                       guchar data;
+                       GVariantIter *iter = NULL;
+                       GVariant *intermediate = NULL;
+                       enum alphabet_format alpha_format;
+
+                       intermediate = g_variant_get_variant(ussd_str);
+                       dbg("ussd string format(%s)", g_variant_get_type_string(intermediate));
+
+                       g_variant_get(intermediate, "ay", &iter);
+                       while (g_variant_iter_loop(iter, "y", &data)) {
+                               dbg("local_index(%d) data(%c)", local_index, data);
+                               tr->terminal_rsp_data.send_ussd.text.string[local_index] = data;
+                               local_index++;
+                       }
 
-                               if(local_index >=1 )
-                                       tr->terminal_rsp_data.send_ussd.text.string_length = local_index-1;
-                               tr->terminal_rsp_data.send_ussd.text.dcs.raw_dcs = q_data.cmd_data.send_ussd.ussd_string.dsc.raw_dcs;
-                               /*bits 2 & 3 indicate the character set being used */
-                               switch (tr->terminal_rsp_data.send_ussd.text.dcs.raw_dcs & 0x0C) {
-                                       case 0x00:
-                                       case 0x0C:
-                                               alpha_format = ALPHABET_FORMAT_SMS_DEFAULT;
-                                               break;
-
-                                       case 0x04:
-                                               alpha_format = ALPHABET_FORMAT_8BIT_DATA;
-                                               break;
-
-                                       case 0X08:
-                                               alpha_format = ALPHABET_FORMAT_UCS2;
-                                               break;
-
-                                       default:
-                                               alpha_format = ALPHABET_FORMAT_RESERVED;
-                                               break;
-                               }
-                               dbg("string :[%s] len:[%d] dcs:[%d] alpha_format:[%d]", tr->terminal_rsp_data.send_ussd.text.string, tr->terminal_rsp_data.send_ussd.text.string_length,
-                                       tr->terminal_rsp_data.send_ussd.text.dcs.raw_dcs, alpha_format);
-                               g_variant_iter_free(iter);
-                               g_variant_unref(intermediate);
-                               switch(alpha_format){
-                                       case ALPHABET_FORMAT_SMS_DEFAULT:
-                                               /* As per the test spec TS 151.010-04 raw dcs for SMS default is 0 */
-                                               tr->terminal_rsp_data.send_ussd.text.dcs.raw_dcs = ALPHABET_FORMAT_SMS_DEFAULT;
-                                               if (tr->terminal_rsp_data.send_ussd.text.string_length > 0){
-                                                       int tmp_len;
-                                                       char tmp_str[SAT_TEXT_STRING_LEN_MAX + 1];
-                                                       char  *packed_data;
-
-                                                       dbg("UTF 8 to GSM SMS default");
-                                                       tcore_util_convert_utf8_to_gsm((unsigned char*)tmp_str, &tmp_len,
-                                                               (unsigned char*)tr->terminal_rsp_data.send_ussd.text.string,
-                                                               tr->terminal_rsp_data.send_ussd.text.string_length);
-                                                       packed_data = (char*) tcore_util_pack_gsm7bit((const unsigned char *)tmp_str, tmp_len);
-                                                       memset(tr->terminal_rsp_data.send_ussd.text.string, 0x00,
-                                                               sizeof(tr->terminal_rsp_data.send_ussd.text.string));
-                                                       if(packed_data){
-                                                               memcpy((void*)tr->terminal_rsp_data.send_ussd.text.string, packed_data, strlen(packed_data));
-                                                               tr->terminal_rsp_data.send_ussd.text.string_length = strlen(packed_data);
-                                                               g_free(packed_data);
-                                                       }
-                                               }
-                                               dbg("final ussd len:%d", tr->terminal_rsp_data.send_ussd.text.string_length);
-                                               for(i = 0; i< tr->terminal_rsp_data.send_ussd.text.string_length; i++)
-                                                       dbg("string :%c \n", tr->terminal_rsp_data.send_ussd.text.string[i]);
-                                               break;
-                                       case ALPHABET_FORMAT_8BIT_DATA: {
-                                               gint output_data_len = 0;
-                                               gchar output_data[SAT_USSD_STRING_LEN_MAX];
-                                               dbg("UTF 8 to GSM 8 BIT DATA");
-                                               tcore_util_convert_utf8_to_gsm((unsigned char*)output_data,&output_data_len,
-                                                       (unsigned char*)tr->terminal_rsp_data.send_ussd.text.string,
-                                                       tr->terminal_rsp_data.send_ussd.text.string_length);
-                                               memset(tr->terminal_rsp_data.send_ussd.text.string, 0x00,
-                                                       sizeof(tr->terminal_rsp_data.send_ussd.text.string));
-                                               if(output_data_len > 0){
-                                                       memcpy((void*)tr->terminal_rsp_data.send_ussd.text.string, output_data, output_data_len);
-                                                       tr->terminal_rsp_data.send_ussd.text.string_length = output_data_len;
-                                               }
-                                               dbg("final ussd len:%d", tr->terminal_rsp_data.send_ussd.text.string_length);
-                                               for(i = 0; i< tr->terminal_rsp_data.send_ussd.text.string_length; i++)
-                                                       dbg("string :%c \n", tr->terminal_rsp_data.send_ussd.text.string[i]);
-                                               }
-                                               break;
-                                       case ALPHABET_FORMAT_UCS2: {
-                                               char *tmp = NULL;
-                                               int str_len = 0;
-                                               dbg("UCS2 DATA");
-                                               tcore_util_convert_utf8_to_ucs2(&tmp,
-                                                               &str_len, (unsigned char*)tr->terminal_rsp_data.send_ussd.text.string,
-                                                               tr->terminal_rsp_data.send_ussd.text.string_length);
-                                               memset(tr->terminal_rsp_data.send_ussd.text.string, 0x00,
-                                                       sizeof(tr->terminal_rsp_data.send_ussd.text.string));
-                                               memcpy(tr->terminal_rsp_data.send_ussd.text.string, tmp, str_len);
-                                               tr->terminal_rsp_data.send_ussd.text.string_length = str_len;
-                                               dbg("final ussd len:%d", tr->terminal_rsp_data.send_ussd.text.string_length);
-                                               for(i = 0; i< tr->terminal_rsp_data.send_ussd.text.string_length; i++)
-                                                       dbg("string :%c \n", tr->terminal_rsp_data.send_ussd.text.string[i]);
-                                               g_free(tmp);
+                       if (local_index >= 1)
+                               tr->terminal_rsp_data.send_ussd.text.string_length = local_index - 1;
+                       tr->terminal_rsp_data.send_ussd.text.dcs.raw_dcs = q_data.cmd_data.send_ussd.ussd_string.dsc.raw_dcs;
+                       /* bits 2 & 3 indicate the character set being used */
+                       switch (tr->terminal_rsp_data.send_ussd.text.dcs.raw_dcs & 0x0C) {
+                       case 0x00:
+                       case 0x0C:
+                               alpha_format = ALPHABET_FORMAT_SMS_DEFAULT;
+                               break;
+
+                       case 0x04:
+                               alpha_format = ALPHABET_FORMAT_8BIT_DATA;
+                               break;
+
+                       case 0X08:
+                               alpha_format = ALPHABET_FORMAT_UCS2;
+                               break;
+
+                       default:
+                               alpha_format = ALPHABET_FORMAT_RESERVED;
+                               break;
+                       }
+                       dbg("string :[%s] len:[%d] dcs:[%d] alpha_format:[%d]",
+                               tr->terminal_rsp_data.send_ussd.text.string,
+                               tr->terminal_rsp_data.send_ussd.text.string_length,
+                               tr->terminal_rsp_data.send_ussd.text.dcs.raw_dcs, alpha_format);
+                       g_variant_iter_free(iter);
+                       g_variant_unref(intermediate);
+                       switch (alpha_format) {
+                       case ALPHABET_FORMAT_SMS_DEFAULT:
+                               /* As per the test spec TS 151.010-04 raw dcs for SMS default is 0 */
+                               tr->terminal_rsp_data.send_ussd.text.dcs.raw_dcs = ALPHABET_FORMAT_SMS_DEFAULT;
+                               if (tr->terminal_rsp_data.send_ussd.text.string_length > 0) {
+                                       int tmp_len;
+                                       char tmp_str[SAT_TEXT_STRING_LEN_MAX + 1];
+                                       char  *packed_data;
+
+                                       dbg("UTF 8 to GSM SMS default");
+                                       tcore_util_convert_utf8_to_gsm((unsigned char*)tmp_str, &tmp_len,
+                                               (unsigned char*)tr->terminal_rsp_data.send_ussd.text.string,
+                                               tr->terminal_rsp_data.send_ussd.text.string_length);
+                                       packed_data = (char*) tcore_util_pack_gsm7bit((const unsigned char *)tmp_str, tmp_len);
+                                       memset(tr->terminal_rsp_data.send_ussd.text.string, 0x00,
+                                               sizeof(tr->terminal_rsp_data.send_ussd.text.string));
+                                       if (packed_data) {
+                                               memcpy((void*)tr->terminal_rsp_data.send_ussd.text.string, packed_data, strlen(packed_data));
+                                               tr->terminal_rsp_data.send_ussd.text.string_length = strlen(packed_data);
+                                               g_free(packed_data);
                                        }
-                                               break;
-                                       default:
-                                               break;
                                }
+                               dbg("final ussd len:%d", tr->terminal_rsp_data.send_ussd.text.string_length);
+                               for (i = 0; i < tr->terminal_rsp_data.send_ussd.text.string_length; i++)
+                                       dbg("string :%c \n", tr->terminal_rsp_data.send_ussd.text.string[i]);
+                               break;
+                       case ALPHABET_FORMAT_8BIT_DATA: {
+                               gint output_data_len = 0;
+                               gchar output_data[SAT_USSD_STRING_LEN_MAX];
+                               dbg("UTF 8 to GSM 8 BIT DATA");
+                               tcore_util_convert_utf8_to_gsm((unsigned char *)output_data, &output_data_len,
+                                       (unsigned char *)tr->terminal_rsp_data.send_ussd.text.string,
+                                       tr->terminal_rsp_data.send_ussd.text.string_length);
+                               memset(tr->terminal_rsp_data.send_ussd.text.string, 0x00,
+                                       sizeof(tr->terminal_rsp_data.send_ussd.text.string));
+                               if (output_data_len > 0) {
+                                       memcpy((void*)tr->terminal_rsp_data.send_ussd.text.string, output_data, output_data_len);
+                                       tr->terminal_rsp_data.send_ussd.text.string_length = output_data_len;
+                               }
+                               dbg("final ussd len:%d", tr->terminal_rsp_data.send_ussd.text.string_length);
+                               for (i = 0; i < tr->terminal_rsp_data.send_ussd.text.string_length; i++)
+                                       dbg("string :%c \n", tr->terminal_rsp_data.send_ussd.text.string[i]);
+                               }
+                               break;
+                       case ALPHABET_FORMAT_UCS2: {
+                               char *tmp = NULL;
+                               int str_len = 0;
+                               dbg("UCS2 DATA");
+                               tcore_util_convert_utf8_to_ucs2(&tmp,
+                                       &str_len, (unsigned char*)tr->terminal_rsp_data.send_ussd.text.string,
+                                       tr->terminal_rsp_data.send_ussd.text.string_length);
+                               memset(tr->terminal_rsp_data.send_ussd.text.string, 0x00,
+                                       sizeof(tr->terminal_rsp_data.send_ussd.text.string));
+                               memcpy(tr->terminal_rsp_data.send_ussd.text.string, tmp, str_len);
+                               tr->terminal_rsp_data.send_ussd.text.string_length = str_len;
+                               dbg("final ussd len:%d", tr->terminal_rsp_data.send_ussd.text.string_length);
+                               for (i = 0; i < tr->terminal_rsp_data.send_ussd.text.string_length; i++)
+                                       dbg("string :%c \n", tr->terminal_rsp_data.send_ussd.text.string[i]);
+                               g_free(tmp);
+                               }
+                               break;
+                       default:
+                               break;
                        }
-                       break;
+               }
+               break;
 
-               case RESULT_SS_RETURN_ERROR:
-               case RESULT_USSD_RETURN_ERROR:
-                       tr->terminal_rsp_data.send_ussd.result_type = RESULT_USSD_RETURN_ERROR;
-                       if(ss_cause == SATK_USSD_PROBLEM_UNKNOWN_ALPHABET)
-                               tr->terminal_rsp_data.send_ussd.ussd_problem = ss_cause;
+       case RESULT_SS_RETURN_ERROR:
+       case RESULT_USSD_RETURN_ERROR:
+               tr->terminal_rsp_data.send_ussd.result_type = RESULT_USSD_RETURN_ERROR;
+               if (ss_cause == SATK_USSD_PROBLEM_UNKNOWN_ALPHABET)
+                       tr->terminal_rsp_data.send_ussd.ussd_problem = ss_cause;
+               break;
 
-                       break;
+       case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.send_ussd.result_type = RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.send_ussd.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.send_ussd.result_type = RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.send_ussd.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.send_ussd.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.send_ussd.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.send_ussd.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.send_ussd.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
-
-               default:
-                       tr->terminal_rsp_data.send_ussd.result_type = RESULT_USSD_RETURN_ERROR;
-                       tr->terminal_rsp_data.send_ussd.ussd_problem = SATK_USSD_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
-       }
+       default:
+               tr->terminal_rsp_data.send_ussd.result_type = RESULT_USSD_RETURN_ERROR;
+               tr->terminal_rsp_data.send_ussd.ussd_problem = SATK_USSD_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
+       }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
        g_free(tr);
 
 #if defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-       if( q_data.cmd_data.send_ussd.alpha_id.alpha_data_len && q_data.cmd_data.send_ussd.alpha_id.is_exist ) {
+       if (q_data.cmd_data.send_ussd.alpha_id.alpha_data_len && q_data.cmd_data.send_ussd.alpha_id.is_exist) {
                char *path;
                const gchar *cp_name;
                TelephonySAT *sat;
                TelephonyObjectSkeleton *object;
 
                dbg("AlphaID is present, terminate SAT-UI.");
-               //emit session end signal
+               /* emit session end signal */
                cp_name = tcore_server_get_cp_name_by_plugin(plg);
                if (cp_name == NULL) {
                        err("CP name is NULL");
@@ -3734,18 +3672,18 @@ static gboolean _sat_manager_handle_setup_call_result(struct custom_data *ctx, T
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] setup call data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(iiii)",&resp, &me_problem, &cc_problem, &call_cause);
+       g_variant_get(exec_result, "(iiii)", &resp, &me_problem, &cc_problem, &call_cause);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
        if (!tr)
@@ -3758,60 +3696,59 @@ static gboolean _sat_manager_handle_setup_call_result(struct custom_data *ctx, T
        tr->terminal_rsp_data.setup_call.device_id.dest = q_data.cmd_data.setup_call.device_id.src;
 
        switch (resp) {
-               case RESULT_SUCCESS:
-                       tr->terminal_rsp_data.setup_call.result_type = RESULT_SUCCESS;
-                       if (q_data.cmd_data.setup_call.call_setup_icon_id.is_exist || q_data.cmd_data.setup_call.user_confirm_icon_id.is_exist)
-                               tr->terminal_rsp_data.setup_call.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
-                       tr->terminal_rsp_data.setup_call.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       tr->terminal_rsp_data.setup_call.cc_problem_type = CC_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
-
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.setup_call.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.setup_call.me_problem_type = me_problem;
-                       break;
+       case RESULT_SUCCESS:
+               tr->terminal_rsp_data.setup_call.result_type = RESULT_SUCCESS;
+               if (q_data.cmd_data.setup_call.call_setup_icon_id.is_exist || q_data.cmd_data.setup_call.user_confirm_icon_id.is_exist)
+                       tr->terminal_rsp_data.setup_call.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+               tr->terminal_rsp_data.setup_call.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               tr->terminal_rsp_data.setup_call.cc_problem_type = CC_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:{
-                       tr->terminal_rsp_data.setup_call.result_type = RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND;
-                       switch(call_cause){
-                               case CALL_ERROR_BUSY:
-                                       tr->terminal_rsp_data.setup_call.network_problem_type = NETWORK_PROBLEM_USER_BUSY;
-                               break;
-                               default :
-                                       tr->terminal_rsp_data.setup_call.network_problem_type = NETWORK_PROBLEM_NO_SPECIFIC_CAUSE;
-                               break;
-                       }
-               }break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.setup_call.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.setup_call.me_problem_type = me_problem;
+               break;
 
-               case RESULT_USER_CLEAR_DOWN_CALL_BEFORE_CONN:
-                       tr->terminal_rsp_data.setup_call.result_type = RESULT_USER_CLEAR_DOWN_CALL_BEFORE_CONN;
-                       tr->terminal_rsp_data.setup_call.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       tr->terminal_rsp_data.setup_call.cc_problem_type = CC_PROBLEM_NO_SPECIFIC_CAUSE;
+       case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND: {
+               tr->terminal_rsp_data.setup_call.result_type = RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND;
+               switch (call_cause) {
+               case CALL_ERROR_BUSY:
+                       tr->terminal_rsp_data.setup_call.network_problem_type = NETWORK_PROBLEM_USER_BUSY;
                        break;
-
-               case RESULT_BEYOND_ME_CAPABILITIES:
-                       tr->terminal_rsp_data.setup_call.result_type = RESULT_BEYOND_ME_CAPABILITIES;
-                       tr->terminal_rsp_data.setup_call.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       tr->terminal_rsp_data.setup_call.cc_problem_type = CC_PROBLEM_NO_SPECIFIC_CAUSE;
+               default:
+                       tr->terminal_rsp_data.setup_call.network_problem_type = NETWORK_PROBLEM_NO_SPECIFIC_CAUSE;
                        break;
+               }
+       } break;
 
-               case RESULT_INTRCTN_WITH_CC_OR_SMS_CTRL_PRMNT_PRBLM:
-                       tr->terminal_rsp_data.setup_call.result_type = RESULT_INTRCTN_WITH_CC_OR_SMS_CTRL_PRMNT_PRBLM;
-                       tr->terminal_rsp_data.setup_call.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       tr->terminal_rsp_data.setup_call.cc_problem_type = cc_problem;
-                       break;
+       case RESULT_USER_CLEAR_DOWN_CALL_BEFORE_CONN:
+               tr->terminal_rsp_data.setup_call.result_type = RESULT_USER_CLEAR_DOWN_CALL_BEFORE_CONN;
+               tr->terminal_rsp_data.setup_call.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               tr->terminal_rsp_data.setup_call.cc_problem_type = CC_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
+       case RESULT_BEYOND_ME_CAPABILITIES:
+               tr->terminal_rsp_data.setup_call.result_type = RESULT_BEYOND_ME_CAPABILITIES;
+               tr->terminal_rsp_data.setup_call.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               tr->terminal_rsp_data.setup_call.cc_problem_type = CC_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               default:
-                       break;
+       case RESULT_INTRCTN_WITH_CC_OR_SMS_CTRL_PRMNT_PRBLM:
+               tr->terminal_rsp_data.setup_call.result_type = RESULT_INTRCTN_WITH_CC_OR_SMS_CTRL_PRMNT_PRBLM;
+               tr->terminal_rsp_data.setup_call.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               tr->terminal_rsp_data.setup_call.cc_problem_type = cc_problem;
+               break;
+
+       default:
+               break;
        }
 
-       //TODO Other infomation set - not supported
+       /* TODO Other infomation set - not supported */
        tr->terminal_rsp_data.setup_call.other_info = FALSE;
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -3837,18 +3774,18 @@ static gboolean _sat_manager_handle_setup_idle_mode_text_result(struct custom_da
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] send ss data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(i)",&resp);
+       g_variant_get(exec_result, "(i)", &resp);
 
        tr.cmd_number = q_data.cmd_data.idle_mode.command_detail.cmd_num;
        tr.cmd_type = q_data.cmd_data.idle_mode.command_detail.cmd_type;
@@ -3857,20 +3794,20 @@ static gboolean _sat_manager_handle_setup_idle_mode_text_result(struct custom_da
        tr.terminal_rsp_data.setup_idle_mode_text.device_id.dest = q_data.cmd_data.idle_mode.device_id.src;
 
        switch (resp) {
-               case RESULT_SUCCESS:
-                       tr.terminal_rsp_data.setup_idle_mode_text.result_type = RESULT_SUCCESS;
-                       if (q_data.cmd_data.idle_mode.icon_id.is_exist)
-                               tr.terminal_rsp_data.setup_idle_mode_text.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+       case RESULT_SUCCESS:
+               tr.terminal_rsp_data.setup_idle_mode_text.result_type = RESULT_SUCCESS;
+               if (q_data.cmd_data.idle_mode.icon_id.is_exist)
+                       tr.terminal_rsp_data.setup_idle_mode_text.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-                       break;
-               default:
-                       tr.terminal_rsp_data.setup_idle_mode_text.result_type = resp;
-                       break;
+               break;
+       default:
+               tr.terminal_rsp_data.setup_idle_mode_text.result_type = resp;
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, &tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -3898,24 +3835,27 @@ static gboolean sat_manager_handle_open_channel_result(struct custom_data *ctx,
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] open channel data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(iiiiiiiibv)",&resp, &me_problem, &bip_problem,
+       g_variant_get(exec_result, "(iiiiiiiibv)", &resp, &me_problem, &bip_problem,
                        &bearer_type, &channel_id, &channel_status, &channel_status_info, &buffer_size,
                        &other_info, &desc_tmp);
 
        bearer_desc = g_variant_get_variant(desc_tmp);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.open_channel.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.open_channel.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.open_channel.command_detail, &q_data.cmd_data.open_channel.command_detail, sizeof(struct tel_sat_cmd_detail_info));
@@ -3925,23 +3865,23 @@ static gboolean sat_manager_handle_open_channel_result(struct custom_data *ctx,
 
        tr->terminal_rsp_data.open_channel.result_type = resp;
        switch (resp) {
-               case RESULT_SUCCESS:
-               case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
-               case RESULT_SUCCESS_WITH_MISSING_INFO:
-                       //channel status
-                       break;
+       case RESULT_SUCCESS:
+       case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
+       case RESULT_SUCCESS_WITH_MISSING_INFO:
+               /* channel status */
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-               case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.open_channel.me_problem_type = me_problem;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+       case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.open_channel.me_problem_type = me_problem;
+               break;
 
-               case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
-                       tr->terminal_rsp_data.open_channel.bip_problem_type = bip_problem;
-                       break;
+       case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
+               tr->terminal_rsp_data.open_channel.bip_problem_type = bip_problem;
+               break;
 
-               default:
-                       break;
+       default:
+               break;
        }
 
        tr->terminal_rsp_data.open_channel.channel_status.channel_id = channel_id;
@@ -3950,64 +3890,63 @@ static gboolean sat_manager_handle_open_channel_result(struct custom_data *ctx,
 
        dbg("check channel id(%d) channel status(%d) channel info(%d)", channel_id, channel_status, channel_status_info);
 
-       //memcpy(tr->terminal_rsp_data.open_channel.buffer_size.size, &buffer_size, sizeof(unsigned char)*2);
+       /* memcpy(tr->terminal_rsp_data.open_channel.buffer_size.size, &buffer_size, sizeof(unsigned char)*2); */
        tr->terminal_rsp_data.open_channel.buffer_size.size[0] = buffer_size >> 8;
        tr->terminal_rsp_data.open_channel.buffer_size.size[1] = buffer_size & 0xFF;
        dbg("check buffer size[0](0x%x) size[1](0x%x)", tr->terminal_rsp_data.open_channel.buffer_size.size[0], tr->terminal_rsp_data.open_channel.buffer_size.size[1]);
 
        tr->terminal_rsp_data.open_channel.bearer_desc.bearer_type = bearer_type;
-       switch(bearer_type){
-               case BEARER_CSD:{
-                       gint data_rate, service_type, conn_element_type;
-
-                       dbg("bearer_desc cs bearer type_format(%s)", g_variant_get_type_string(bearer_desc));
-                       g_variant_get(bearer_desc, "(iii)",&data_rate, &service_type, &conn_element_type);
-                       dbg("check cs bearer data_rade(%d), service_type(%d), conn_element_type(%d)", data_rate, service_type, conn_element_type);
-
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.cs_bearer_param.data_rate = data_rate;
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.cs_bearer_param.service_type = service_type;
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.cs_bearer_param.connection_element_type = conn_element_type;
-               }break;
-               case BEARER_GPRS:{
-                       gint precedence_class, delay_class, reliability_class;
-                       gint peak_class, mean_class, pdp_type;
-
-                       dbg("bearer_desc ps bearer type_format(%s)", g_variant_get_type_string(bearer_desc));
-                       g_variant_get(bearer_desc, "(iiiiii)",&precedence_class, &delay_class, &reliability_class,
-                                       &peak_class, &mean_class, &pdp_type);
-                       dbg("check ps bearer precedence class(%d), delay class(%d), reliability class(%d) peak class(%d) mean class(%d) pdp_type(%d)",
-                                       precedence_class, delay_class, reliability_class, peak_class, mean_class, pdp_type);
-
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.precedence_class = precedence_class;
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.delay_class = delay_class;
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.reliability_class = reliability_class;
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.peak_throughput_class = peak_class;
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.mean_throughput_class = mean_class;
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.pdp_type = pdp_type;
-               }break;
-               case BEARER_LOCAL_LINK_TECHNOLOGY_INDEPENDENT:{
-                       gint service_type;
-                       gchar *service_record = NULL;
-
-                       dbg("bearer_desc link local type_format(%s)", g_variant_get_type_string(bearer_desc));
-                       g_variant_get(bearer_desc, "(is)",&service_type, &service_record);
-                       dbg("check link local service_type(%d), service_record(%d)", service_type, service_record);
-
-                       tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.local_link_bearer_param.service_type = service_type;
-
-                       if(service_record) {
-                               memcpy(tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.local_link_bearer_param.service_record, service_record, strlen(service_record));
-                               g_free(service_record);
-                       }
+       switch (bearer_type) {
+       case BEARER_CSD: {
+               gint data_rate, service_type, conn_element_type;
+
+               dbg("bearer_desc cs bearer type_format(%s)", g_variant_get_type_string(bearer_desc));
+               g_variant_get(bearer_desc, "(iii)", &data_rate, &service_type, &conn_element_type);
+               dbg("check cs bearer data_rade(%d), service_type(%d), conn_element_type(%d)", data_rate, service_type, conn_element_type);
+
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.cs_bearer_param.data_rate = data_rate;
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.cs_bearer_param.service_type = service_type;
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.cs_bearer_param.connection_element_type = conn_element_type;
+       } break;
+       case BEARER_GPRS: {
+               gint precedence_class, delay_class, reliability_class;
+               gint peak_class, mean_class, pdp_type;
+
+               dbg("bearer_desc ps bearer type_format(%s)", g_variant_get_type_string(bearer_desc));
+               g_variant_get(bearer_desc, "(iiiiii)", &precedence_class, &delay_class, &reliability_class,
+                       &peak_class, &mean_class, &pdp_type);
+               dbg("check ps bearer precedence class(%d), delay class(%d), reliability class(%d) peak class(%d) mean class(%d) pdp_type(%d)",
+                       precedence_class, delay_class, reliability_class, peak_class, mean_class, pdp_type);
+
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.precedence_class = precedence_class;
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.delay_class = delay_class;
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.reliability_class = reliability_class;
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.peak_throughput_class = peak_class;
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.mean_throughput_class = mean_class;
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.ps_bearer_param.pdp_type = pdp_type;
+               } break;
+       case BEARER_LOCAL_LINK_TECHNOLOGY_INDEPENDENT: {
+               gint service_type;
+               gchar *service_record = NULL;
 
-               }break;
-               default:
-               break;
+               dbg("bearer_desc link local type_format(%s)", g_variant_get_type_string(bearer_desc));
+               g_variant_get(bearer_desc, "(is)", &service_type, &service_record);
+               dbg("check link local service_type(%d), service_record(%d)", service_type, service_record);
+
+               tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.local_link_bearer_param.service_type = service_type;
+
+               if (service_record) {
+                       memcpy(tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.local_link_bearer_param.service_record, service_record, strlen(service_record));
+                       g_free(service_record);
+               }
+       } break;
+       default:
+       break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4033,20 +3972,23 @@ static gboolean sat_manager_handle_close_channel_result(struct custom_data *ctx,
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] close channel data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(iii)",&resp, &me_problem, &bip_problem);
+       g_variant_get(exec_result, "(iii)", &resp, &me_problem, &bip_problem);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.close_channel.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.close_channel.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.close_channel.command_detail, &q_data.cmd_data.close_channel.command_detail, sizeof(struct tel_sat_cmd_detail_info));
@@ -4056,28 +3998,28 @@ static gboolean sat_manager_handle_close_channel_result(struct custom_data *ctx,
 
        tr->terminal_rsp_data.close_channel.result_type = resp;
        switch (resp) {
-               case RESULT_SUCCESS:
-               case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
-               case RESULT_SUCCESS_WITH_MISSING_INFO:
-                       //channel status
-                       break;
+       case RESULT_SUCCESS:
+       case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
+       case RESULT_SUCCESS_WITH_MISSING_INFO:
+               /* channel status */
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-               case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.close_channel.me_problem_type = me_problem;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+       case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.close_channel.me_problem_type = me_problem;
+               break;
 
-               case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
-                       tr->terminal_rsp_data.close_channel.bip_problem_type = bip_problem;
-                       break;
+       case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
+               tr->terminal_rsp_data.close_channel.bip_problem_type = bip_problem;
+               break;
 
-               default:
-                       break;
+       default:
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4106,20 +4048,23 @@ static gboolean sat_manager_handle_receive_data_result(struct custom_data *ctx,
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] receive data data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(iiiiibv)",&resp, &me_problem, &bip_problem, &data_str_len, &data_len, &other_info, &received_data);
+       g_variant_get(exec_result, "(iiiiibv)", &resp, &me_problem, &bip_problem, &data_str_len, &data_len, &other_info, &received_data);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.receive_data.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.receive_data.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.receive_data.command_detail, &q_data.cmd_data.receive_data.command_detail, sizeof(struct tel_sat_cmd_detail_info));
@@ -4129,29 +4074,29 @@ static gboolean sat_manager_handle_receive_data_result(struct custom_data *ctx,
 
        tr->terminal_rsp_data.receive_data.result_type = resp;
        switch (resp) {
-               case RESULT_SUCCESS:
-               case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
-               case RESULT_SUCCESS_WITH_MISSING_INFO:
-                       //channel status
-                       break;
+       case RESULT_SUCCESS:
+       case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
+       case RESULT_SUCCESS_WITH_MISSING_INFO:
+               /* channel status */
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-               case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.receive_data.me_problem_type = me_problem;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+       case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.receive_data.me_problem_type = me_problem;
+               break;
 
-               case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
-                       tr->terminal_rsp_data.receive_data.bip_problem_type = bip_problem;
-                       break;
+       case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
+               tr->terminal_rsp_data.receive_data.bip_problem_type = bip_problem;
+               break;
 
-               default:
-                       break;
+       default:
+               break;
        }
 
        tr->terminal_rsp_data.receive_data.channel_data_len.data_len = data_len;
        tr->terminal_rsp_data.receive_data.channel_data.data_string_len = data_str_len;
 
-       if(received_data){
+       if (received_data) {
                int local_index = 0;
                guchar data;
                GVariantIter *iter = NULL;
@@ -4159,8 +4104,7 @@ static gboolean sat_manager_handle_receive_data_result(struct custom_data *ctx,
                dbg("additional data exist type_format(%s)", g_variant_get_type_string(received_data));
 
                g_variant_get(received_data, "ay", &iter);
-               while( g_variant_iter_loop (iter, "y", &data)){
-                       //dbg("index(%d) data(%d)", index, data);
+               while (g_variant_iter_loop(iter, "y", &data)) {
                        tr->terminal_rsp_data.receive_data.channel_data.data_string[local_index] = data;
                        local_index++;
                }
@@ -4171,7 +4115,7 @@ static gboolean sat_manager_handle_receive_data_result(struct custom_data *ctx,
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4198,20 +4142,23 @@ static gboolean sat_manager_handle_send_data_result(struct custom_data *ctx, Tco
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] send data data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(iiii)",&resp, &me_problem, &bip_problem, &data_len);
+       g_variant_get(exec_result, "(iiii)", &resp, &me_problem, &bip_problem, &data_len);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.send_data.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.send_data.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.send_data.command_detail, &q_data.cmd_data.send_data.command_detail, sizeof(struct tel_sat_cmd_detail_info));
@@ -4221,30 +4168,30 @@ static gboolean sat_manager_handle_send_data_result(struct custom_data *ctx, Tco
 
        tr->terminal_rsp_data.send_data.result_type = resp;
        switch (resp) {
-               case RESULT_SUCCESS:
-               case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
-               case RESULT_SUCCESS_WITH_MISSING_INFO:
-                       //channel status
-                       break;
+       case RESULT_SUCCESS:
+       case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
+       case RESULT_SUCCESS_WITH_MISSING_INFO:
+               /* channel status */
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-               case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.send_data.me_problem_type = me_problem;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+       case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.send_data.me_problem_type = me_problem;
+               break;
 
-               case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
-                       tr->terminal_rsp_data.send_data.bip_problem_type = bip_problem;
-                       break;
+       case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
+               tr->terminal_rsp_data.send_data.bip_problem_type = bip_problem;
+               break;
 
-               default:
-                       break;
+       default:
+               break;
        }
 
        tr->terminal_rsp_data.send_data.channel_data_len.data_len = data_len;
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4271,21 +4218,24 @@ static gboolean sat_manager_handle_get_channel_status_result(struct custom_data
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] get channel status data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(iiiiii)",&resp, &me_problem, &bip_problem,
-                       &channel_id, &channel_status, &channel_status_info);
+       g_variant_get(exec_result, "(iiiiii)", &resp, &me_problem, &bip_problem,
+               &channel_id, &channel_status, &channel_status_info);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.get_channel_status.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.get_channel_status.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.get_channel_status.command_detail, &q_data.cmd_data.get_channel_status.command_detail, sizeof(struct tel_sat_cmd_detail_info));
@@ -4295,23 +4245,23 @@ static gboolean sat_manager_handle_get_channel_status_result(struct custom_data
 
        tr->terminal_rsp_data.get_channel_status.result_type = resp;
        switch (resp) {
-               case RESULT_SUCCESS:
-               case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
-               case RESULT_SUCCESS_WITH_MISSING_INFO:
-                       //channel status
-                       break;
+       case RESULT_SUCCESS:
+       case RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED:
+       case RESULT_SUCCESS_WITH_MISSING_INFO:
+               /* channel status */
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-               case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.get_channel_status.me_problem_type = me_problem;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+       case RESULT_NETWORK_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.get_channel_status.me_problem_type = me_problem;
+               break;
 
-               case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
-                       tr->terminal_rsp_data.get_channel_status.bip_problem_type = bip_problem;
-                       break;
+       case RESULT_BEARER_INDEPENDENT_PROTOCOL_ERROR:
+               tr->terminal_rsp_data.get_channel_status.bip_problem_type = bip_problem;
+               break;
 
-               default:
-                       break;
+       default:
+               break;
        }
 
        tr->terminal_rsp_data.get_channel_status.channel_status.channel_id = channel_id;
@@ -4320,7 +4270,7 @@ static gboolean sat_manager_handle_get_channel_status_result(struct custom_data
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4339,6 +4289,9 @@ static gboolean sat_manager_handle_send_dtmf_result(struct custom_data *ctx, Tco
        struct sat_manager_queue_data q_data;
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        memset(&q_data, 0, sizeof(struct sat_manager_queue_data));
 
        if (sat_manager_dequeue_cmd_by_id(ctx, &q_data, command_id) == FALSE) {
@@ -4347,20 +4300,20 @@ static gboolean sat_manager_handle_send_dtmf_result(struct custom_data *ctx, Tco
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] get channel status data is null");
                g_free(tr);
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                g_free(tr);
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(i)",&resp);
+       g_variant_get(exec_result, "(i)", &resp);
 
        tr->cmd_number = q_data.cmd_data.send_dtmf.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.send_dtmf.command_detail.cmd_type;
@@ -4371,24 +4324,24 @@ static gboolean sat_manager_handle_send_dtmf_result(struct custom_data *ctx, Tco
 
        tr->terminal_rsp_data.send_dtmf.result_type = resp;
        switch (resp) {
-               case RESULT_SUCCESS:
-                       if (q_data.cmd_data.send_dtmf.icon_id.is_exist)
-                               tr->terminal_rsp_data.send_dtmf.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
-                       break;
+       case RESULT_SUCCESS:
+               if (q_data.cmd_data.send_dtmf.icon_id.is_exist)
+                       tr->terminal_rsp_data.send_dtmf.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+               break;
 
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.send_dtmf.me_problem_type = ME_PROBLEM_NOT_IN_SPEECH_CALL;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.send_dtmf.me_problem_type = ME_PROBLEM_NOT_IN_SPEECH_CALL;
+               break;
 
-               default:
-                       tr->terminal_rsp_data.send_dtmf.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.send_dtmf.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       default:
+               tr->terminal_rsp_data.send_dtmf.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.send_dtmf.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4413,20 +4366,23 @@ static gboolean sat_manager_handle_launch_browser_result(struct custom_data *ctx
                return result;
        }
 
-       if(!exec_result){
+       if (!exec_result) {
                dbg("[SAT] get channel status data is null");
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        dbg("exec_result type_format(%s)", g_variant_get_type_string(exec_result));
-       g_variant_get(exec_result, "(ii)",&resp,&browser_problem);
+       g_variant_get(exec_result, "(ii)", &resp, &browser_problem);
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.launch_browser.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.launch_browser.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.launch_browser.command_detail, &q_data.cmd_data.launch_browser.command_detail, sizeof(struct tel_sat_cmd_detail_info));
@@ -4436,32 +4392,34 @@ static gboolean sat_manager_handle_launch_browser_result(struct custom_data *ctx
 
        tr->terminal_rsp_data.launch_browser.result_type = resp;
        switch (resp) {
-               case RESULT_SUCCESS:
-                       if (q_data.cmd_data.launch_browser.user_confirm_icon_id.is_exist)
-                               tr->terminal_rsp_data.launch_browser.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+       case RESULT_SUCCESS:
+               if (q_data.cmd_data.launch_browser.user_confirm_icon_id.is_exist)
+                       tr->terminal_rsp_data.launch_browser.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-                       tr->terminal_rsp_data.launch_browser.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       tr->terminal_rsp_data.launch_browser.browser_problem_type = BROWSER_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
-               case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
-                       tr->terminal_rsp_data.launch_browser.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       tr->terminal_rsp_data.launch_browser.browser_problem_type = BROWSER_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+               tr->terminal_rsp_data.launch_browser.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               tr->terminal_rsp_data.launch_browser.browser_problem_type = BROWSER_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
 
-               case RESULT_LAUNCH_BROWSER_GENERIC_ERROR_CODE:
-                       tr->terminal_rsp_data.launch_browser.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       tr->terminal_rsp_data.launch_browser.browser_problem_type = browser_problem;
-                       break;
-               default:
-                       tr->terminal_rsp_data.launch_browser.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-                       tr->terminal_rsp_data.launch_browser.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       tr->terminal_rsp_data.launch_browser.browser_problem_type = BROWSER_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
+       case RESULT_ME_UNABLE_TO_PROCESS_COMMAND:
+               tr->terminal_rsp_data.launch_browser.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               tr->terminal_rsp_data.launch_browser.browser_problem_type = BROWSER_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
+
+       case RESULT_LAUNCH_BROWSER_GENERIC_ERROR_CODE:
+               tr->terminal_rsp_data.launch_browser.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               tr->terminal_rsp_data.launch_browser.browser_problem_type = browser_problem;
+               break;
+
+       default:
+               tr->terminal_rsp_data.launch_browser.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
+               tr->terminal_rsp_data.launch_browser.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               tr->terminal_rsp_data.launch_browser.browser_problem_type = BROWSER_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4480,69 +4438,69 @@ gboolean sat_manager_handle_app_exec_result(struct custom_data *ctx, TcorePlugin
        g_variant_get(exec_result, "v", &resp);
 
        switch (command_type) {
-               case SAT_PROATV_CMD_SETUP_MENU:
-                       result = _sat_manager_handle_setup_menu_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_SETUP_MENU:
+               result = _sat_manager_handle_setup_menu_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_DISPLAY_TEXT:
-                       result = _sat_manager_handle_display_text_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_DISPLAY_TEXT:
+               result = _sat_manager_handle_display_text_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_PLAY_TONE:
-                       result = _sat_manager_handle_play_tone_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_PLAY_TONE:
+               result = _sat_manager_handle_play_tone_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_SEND_SMS:
-                       result = _sat_manager_handle_send_sms_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_SEND_SMS:
+               result = _sat_manager_handle_send_sms_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_SEND_SS:
-                       result = _sat_manager_handle_send_ss_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_SEND_SS:
+               result = _sat_manager_handle_send_ss_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_SEND_USSD:
-                       result = _sat_manager_handle_send_ussd_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_SEND_USSD:
+               result = _sat_manager_handle_send_ussd_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_SETUP_CALL:
-                       result = _sat_manager_handle_setup_call_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_SETUP_CALL:
+               result = _sat_manager_handle_setup_call_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT:
-                       result = _sat_manager_handle_setup_idle_mode_text_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT:
+               result = _sat_manager_handle_setup_idle_mode_text_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_OPEN_CHANNEL:
-                       result = sat_manager_handle_open_channel_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_OPEN_CHANNEL:
+               result = sat_manager_handle_open_channel_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_CLOSE_CHANNEL:
-                       result = sat_manager_handle_close_channel_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_CLOSE_CHANNEL:
+               result = sat_manager_handle_close_channel_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_RECEIVE_DATA:
-                       result = sat_manager_handle_receive_data_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_RECEIVE_DATA:
+               result = sat_manager_handle_receive_data_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_SEND_DATA:
-                       result = sat_manager_handle_send_data_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_SEND_DATA:
+               result = sat_manager_handle_send_data_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_GET_CHANNEL_STATUS:
-                       result = sat_manager_handle_get_channel_status_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_GET_CHANNEL_STATUS:
+               result = sat_manager_handle_get_channel_status_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_SEND_DTMF:
-                       result = sat_manager_handle_send_dtmf_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_SEND_DTMF:
+               result = sat_manager_handle_send_dtmf_result(ctx, plg, command_id, resp);
+               break;
 
-               case SAT_PROATV_CMD_LAUNCH_BROWSER:
-                       result = sat_manager_handle_launch_browser_result(ctx, plg, command_id, resp);
-                       break;
+       case SAT_PROATV_CMD_LAUNCH_BROWSER:
+               result = sat_manager_handle_launch_browser_result(ctx, plg, command_id, resp);
+               break;
 
-               default:
-                       dbg("[SAT] invalid command type(%d)", command_type);
-                       break;
+       default:
+               dbg("[SAT] invalid command type(%d)", command_type);
+               break;
        }
 
        return result;
@@ -4553,7 +4511,7 @@ static gboolean _sat_manager_handle_menu_select_confirm(struct custom_data *ctx,
        TReturn rv = TCORE_RETURN_FAILURE;
        gboolean result = FALSE;
 
-       gint item_id=0;
+       gint item_id = 0;
        struct treq_sat_terminal_rsp_data *tr;
        struct sat_manager_queue_data q_data;
 
@@ -4564,12 +4522,12 @@ static gboolean _sat_manager_handle_menu_select_confirm(struct custom_data *ctx,
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
-       if(addtional_data){
+       if (addtional_data) {
                int local_index = 0;
                guchar data;
                GVariantIter *iter = NULL;
@@ -4579,7 +4537,7 @@ static gboolean _sat_manager_handle_menu_select_confirm(struct custom_data *ctx,
                dbg("additional data exist type_format(%s)", g_variant_get_type_string(inner_gv));
 
                g_variant_get(inner_gv, "ay", &iter);
-               while( g_variant_iter_loop (iter, "y", &data)){
+               while (g_variant_iter_loop(iter, "y", &data)) {
                        dbg("index(%d) data(%d)", local_index, data);
                        item_id = data;
                        local_index++;
@@ -4589,6 +4547,9 @@ static gboolean _sat_manager_handle_menu_select_confirm(struct custom_data *ctx,
        }
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.selectItemInd.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.selectItemInd.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.select_item.command_detail, &q_data.cmd_data.selectItemInd.command_detail, sizeof(struct tel_sat_cmd_detail_info));
@@ -4596,48 +4557,48 @@ static gboolean _sat_manager_handle_menu_select_confirm(struct custom_data *ctx,
        tr->terminal_rsp_data.select_item.device_id.dest = DEVICE_ID_SIM;
 
        switch (confirm_type) {
-               case USER_CONFIRM_YES:
-                       tr->terminal_rsp_data.select_item.item_identifier.item_identifier = item_id;
-                       tr->terminal_rsp_data.select_item.other_info = FALSE;
-                       tr->terminal_rsp_data.select_item.result_type = RESULT_SUCCESS;
-                       tr->terminal_rsp_data.select_item.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+       case USER_CONFIRM_YES:
+               tr->terminal_rsp_data.select_item.item_identifier.item_identifier = item_id;
+               tr->terminal_rsp_data.select_item.other_info = FALSE;
+               tr->terminal_rsp_data.select_item.result_type = RESULT_SUCCESS;
+               tr->terminal_rsp_data.select_item.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
 
-                       if(q_data.cmd_data.selectItemInd.text_attribute.b_txt_attr || q_data.cmd_data.selectItemInd.text_attribute_list.list_cnt > 0)
-                               tr->terminal_rsp_data.select_item.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
+               if (q_data.cmd_data.selectItemInd.text_attribute.b_txt_attr || q_data.cmd_data.selectItemInd.text_attribute_list.list_cnt > 0)
+                       tr->terminal_rsp_data.select_item.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
 
-                       if (q_data.cmd_data.selectItemInd.icon_id.is_exist)
-                               tr->terminal_rsp_data.select_item.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+               if (q_data.cmd_data.selectItemInd.icon_id.is_exist)
+                       tr->terminal_rsp_data.select_item.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-                       break;
+               break;
 
-               case USER_CONFIRM_HELP_INFO:
-                       tr->terminal_rsp_data.select_item.item_identifier.item_identifier = item_id;
-                       tr->terminal_rsp_data.select_item.other_info = FALSE;
-                       tr->terminal_rsp_data.select_item.result_type = RESULT_HELP_INFO_REQUIRED_BY_USER;
-                       tr->terminal_rsp_data.select_item.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       //TODO ctx->help_requested = TRUE;
-                       break;
+       case USER_CONFIRM_HELP_INFO:
+               tr->terminal_rsp_data.select_item.item_identifier.item_identifier = item_id;
+               tr->terminal_rsp_data.select_item.other_info = FALSE;
+               tr->terminal_rsp_data.select_item.result_type = RESULT_HELP_INFO_REQUIRED_BY_USER;
+               tr->terminal_rsp_data.select_item.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               /* TODO ctx->help_requested = TRUE; */
+               break;
 
-               case USER_CONFIRM_END:
-                       tr->terminal_rsp_data.select_item.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
-                       break;
+       case USER_CONFIRM_END:
+               tr->terminal_rsp_data.select_item.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
+               break;
 
-               case USER_CONFIRM_NO_OR_CANCEL:
-                       tr->terminal_rsp_data.select_item.result_type = RESULT_BACKWARD_MOVE_BY_USER;
-                       break;
+       case USER_CONFIRM_NO_OR_CANCEL:
+               tr->terminal_rsp_data.select_item.result_type = RESULT_BACKWARD_MOVE_BY_USER;
+               break;
 
-               case USER_CONFIRM_TIMEOUT:
-                       tr->terminal_rsp_data.select_item.result_type = RESULT_NO_RESPONSE_FROM_USER;
-                       break;
+       case USER_CONFIRM_TIMEOUT:
+               tr->terminal_rsp_data.select_item.result_type = RESULT_NO_RESPONSE_FROM_USER;
+               break;
 
-               default:
-                       dbg("not handled value[%d] here", confirm_type);
-                       break;
+       default:
+               dbg("not handled value[%d] here", confirm_type);
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4662,55 +4623,57 @@ static gboolean _sat_manager_handle_display_text_confirm(struct custom_data *ctx
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.displayTextInd.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.displayTextInd.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.display_text.command_detail, &q_data.cmd_data.displayTextInd.command_detail, sizeof(struct tel_sat_cmd_detail_info));
        tr->terminal_rsp_data.display_text.device_id.src = DEVICE_ID_ME;
        tr->terminal_rsp_data.display_text.device_id.dest = DEVICE_ID_SIM;
 
-       switch (confirm_type){
-               case USER_CONFIRM_YES: {
-                       tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS;
-                       tr->terminal_rsp_data.display_text.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-
-                       if(q_data.cmd_data.displayTextInd.text_attribute.b_txt_attr)
-                               tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
+       switch (confirm_type) {
+       case USER_CONFIRM_YES: {
+               tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS;
+               tr->terminal_rsp_data.display_text.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
 
-                       if (q_data.cmd_data.displayTextInd.icon_id.is_exist)
-                               tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
-               } break;
+               if (q_data.cmd_data.displayTextInd.text_attribute.b_txt_attr)
+                       tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
 
-               case USER_CONFIRM_NO_OR_CANCEL:
-                       tr->terminal_rsp_data.display_text.result_type = RESULT_BACKWARD_MOVE_BY_USER;
-                       break;
+               if (q_data.cmd_data.displayTextInd.icon_id.is_exist)
+                       tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+       } break;
 
-               case USER_CONFIRM_TIMEOUT:
-                       tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS;
+       case USER_CONFIRM_NO_OR_CANCEL:
+               tr->terminal_rsp_data.display_text.result_type = RESULT_BACKWARD_MOVE_BY_USER;
+               break;
 
-                       if (q_data.cmd_data.displayTextInd.command_detail.cmd_qualifier.display_text.text_clear_type == TEXT_WAIT_FOR_USER_TO_CLEAR_MSG )
-                               tr->terminal_rsp_data.display_text.result_type = RESULT_NO_RESPONSE_FROM_USER;
+       case USER_CONFIRM_TIMEOUT:
+               tr->terminal_rsp_data.display_text.result_type = RESULT_SUCCESS;
 
-                       break;
+               if (q_data.cmd_data.displayTextInd.command_detail.cmd_qualifier.display_text.text_clear_type == TEXT_WAIT_FOR_USER_TO_CLEAR_MSG)
+                       tr->terminal_rsp_data.display_text.result_type = RESULT_NO_RESPONSE_FROM_USER;
+               break;
 
-               case USER_CONFIRM_END:
-                       tr->terminal_rsp_data.display_text.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
-                       break;
+       case USER_CONFIRM_END:
+               tr->terminal_rsp_data.display_text.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
+               break;
 
-               case USER_CONFIRM_HELP_INFO:
-               default:
-                       dbg("not handled value[%d] here", confirm_type);
-                       break;
+       case USER_CONFIRM_HELP_INFO:
+       default:
+               dbg("not handled value[%d] here", confirm_type);
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4738,12 +4701,12 @@ static gboolean _sat_manager_handle_get_inkey_confirm(struct custom_data *ctx, T
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
-       if(addtional_data){
+       if (addtional_data) {
                int local_index = 0;
                guchar data;
                GVariantIter *iter = NULL;
@@ -4753,7 +4716,7 @@ static gboolean _sat_manager_handle_get_inkey_confirm(struct custom_data *ctx, T
                dbg("additional data exist type_format(%s)", g_variant_get_type_string(inner_gv));
 
                g_variant_get(inner_gv, "ay", &iter);
-               while( g_variant_iter_loop (iter, "y", &data)){
+               while (g_variant_iter_loop(iter, "y", &data)) {
                        dbg("index(%d) data(%d)", local_index, data);
                        inkey_data[local_index] = data;
                        local_index++;
@@ -4764,114 +4727,107 @@ static gboolean _sat_manager_handle_get_inkey_confirm(struct custom_data *ctx, T
        }
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.getInkeyInd.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.getInkeyInd.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.get_inkey.command_detail, &q_data.cmd_data.getInkeyInd.command_detail, sizeof(struct tel_sat_cmd_detail_info));
        tr->terminal_rsp_data.get_inkey.device_id.src = DEVICE_ID_ME;
        tr->terminal_rsp_data.get_inkey.device_id.dest = DEVICE_ID_SIM;
 
-       switch (confirm_type){
-               case USER_CONFIRM_YES:
-                       tr->terminal_rsp_data.get_inkey.result_type = RESULT_SUCCESS;
+       switch (confirm_type) {
+       case USER_CONFIRM_YES:
+               tr->terminal_rsp_data.get_inkey.result_type = RESULT_SUCCESS;
 
-                       if(q_data.cmd_data.getInkeyInd.text_attribute.b_txt_attr)
-                               tr->terminal_rsp_data.get_inkey.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
+               if (q_data.cmd_data.getInkeyInd.text_attribute.b_txt_attr)
+                       tr->terminal_rsp_data.get_inkey.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
 
-                       if (q_data.cmd_data.getInkeyInd.icon_id.is_exist)
-                               tr->terminal_rsp_data.get_inkey.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+               if (q_data.cmd_data.getInkeyInd.icon_id.is_exist)
+                       tr->terminal_rsp_data.get_inkey.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-                       if (q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.inkey_type == INKEY_TYPE_YES_NO_REQUESTED) {
-                               tr->terminal_rsp_data.get_inkey.text.dcs.m_class = MSG_CLASS_RESERVED;
+               if (q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.inkey_type == INKEY_TYPE_YES_NO_REQUESTED) {
+                       tr->terminal_rsp_data.get_inkey.text.dcs.m_class = MSG_CLASS_RESERVED;
+                       tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
+                       tr->terminal_rsp_data.get_inkey.text.string_length = 1;
+                       tr->terminal_rsp_data.get_inkey.text.string[0] = 0x01;
+               } else if (inkey_data_len > 0) {
+                       tr->terminal_rsp_data.get_inkey.text.string_length = inkey_data_len;
+
+                       if (!q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.alphabet_set) {
+                               tr->terminal_rsp_data.get_inkey.text.is_digit_only = TRUE;
                                tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
-                               tr->terminal_rsp_data.get_inkey.text.string_length = 1;
-                               tr->terminal_rsp_data.get_inkey.text.string[0] = 0x01;
-                       }
-                       else if(inkey_data_len > 0)
-                       {
-                               tr->terminal_rsp_data.get_inkey.text.string_length = inkey_data_len;
+                               tr->terminal_rsp_data.get_inkey.text.dcs.m_class = MSG_CLASS_RESERVED;
 
-                               if (!q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.alphabet_set){
-                                       tr->terminal_rsp_data.get_inkey.text.is_digit_only = TRUE;
-                                       tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
-                                       tr->terminal_rsp_data.get_inkey.text.dcs.m_class = MSG_CLASS_RESERVED;
+                               memcpy((void*)tr->terminal_rsp_data.get_inkey.text.string, inkey_data, inkey_data_len);
+                       } else {
+                               tr->terminal_rsp_data.get_inkey.text.dcs.m_class = MSG_CLASS_RESERVED;
 
-                                       memcpy((void*)tr->terminal_rsp_data.get_inkey.text.string, inkey_data, inkey_data_len);
-                               }
-                               else
-                               {
-                                       tr->terminal_rsp_data.get_inkey.text.dcs.m_class = MSG_CLASS_RESERVED;
-
-                                       if(q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.alphabet_type == INPUT_ALPHABET_TYPE_SMS_DEFAULT )
-                                       {
-                                               int tmp_len;
-                                               char tmp_str[SAT_TEXT_STRING_LEN_MAX + 1], *packed_data;
-
-                                               dbg("sat gsm7 encoding");
-                                               tcore_util_convert_utf8_to_gsm((unsigned char*) tmp_str, &tmp_len, (unsigned char*)inkey_data, inkey_data_len);
-                                               packed_data = (char*) tcore_util_pack_gsm7bit((const unsigned char *)tmp_str, tmp_len);
-
-                                               if(packed_data){
-                                                       tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
-                                                       tr->terminal_rsp_data.get_inkey.text.string_length = strlen(packed_data);
-                                                       memcpy((void*) tr->terminal_rsp_data.get_inkey.text.string, packed_data, strlen(packed_data));
-
-                                                       g_free(packed_data);
-                                               }
-                                       }
-                                       else if(q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.alphabet_type == INPUT_ALPHABET_TYPE_UCS2 )
-                                       {
-                                               char *tmp = NULL;
-                                               dbg("UCS2 DATA");
+                               if (q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.alphabet_type == INPUT_ALPHABET_TYPE_SMS_DEFAULT) {
+                                       int tmp_len;
+                                       char tmp_str[SAT_TEXT_STRING_LEN_MAX + 1], *packed_data;
 
-                                               tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_UCS2;
-                                               tcore_util_convert_utf8_to_ucs2(&tmp,
-                                                               &tr->terminal_rsp_data.get_inkey.text.string_length, (unsigned char*)inkey_data, inkey_data_len);
+                                       dbg("sat gsm7 encoding");
+                                       tcore_util_convert_utf8_to_gsm((unsigned char*) tmp_str, &tmp_len, (unsigned char*)inkey_data, inkey_data_len);
+                                       packed_data = (char*) tcore_util_pack_gsm7bit((const unsigned char *)tmp_str, tmp_len);
 
-                                               memcpy(tr->terminal_rsp_data.get_inkey.text.string, tmp, tr->terminal_rsp_data.get_inkey.text.string_length);
-                                               g_free(tmp);
-                                       }
-                                       else
-                                       {
-                                               tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_RESERVED;
-                                               dbg("[SAT] invalid DCS[%d]",tr->terminal_rsp_data.get_inkey.text.dcs.a_format);
+                                       if (packed_data) {
+                                               tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
+                                               tr->terminal_rsp_data.get_inkey.text.string_length = strlen(packed_data);
+                                               memcpy((void*) tr->terminal_rsp_data.get_inkey.text.string, packed_data, strlen(packed_data));
+                                               g_free(packed_data);
                                        }
+                               } else if (q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.alphabet_type == INPUT_ALPHABET_TYPE_UCS2) {
+                                       char *tmp = NULL;
+                                       dbg("UCS2 DATA");
+
+                                       tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_UCS2;
+                                       tcore_util_convert_utf8_to_ucs2(&tmp,
+                                               &tr->terminal_rsp_data.get_inkey.text.string_length, (unsigned char*)inkey_data, inkey_data_len);
+
+                                       memcpy(tr->terminal_rsp_data.get_inkey.text.string, tmp, tr->terminal_rsp_data.get_inkey.text.string_length);
+                                       g_free(tmp);
+                               } else {
+                                       tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_RESERVED;
+                                       dbg("[SAT] invalid DCS[%d]", tr->terminal_rsp_data.get_inkey.text.dcs.a_format);
                                }
                        }
-                       break;
+               }
+               break;
 
-               case USER_CONFIRM_HELP_INFO:
-                       tr->terminal_rsp_data.get_inkey.result_type = RESULT_HELP_INFO_REQUIRED_BY_USER;
-                       //TODO ctx->help_requested = TRUE;
-                       break;
+       case USER_CONFIRM_HELP_INFO:
+               tr->terminal_rsp_data.get_inkey.result_type = RESULT_HELP_INFO_REQUIRED_BY_USER;
+               /* TODO ctx->help_requested = TRUE; */
+               break;
 
-               case USER_CONFIRM_NO_OR_CANCEL:
-                       tr->terminal_rsp_data.get_inkey.result_type = RESULT_BACKWARD_MOVE_BY_USER;
+       case USER_CONFIRM_NO_OR_CANCEL:
+               tr->terminal_rsp_data.get_inkey.result_type = RESULT_BACKWARD_MOVE_BY_USER;
 
-                       if (q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.inkey_type == INKEY_TYPE_YES_NO_REQUESTED) {
-                               tr->terminal_rsp_data.get_inkey.result_type = RESULT_SUCCESS;
-                               tr->terminal_rsp_data.get_inkey.text.dcs.m_class = MSG_CLASS_RESERVED;
-                               tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
-                               tr->terminal_rsp_data.get_inkey.text.string_length = 1;
-                               tr->terminal_rsp_data.get_inkey.text.string[0] = 0x00;
-                       }
-                       break;
+               if (q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_inkey.inkey_type == INKEY_TYPE_YES_NO_REQUESTED) {
+                       tr->terminal_rsp_data.get_inkey.result_type = RESULT_SUCCESS;
+                       tr->terminal_rsp_data.get_inkey.text.dcs.m_class = MSG_CLASS_RESERVED;
+                       tr->terminal_rsp_data.get_inkey.text.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
+                       tr->terminal_rsp_data.get_inkey.text.string_length = 1;
+                       tr->terminal_rsp_data.get_inkey.text.string[0] = 0x00;
+               }
+               break;
 
-               case USER_CONFIRM_TIMEOUT:
-                       tr->terminal_rsp_data.get_inkey.result_type = RESULT_NO_RESPONSE_FROM_USER;
-                       break;
+       case USER_CONFIRM_TIMEOUT:
+               tr->terminal_rsp_data.get_inkey.result_type = RESULT_NO_RESPONSE_FROM_USER;
+               break;
 
-               case USER_CONFIRM_END:
-                       tr->terminal_rsp_data.get_inkey.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
-                       break;
+       case USER_CONFIRM_END:
+               tr->terminal_rsp_data.get_inkey.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
+               break;
 
-               default:
-                       dbg("not handled value[%d] here", confirm_type);
-                       break;
+       default:
+               dbg("not handled value[%d] here", confirm_type);
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -4899,12 +4855,12 @@ static gboolean _sat_manager_handle_get_input_confirm(struct custom_data *ctx, T
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
-       if(addtional_data){
+       if (addtional_data) {
                int local_index = 0;
                guchar data;
                GVariantIter *iter = NULL;
@@ -4914,7 +4870,7 @@ static gboolean _sat_manager_handle_get_input_confirm(struct custom_data *ctx, T
                dbg("additional data exist type_format(%s)", g_variant_get_type_string(inner_gv));
 
                g_variant_get(inner_gv, "ay", &iter);
-               while( g_variant_iter_loop (iter, "y", &data)){
+               while (g_variant_iter_loop(iter, "y", &data)) {
                        dbg("index(%d) data(%d)", local_index, data);
                        input_data[local_index] = data;
                        local_index++;
@@ -4925,99 +4881,93 @@ static gboolean _sat_manager_handle_get_input_confirm(struct custom_data *ctx, T
        }
 
        tr = (struct treq_sat_terminal_rsp_data *)calloc(1, sizeof(struct treq_sat_terminal_rsp_data));
+       if (!tr)
+               return result;
+
        tr->cmd_number = q_data.cmd_data.getInputInd.command_detail.cmd_num;
        tr->cmd_type = q_data.cmd_data.getInputInd.command_detail.cmd_type;
        memcpy((void*)&tr->terminal_rsp_data.get_input.command_detail, &q_data.cmd_data.getInputInd.command_detail, sizeof(struct tel_sat_cmd_detail_info));
        tr->terminal_rsp_data.get_input.device_id.src = DEVICE_ID_ME;
        tr->terminal_rsp_data.get_input.device_id.dest = DEVICE_ID_SIM;
 
-       switch (confirm_type){
-               case USER_CONFIRM_YES:
-                       tr->terminal_rsp_data.get_input.result_type = RESULT_SUCCESS;
-                       tr->terminal_rsp_data.get_input.text.dcs.m_class = MSG_CLASS_RESERVED;
+       switch (confirm_type) {
+       case USER_CONFIRM_YES:
+               tr->terminal_rsp_data.get_input.result_type = RESULT_SUCCESS;
+               tr->terminal_rsp_data.get_input.text.dcs.m_class = MSG_CLASS_RESERVED;
 
-                       if(!q_data.cmd_data.getInputInd.command_detail.cmd_qualifier.get_input.alphabet_set){
-                               tr->terminal_rsp_data.get_input.text.is_digit_only = TRUE;
-                       }
+               if (!q_data.cmd_data.getInputInd.command_detail.cmd_qualifier.get_input.alphabet_set)
+                       tr->terminal_rsp_data.get_input.text.is_digit_only = TRUE;
 
-                       if(q_data.cmd_data.getInputInd.text_attribute.b_txt_attr)
-                               tr->terminal_rsp_data.get_input.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
+               if (q_data.cmd_data.getInputInd.text_attribute.b_txt_attr)
+                       tr->terminal_rsp_data.get_input.result_type = RESULT_SUCCESS_WITH_PARTIAL_COMPREHENSION;
 
-                       if (q_data.cmd_data.getInputInd.icon_id.is_exist)
-                               tr->terminal_rsp_data.get_input.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
+               if (q_data.cmd_data.getInputInd.icon_id.is_exist)
+                       tr->terminal_rsp_data.get_input.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-                       if(!q_data.cmd_data.getInputInd.command_detail.cmd_qualifier.get_input.user_input_unpacked_format){
-                               dbg("[SAT] packing to SMS7 default");
+               if (!q_data.cmd_data.getInputInd.command_detail.cmd_qualifier.get_input.user_input_unpacked_format) {
+                       dbg("[SAT] packing to SMS7 default");
 
-                               tr->terminal_rsp_data.get_input.text.string_length = 0;
-                               tr->terminal_rsp_data.get_input.text.dcs.a_format = ALPHABET_FORMAT_SMS_DEFAULT;
+                       tr->terminal_rsp_data.get_input.text.string_length = 0;
+                       tr->terminal_rsp_data.get_input.text.dcs.a_format = ALPHABET_FORMAT_SMS_DEFAULT;
 
-                               if (input_data_len > 0){
-                                       int tmp_len;
-                                       char tmp_str[SAT_TEXT_STRING_LEN_MAX + 1], *packed_data;
+                       if (input_data_len > 0) {
+                               int tmp_len;
+                               char tmp_str[SAT_TEXT_STRING_LEN_MAX + 1], *packed_data;
 
-                                       dbg("sat gsm7 encoding");
-                                       tcore_util_convert_utf8_to_gsm((unsigned char*)tmp_str, &tmp_len, (unsigned char*)input_data, input_data_len);
-                                       packed_data = (char*) tcore_util_pack_gsm7bit((const unsigned char *)tmp_str, tmp_len);
+                               dbg("sat gsm7 encoding");
+                               tcore_util_convert_utf8_to_gsm((unsigned char*)tmp_str, &tmp_len, (unsigned char*)input_data, input_data_len);
+                               packed_data = (char*) tcore_util_pack_gsm7bit((const unsigned char *)tmp_str, tmp_len);
 
-                                       if(packed_data){
-                                               memcpy((void*)tr->terminal_rsp_data.get_input.text.string, packed_data, strlen(packed_data));
-                                               tr->terminal_rsp_data.get_input.text.string_length = strlen(packed_data);
+                               if (packed_data) {
+                                       memcpy((void*)tr->terminal_rsp_data.get_input.text.string, packed_data, strlen(packed_data));
+                                       tr->terminal_rsp_data.get_input.text.string_length = strlen(packed_data);
 
-                                               g_free(packed_data);
-                                       }
+                                       g_free(packed_data);
                                }
-
                        }
-                       else
-                       {
-                               dbg("[SAT] packing not required");
-
-                               if(q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_input.alphabet_type == INPUT_ALPHABET_TYPE_SMS_DEFAULT){
-
-                                       tr->terminal_rsp_data.get_input.text.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
-                                       tcore_util_convert_utf8_to_gsm((unsigned char*)tr->terminal_rsp_data.get_input.text.string,
-                                                       &tr->terminal_rsp_data.get_input.text.string_length, (unsigned char*)input_data, input_data_len);
-
-                               }
-                               else if(q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_input.alphabet_type == INPUT_ALPHABET_TYPE_UCS2 ){
-                                       char *tmp = NULL;
-
-                                       tr->terminal_rsp_data.get_input.text.dcs.a_format = ALPHABET_FORMAT_UCS2;
-                                       tcore_util_convert_utf8_to_ucs2(&tmp, &tr->terminal_rsp_data.get_input.text.string_length, (unsigned char*)input_data, input_data_len);
+               } else {
+                       dbg("[SAT] packing not required");
+
+                       if (q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_input.alphabet_type == INPUT_ALPHABET_TYPE_SMS_DEFAULT) {
+                               tr->terminal_rsp_data.get_input.text.dcs.a_format = ALPHABET_FORMAT_8BIT_DATA;
+                               tcore_util_convert_utf8_to_gsm((unsigned char*)tr->terminal_rsp_data.get_input.text.string,
+                                       &tr->terminal_rsp_data.get_input.text.string_length, (unsigned char*)input_data, input_data_len);
+                       } else if (q_data.cmd_data.getInkeyInd.command_detail.cmd_qualifier.get_input.alphabet_type == INPUT_ALPHABET_TYPE_UCS2) {
+                               char *tmp = NULL;
 
-                                       memcpy(tr->terminal_rsp_data.get_input.text.string, tmp, tr->terminal_rsp_data.get_input.text.string_length);
-                                       g_free(tmp);
-                               }
-                               else{
-                                       tr->terminal_rsp_data.get_input.text.dcs.a_format = ALPHABET_FORMAT_RESERVED;
-                                       dbg("[SAT] invalid DCS[%d]",tr->terminal_rsp_data.get_input.text.dcs.a_format);
-                               }
-                       } break;
+                               tr->terminal_rsp_data.get_input.text.dcs.a_format = ALPHABET_FORMAT_UCS2;
+                               tcore_util_convert_utf8_to_ucs2(&tmp, &tr->terminal_rsp_data.get_input.text.string_length, (unsigned char*)input_data, input_data_len);
+                               memcpy(tr->terminal_rsp_data.get_input.text.string, tmp, tr->terminal_rsp_data.get_input.text.string_length);
+                               g_free(tmp);
+                       } else {
+                               tr->terminal_rsp_data.get_input.text.dcs.a_format = ALPHABET_FORMAT_RESERVED;
+                               dbg("[SAT] invalid DCS[%d]", tr->terminal_rsp_data.get_input.text.dcs.a_format);
+                       }
+               } break;
 
-               case USER_CONFIRM_HELP_INFO:
-                       tr->terminal_rsp_data.get_input.result_type = RESULT_HELP_INFO_REQUIRED_BY_USER;
-                       //TODO ctx->help_requested = TRUE;
-                       break;
+       case USER_CONFIRM_HELP_INFO:
+               tr->terminal_rsp_data.get_input.result_type = RESULT_HELP_INFO_REQUIRED_BY_USER;
+               /* TODO ctx->help_requested = TRUE; */
+               break;
 
-               case USER_CONFIRM_NO_OR_CANCEL:
-                       tr->terminal_rsp_data.get_input.result_type = RESULT_BACKWARD_MOVE_BY_USER;
-                       break;
+       case USER_CONFIRM_NO_OR_CANCEL:
+               tr->terminal_rsp_data.get_input.result_type = RESULT_BACKWARD_MOVE_BY_USER;
+               break;
 
-               case USER_CONFIRM_TIMEOUT:
-                       tr->terminal_rsp_data.get_input.result_type = RESULT_NO_RESPONSE_FROM_USER;
-                       break;
+       case USER_CONFIRM_TIMEOUT:
+               tr->terminal_rsp_data.get_input.result_type = RESULT_NO_RESPONSE_FROM_USER;
+               break;
 
-               case USER_CONFIRM_END:
-                       tr->terminal_rsp_data.get_input.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
-                       break;
-               default:
-                       break;
+       case USER_CONFIRM_END:
+               tr->terminal_rsp_data.get_input.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
+               break;
+       default:
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -5045,7 +4995,7 @@ static gboolean _sat_manager_handle_setup_call_confirm(struct custom_data *ctx,
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -5060,7 +5010,7 @@ static gboolean _sat_manager_handle_setup_call_confirm(struct custom_data *ctx,
                dbg("additional data exist type_format(%s)", g_variant_get_type_string(inner_gv));
 
                g_variant_get(inner_gv, "ay", &iter);
-               while( g_variant_iter_loop (iter, "y", &data)){
+               while (g_variant_iter_loop(iter, "y", &data)) {
                        dbg("index(%d) data(%d)", local_index, data);
                        input_data[local_index] = data;
                        local_index++;
@@ -5081,92 +5031,96 @@ static gboolean _sat_manager_handle_setup_call_confirm(struct custom_data *ctx,
        tr->terminal_rsp_data.setup_call.device_id.src = DEVICE_ID_ME;
        tr->terminal_rsp_data.setup_call.device_id.dest = q_data.cmd_data.setup_call.device_id.src;
 
-       switch(confirm_type){
-               case USER_CONFIRM_YES:{
-                       char *path;
-                       TelephonySAT *sat;
-                       TelephonyObjectSkeleton *object;
-
-                       const gchar *cp_name;
-                       GVariant *setup_call = NULL;
-
-                       gint command_id, call_type, confirmed_text_len, text_len, duration;
-                       gchar *confirmed_text = NULL, *text = NULL, *call_number = NULL;
+       switch (confirm_type) {
+       case USER_CONFIRM_YES:{
+               char *path;
+               TelephonySAT *sat;
+               TelephonyObjectSkeleton *object;
+               const gchar *cp_name;
+               GVariant *setup_call = NULL;
+               gint command_id, call_type, confirmed_text_len, text_len, duration;
+               gchar *confirmed_text = NULL, *text = NULL, *call_number = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       enum dbus_tapi_sim_slot_id slot_id;
-                       gboolean call_app_rv;
+               enum dbus_tapi_sim_slot_id slot_id;
+               gboolean call_app_rv;
 
-                       cp_name = tcore_server_get_cp_name_by_plugin(plg);
-                       if (cp_name == NULL) {
-                               err("CP name is NULL");
-                               goto Exit;
-                       }
+               cp_name = tcore_server_get_cp_name_by_plugin(plg);
+               if (cp_name == NULL) {
+                       err("CP name is NULL");
+                       goto Exit;
+               }
 
-                       dbg("CP Name: [%s]", cp_name);
-                       path = g_strdup_printf("%s/%s", MY_DBUS_PATH, cp_name);
+               dbg("CP Name: [%s]", cp_name);
+               path = g_strdup_printf("%s/%s", MY_DBUS_PATH, cp_name);
 
-                       /* Look-up Hash table for Object */
-                       object = g_hash_table_lookup(ctx->objects, path);
-                       dbg("Path: [%s] Interface object: [%p]", path, object);
-                       g_free(path);
-                       if (object == NULL) {
-                               err("Object is NOT defined!!!");
-                               goto Exit;
-                       }
+               /* Look-up Hash table for Object */
+               object = g_hash_table_lookup(ctx->objects, path);
+               dbg("Path: [%s] Interface object: [%p]", path, object);
+               g_free(path);
+               if (object == NULL) {
+                       err("Object is NOT defined!!!");
+                       goto Exit;
+               }
 
-                       sat = telephony_object_peek_sat(TELEPHONY_OBJECT(object));
+               sat = telephony_object_peek_sat(TELEPHONY_OBJECT(object));
 
-                       setup_call = sat_manager_setup_call_noti(ctx, cp_name, &q_data.cmd_data.setup_call);
+               setup_call = sat_manager_setup_call_noti(ctx, cp_name, &q_data.cmd_data.setup_call);
 
-                       dbg("setup call type_format(%s)", g_variant_get_type_string(setup_call));
+               dbg("setup call type_format(%s)", g_variant_get_type_string(setup_call));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(setup_call, "(isisi@visi)", &command_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &icon_id, &call_type, &call_number, &duration);
+               g_variant_get(setup_call, "(isisi@visi)", &command_id,
+                       &confirmed_text, &confirmed_text_len, &text, &text_len,
+                       &icon_id, &call_type, &call_number, &duration);
 
-                       telephony_sat_emit_setup_call(sat, command_id, confirmed_text, confirmed_text_len, text, text_len, icon_id, call_type,
-                                       call_number, duration);
+               telephony_sat_emit_setup_call(sat, command_id, confirmed_text,
+                       confirmed_text_len, text, text_len, icon_id, call_type,
+                       call_number, duration);
 #else
-                       g_variant_get(setup_call, "(isisiisi)", &command_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &call_type, &call_number, &duration);
+               g_variant_get(setup_call, "(isisiisi)", &command_id,
+                       &confirmed_text, &confirmed_text_len, &text, &text_len,
+                       &call_type, &call_number, &duration);
 
-                       telephony_sat_emit_setup_call(sat, command_id, confirmed_text, confirmed_text_len, text, text_len, call_type,
-                                       call_number, duration);
+               telephony_sat_emit_setup_call(sat, command_id, confirmed_text,
+                       confirmed_text_len, text, text_len, call_type,
+                       call_number, duration);
 #endif
-                       g_free(confirmed_text);
-                       g_free(text);
-                       g_free(call_number);
+               g_free(confirmed_text);
+               g_free(text);
+               g_free(call_number);
 
-                       slot_id = get_sim_slot_id_by_cp_name((char *)tcore_server_get_cp_name_by_plugin(plg));
-                       dbg("slot_id: [%d]", slot_id);
+               slot_id = get_sim_slot_id_by_cp_name((char *)tcore_server_get_cp_name_by_plugin(plg));
+               dbg("slot_id: [%d]", slot_id);
 
-                       call_app_rv = sat_ui_support_launch_call_application(q_data.cmd_data.setup_call.command_detail.cmd_type, setup_call, slot_id);
-                       free (tr);
+               call_app_rv = sat_ui_support_launch_call_application(q_data.cmd_data.setup_call.command_detail.cmd_type, setup_call, slot_id);
+               free(tr);
 
-                       return call_app_rv;
-               }
+               return call_app_rv;
+       }
 
-               case USER_CONFIRM_NO_OR_CANCEL:{
-                       tr->terminal_rsp_data.setup_call.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
-               }break;
+       case USER_CONFIRM_NO_OR_CANCEL: {
+               tr->terminal_rsp_data.setup_call.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
+       break;
 
-               case USER_CONFIRM_END:{
-                       tr->terminal_rsp_data.setup_call.result_type = RESULT_USER_DID_NOT_ACCEPT_CALL_SETUP_REQ;
-               }break;
+       case USER_CONFIRM_END: {
+               tr->terminal_rsp_data.setup_call.result_type = RESULT_USER_DID_NOT_ACCEPT_CALL_SETUP_REQ;
+       break;
 
-               case USER_CONFIRM_HELP_INFO:
-               default:
-                       tr->terminal_rsp_data.setup_call.result_type = RESULT_NO_RESPONSE_FROM_USER;
+       case USER_CONFIRM_HELP_INFO:
+       default:
+               tr->terminal_rsp_data.setup_call.result_type = RESULT_NO_RESPONSE_FROM_USER;
                break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
 Exit:
-       free (tr);
+       free(tr);
        return result;
 }
 
@@ -5185,7 +5139,7 @@ static gboolean _sat_manager_handle_send_dtmf_confirm(struct custom_data *ctx, T
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -5202,20 +5156,20 @@ static gboolean _sat_manager_handle_send_dtmf_confirm(struct custom_data *ctx, T
 
        dbg("confirm_type[%d]", confirm_type);
 
-       switch(confirm_type){
-               case USER_CONFIRM_NO_OR_CANCEL:
-               case USER_CONFIRM_END:
-                       tr->terminal_rsp_data.send_dtmf.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
-                       tr->terminal_rsp_data.send_dtmf.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
-                       break;
-               default:
-                       tr->terminal_rsp_data.send_dtmf.result_type = RESULT_NO_RESPONSE_FROM_USER;
-                       break;
+       switch (confirm_type) {
+       case USER_CONFIRM_NO_OR_CANCEL:
+       case USER_CONFIRM_END:
+               tr->terminal_rsp_data.send_dtmf.result_type = RESULT_PROACTIVE_SESSION_TERMINATED_BY_USER;
+               tr->terminal_rsp_data.send_dtmf.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
+               break;
+       default:
+               tr->terminal_rsp_data.send_dtmf.result_type = RESULT_NO_RESPONSE_FROM_USER;
+               break;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -5239,7 +5193,7 @@ static gboolean _sat_manager_handle_launch_browser_confirm(struct custom_data *c
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -5256,7 +5210,7 @@ static gboolean _sat_manager_handle_launch_browser_confirm(struct custom_data *c
 
        dbg("confirm_type[%d]", confirm_type);
 
-       switch(confirm_type){
+       switch (confirm_type) {
                case USER_CONFIRM_YES:{
                        char *path;
                        TelephonySAT *sat;
@@ -5267,7 +5221,7 @@ static gboolean _sat_manager_handle_launch_browser_confirm(struct custom_data *c
 
                        gint command_id = 0;
                        gint browser_launch_type = 0, browser_id = 0;
-                       gint url_len = 0, text_len = 0, gateway_proxy_len =0;
+                       gint url_len = 0, text_len = 0, gateway_proxy_len = 0;
                        gchar *url = NULL;
                        gchar *text = NULL;
                        gchar *gateway_proxy = NULL;
@@ -5318,7 +5272,7 @@ static gboolean _sat_manager_handle_launch_browser_confirm(struct custom_data *c
 
                        g_free(tr);
                        return TRUE;
-               }break;
+               } break;
 
                case USER_CONFIRM_NO_OR_CANCEL:
                        tr->terminal_rsp_data.launch_browser.result_type = RESULT_BACKWARD_MOVE_BY_USER;
@@ -5334,7 +5288,7 @@ static gboolean _sat_manager_handle_launch_browser_confirm(struct custom_data *c
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -5358,7 +5312,7 @@ static gboolean _sat_manager_handle_open_channel_confirm(struct custom_data *ctx
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -5375,82 +5329,85 @@ static gboolean _sat_manager_handle_open_channel_confirm(struct custom_data *ctx
 
        dbg("confirm_type[%d]", confirm_type);
 
-       switch(confirm_type){
-               case USER_CONFIRM_YES:{
-                       char *path;
-                       TelephonyObjectSkeleton *object;
-
-                       const gchar *cp_name;
-
-                       GVariant *open_channel = NULL;
-
-                       gint command_id, bearer_type, protocol_type, dest_addr_type;
-                       gboolean immediate_link, auto_reconnection, bg_mode;
-                       gint text_len, buffer_size, port_number;
-                       gchar *text = NULL, *dest_address = NULL;
+       switch (confirm_type) {
+       case USER_CONFIRM_YES:{
+               char *path;
+               TelephonyObjectSkeleton *object;
+               const gchar *cp_name;
+               GVariant *open_channel = NULL;
+               gint command_id, bearer_type, protocol_type, dest_addr_type;
+               gboolean immediate_link, auto_reconnection, bg_mode;
+               gint text_len, buffer_size, port_number;
+               gchar *text = NULL, *dest_address = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       GVariant *bearer_param;
-                       GVariant *bearer_detail;
+               GVariant *bearer_param;
+               GVariant *bearer_detail;
 
-                       //emit send_dtmf signal
-                       cp_name = tcore_server_get_cp_name_by_plugin(plg);
-                       if (cp_name == NULL) {
-                               err("CP name is NULL");
-                               goto Exit;
-                       }
+               /* emit send_dtmf signal */
+               cp_name = tcore_server_get_cp_name_by_plugin(plg);
+               if (cp_name == NULL) {
+                       err("CP name is NULL");
+                       goto Exit;
+               }
 
-                       dbg("CP Name: [%s]", cp_name);
-                       path = g_strdup_printf("%s/%s", MY_DBUS_PATH, cp_name);
+               dbg("CP Name: [%s]", cp_name);
+               path = g_strdup_printf("%s/%s", MY_DBUS_PATH, cp_name);
 
-                       /* Look-up Hash table for Object */
-                       object = g_hash_table_lookup(ctx->objects, path);
-                       dbg("Path: [%s] Interface object: [%p]", path, object);
-                       g_free(path);
-                       if (object == NULL) {
-                               err("Object is NOT defined!!!");
-                               goto Exit;
-                       }
+               /* Look-up Hash table for Object */
+               object = g_hash_table_lookup(ctx->objects, path);
+               dbg("Path: [%s] Interface object: [%p]", path, object);
+               g_free(path);
+               if (object == NULL) {
+                       err("Object is NOT defined!!!");
+                       goto Exit;
+               }
 
-                       open_channel = sat_manager_open_channel_noti(ctx, cp_name, &q_data.cmd_data.open_channel);
+               open_channel = sat_manager_open_channel_noti(ctx, cp_name, &q_data.cmd_data.open_channel);
 
-                       dbg("open channel type_format(%s)", g_variant_get_type_string(open_channel));
+               dbg("open channel type_format(%s)", g_variant_get_type_string(open_channel));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(open_channel,"(isi@vbbbi@viiiis@v)", &command_id, &text, &text_len, &icon_id, &immediate_link, &auto_reconnection, &bg_mode,
-                                       &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
+               g_variant_get(open_channel, "(isi@vbbbi@viiiis@v)", &command_id,
+                       &text, &text_len, &icon_id, &immediate_link, &auto_reconnection, &bg_mode,
+                       &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number,
+                       &dest_addr_type, &dest_address, &bearer_detail);
 #else
-                       g_variant_get(open_channel,"(isibbbi@viiiis@v)", &command_id, &text, &text_len, &immediate_link, &auto_reconnection, &bg_mode,
-                                       &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
+               g_variant_get(open_channel, "(isibbbi@viiiis@v)", &command_id,
+                       &text, &text_len, &immediate_link, &auto_reconnection, &bg_mode,
+                       &bearer_type, &bearer_param, &buffer_size, &protocol_type,
+                       &port_number, &dest_addr_type, &dest_address, &bearer_detail);
 #endif
-                       /*telephony_sat_emit_open_channel(sat, command_id, text, text_len, immediate_link, auto_reconnection, bg_mode,
-                                       bearer_type, bearer_param, buffer_size, protocol_type, port_number, dest_addr_type, dest_address, bearer_detail);*/
-
-                       g_free(text);
-                       g_free(dest_address);
-                       //BIP Manager
-                       {
-                               GDBusConnection *conn = NULL;
-                               const gchar *g_path = NULL;
-
-                               conn = g_dbus_object_manager_server_get_connection(ctx->manager);
-                               g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
-
-                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_OPEN_CHANNEL, open_channel);
-                       }
+               /* telephony_sat_emit_open_channel(sat, command_id, text, text_len,
+                       immediate_link, auto_reconnection, bg_mode, bearer_type,
+                       bearer_param, buffer_size, protocol_type, port_number,
+                       dest_addr_type, dest_address, bearer_detail); */
+
+               g_free(text);
+               g_free(dest_address);
+               /* BIP Manager */
+               {
+                       GDBusConnection *conn = NULL;
+                       const gchar *g_path = NULL;
+
+                       conn = g_dbus_object_manager_server_get_connection(ctx->manager);
+                       g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
+
+                       sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_OPEN_CHANNEL, open_channel);
+               }
 
-                       g_free(tr);
+               g_free(tr);
 
-                       return TRUE;
-               }break;
+               return TRUE;
+       break;
 
-               case USER_CONFIRM_NO_OR_CANCEL:
-               case USER_CONFIRM_END:
-                       tr->terminal_rsp_data.open_channel.result_type = RESULT_USER_DID_NOT_ACCEPT_CALL_SETUP_REQ;
-                       break;
-               default:
-                       tr->terminal_rsp_data.open_channel.result_type = RESULT_NO_RESPONSE_FROM_USER;
-                       break;
+       case USER_CONFIRM_NO_OR_CANCEL:
+       case USER_CONFIRM_END:
+               tr->terminal_rsp_data.open_channel.result_type = RESULT_USER_DID_NOT_ACCEPT_CALL_SETUP_REQ;
+               break;
+       default:
+               tr->terminal_rsp_data.open_channel.result_type = RESULT_NO_RESPONSE_FROM_USER;
+               break;
        }
 
        memcpy((void*)&tr->terminal_rsp_data.open_channel.bearer_desc, &q_data.cmd_data.open_channel.bearer_desc, sizeof(struct tel_sat_bearer_description));
@@ -5458,7 +5415,7 @@ static gboolean _sat_manager_handle_open_channel_confirm(struct custom_data *ctx
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -5482,7 +5439,7 @@ static gboolean _sat_manager_handle_open_channel_confirm(struct custom_data *ctx
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -5493,19 +5450,19 @@ static gboolean _sat_manager_handle_open_channel_confirm(struct custom_data *ctx
 
        dbg("confirm_type[%d]", confirm_type);
 
-       switch(confirm_type){
-               case USER_CONFIRM_YES:
-               case USER_CONFIRM_NO_OR_CANCEL:
-               case USER_CONFIRM_END:
-                       conf_data->user_conf = confirm_type;
-                       break;
-               default:
-                       dbg("Not handled confirm type!");
-                       break;
+       switch (confirm_type) {
+       case USER_CONFIRM_YES:
+       case USER_CONFIRM_NO_OR_CANCEL:
+       case USER_CONFIRM_END:
+               conf_data->user_conf = confirm_type;
+               break;
+       default:
+               dbg("Not handled confirm type!");
+               break;
        }
        result = TRUE;
        rv = sat_manager_send_user_confirmation(ctx->comm, plg, conf_data);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send user confirmation message");
                result = FALSE;
        }
@@ -5528,7 +5485,7 @@ gboolean sat_manager_handle_user_confirm(struct custom_data *ctx, TcorePlugin *p
        dbg("[SAT] user confirm data command id(%d), confirm_type(%d)", command_id, confirm_type);
 
        rv = sat_manager_queue_peek_data_by_id(ctx, &q_data, command_id);
-       if(!rv){
+       if (!rv) {
                dbg("[SAT] no commands in queue");
                return result;
        }
@@ -5536,40 +5493,41 @@ gboolean sat_manager_handle_user_confirm(struct custom_data *ctx, TcorePlugin *p
        command_type = (gint)q_data.cmd_type;
        dbg("[SAT] command type(%d)", command_type);
 
-       switch(command_type){
-               case SAT_PROATV_CMD_SELECT_ITEM:
-                       result = _sat_manager_handle_menu_select_confirm(ctx, plg, command_id, confirm_type, additional_data);
-                       break;
-               case SAT_PROATV_CMD_DISPLAY_TEXT:
-                       result = _sat_manager_handle_display_text_confirm(ctx, plg, command_id, confirm_type, additional_data);
-                       break;
-               case SAT_PROATV_CMD_GET_INKEY:
-                       result = _sat_manager_handle_get_inkey_confirm(ctx, plg, command_id, confirm_type, additional_data);
-                       break;
-               case SAT_PROATV_CMD_GET_INPUT:
-                       result = _sat_manager_handle_get_input_confirm(ctx, plg, command_id, confirm_type, additional_data);
-                       break;
-               case SAT_PROATV_CMD_SETUP_CALL:
-                       result = _sat_manager_handle_setup_call_confirm(ctx, plg, command_id, confirm_type, additional_data);
-                       break;
-               case SAT_PROATV_CMD_SEND_DTMF:
-                       result = _sat_manager_handle_send_dtmf_confirm(ctx, plg, command_id, confirm_type, additional_data);
-                       break;
-               case SAT_PROATV_CMD_LAUNCH_BROWSER:
-                       result = _sat_manager_handle_launch_browser_confirm(ctx, plg, command_id, confirm_type, additional_data);
-                       break;
-               case SAT_PROATV_CMD_OPEN_CHANNEL:
-                       result = _sat_manager_handle_open_channel_confirm(ctx, plg, command_id, confirm_type, additional_data);
-                       break;
-               default:
-                       dbg("[SAT] cannot handle user confirm command(0x%x)", command_type);
-                       break;
+       switch (command_type) {
+       case SAT_PROATV_CMD_SELECT_ITEM:
+               result = _sat_manager_handle_menu_select_confirm(ctx, plg, command_id, confirm_type, additional_data);
+               break;
+       case SAT_PROATV_CMD_DISPLAY_TEXT:
+               result = _sat_manager_handle_display_text_confirm(ctx, plg, command_id, confirm_type, additional_data);
+               break;
+       case SAT_PROATV_CMD_GET_INKEY:
+               result = _sat_manager_handle_get_inkey_confirm(ctx, plg, command_id, confirm_type, additional_data);
+               break;
+       case SAT_PROATV_CMD_GET_INPUT:
+               result = _sat_manager_handle_get_input_confirm(ctx, plg, command_id, confirm_type, additional_data);
+               break;
+       case SAT_PROATV_CMD_SETUP_CALL:
+               result = _sat_manager_handle_setup_call_confirm(ctx, plg, command_id, confirm_type, additional_data);
+               break;
+       case SAT_PROATV_CMD_SEND_DTMF:
+               result = _sat_manager_handle_send_dtmf_confirm(ctx, plg, command_id, confirm_type, additional_data);
+               break;
+       case SAT_PROATV_CMD_LAUNCH_BROWSER:
+               result = _sat_manager_handle_launch_browser_confirm(ctx, plg, command_id, confirm_type, additional_data);
+               break;
+       case SAT_PROATV_CMD_OPEN_CHANNEL:
+               result = _sat_manager_handle_open_channel_confirm(ctx, plg, command_id, confirm_type, additional_data);
+               break;
+       default:
+               dbg("[SAT] cannot handle user confirm command(0x%x)", command_type);
+               break;
        }
 
        return result;
 }
 
-static gboolean _sat_manager_handle_play_tone_ui_display_status(struct custom_data *ctx, TcorePlugin *plg,struct sat_manager_queue_data *q_data, gboolean display_status)
+static gboolean _sat_manager_handle_play_tone_ui_display_status(struct custom_data *ctx,
+       TcorePlugin *plg, struct sat_manager_queue_data *q_data, gboolean display_status)
 {
        char *path;
        TelephonySAT *sat;
@@ -5585,7 +5543,7 @@ static gboolean _sat_manager_handle_play_tone_ui_display_status(struct custom_da
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        GVariant *icon_id;
 #endif
-       if(!display_status){
+       if (!display_status) {
                struct treq_sat_terminal_rsp_data *tr = NULL;
                dbg("[SAT] fail to show ui display for play tone");
 
@@ -5602,12 +5560,12 @@ static gboolean _sat_manager_handle_play_tone_ui_display_status(struct custom_da
                tr->terminal_rsp_data.play_tone.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
 
                sat_manager_send_terminal_response(ctx->comm, plg, tr);
-               free (tr);
+               free(tr);
 
                return TRUE;
        }
 
-       //emit play tone signal
+       /* emit play tone signal */
        cp_name = tcore_server_get_cp_name_by_plugin(plg);
        if (cp_name == NULL) {
                err("CP name is NULL");
@@ -5644,14 +5602,15 @@ static gboolean _sat_manager_handle_play_tone_ui_display_status(struct custom_da
        return TRUE;
 }
 
-static gboolean _sat_manager_handle_setup_idle_mode_text_ui_display_status(struct custom_data *ctx, TcorePlugin *plg,struct sat_manager_queue_data *q_data, gboolean display_status)
+static gboolean _sat_manager_handle_setup_idle_mode_text_ui_display_status(struct custom_data *ctx,
+       TcorePlugin *plg, struct sat_manager_queue_data *q_data, gboolean display_status)
 {
        TReturn rv = TCORE_RETURN_FAILURE;
        gboolean result = FALSE;
 
        struct treq_sat_terminal_rsp_data *tr;
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -5670,15 +5629,15 @@ static gboolean _sat_manager_handle_setup_idle_mode_text_ui_display_status(struc
        if (q_data->cmd_data.idle_mode.icon_id.is_exist)
                tr->terminal_rsp_data.setup_idle_mode_text.result_type = RESULT_SUCCESS_BUT_REQUESTED_ICON_NOT_DISPLAYED;
 
-       //fail to display text
-       if(!display_status){
+       /* fail to display text */
+       if (!display_status) {
                dbg("[SAT] fail to show ui display for setup_idle_mode_text");
                tr->terminal_rsp_data.setup_idle_mode_text.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
        }
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                result = FALSE;
        }
@@ -5687,7 +5646,8 @@ static gboolean _sat_manager_handle_setup_idle_mode_text_ui_display_status(struc
        return result;
 }
 
-static gboolean _sat_manager_handle_refresh_ui_display_status(struct custom_data *ctx, TcorePlugin *plg,struct sat_manager_queue_data *q_data, gboolean display_status)
+static gboolean _sat_manager_handle_refresh_ui_display_status(struct custom_data *ctx,
+       TcorePlugin *plg, struct sat_manager_queue_data *q_data, gboolean display_status)
 {
        struct treq_sat_terminal_rsp_data tr;
 
@@ -5699,11 +5659,10 @@ static gboolean _sat_manager_handle_refresh_ui_display_status(struct custom_data
        tr.terminal_rsp_data.refresh.device_id.src = q_data->cmd_data.refresh.device_id.dest;
        tr.terminal_rsp_data.refresh.device_id.dest = q_data->cmd_data.refresh.device_id.src;
 
-       if(!display_status){
+       if (!display_status) {
                dbg("fail to show ui for refresh");
                tr.terminal_rsp_data.refresh.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
-       }
-       else{
+       } else {
                dbg("success to show ui for refresh");
                tr.terminal_rsp_data.refresh.result_type = RESULT_SUCCESS;
                tr.terminal_rsp_data.refresh.me_problem_type = ME_PROBLEM_NO_SPECIFIC_CAUSE;
@@ -5716,7 +5675,8 @@ static gboolean _sat_manager_handle_refresh_ui_display_status(struct custom_data
 
 
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-static gboolean _sat_manager_handle_send_sms_ui_display_status(struct custom_data *ctx, TcorePlugin *plg,struct sat_manager_queue_data *q_data, gboolean display_status)
+static gboolean _sat_manager_handle_send_sms_ui_display_status(struct custom_data *ctx,
+       TcorePlugin *plg, struct sat_manager_queue_data *q_data, gboolean display_status)
 {
        char *path;
        TelephonySAT *sat;
@@ -5734,7 +5694,7 @@ static gboolean _sat_manager_handle_send_sms_ui_display_status(struct custom_dat
        GVariant *icon_id;
 #endif
 
-       if(!display_status){
+       if (!display_status) {
                struct treq_sat_terminal_rsp_data *tr = NULL;
                dbg("[SAT] fail to show ui display for send sms");
 
@@ -5751,12 +5711,12 @@ static gboolean _sat_manager_handle_send_sms_ui_display_status(struct custom_dat
                tr->terminal_rsp_data.send_sms.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
 
                sat_manager_send_terminal_response(ctx->comm, plg, tr);
-               free (tr);
+               free(tr);
 
                return TRUE;
        }
 
-       //emit send sms signal
+       /* emit send sms signal */
        cp_name = tcore_server_get_cp_name_by_plugin(plg);
        if (cp_name == NULL) {
                err("CP name is NULL");
@@ -5794,7 +5754,8 @@ static gboolean _sat_manager_handle_send_sms_ui_display_status(struct custom_dat
        return TRUE;
 }
 
-static gboolean _sat_manager_handle_send_ss_ui_display_status(struct custom_data *ctx, TcorePlugin *plg,struct sat_manager_queue_data *q_data, gboolean display_status)
+static gboolean _sat_manager_handle_send_ss_ui_display_status(struct custom_data *ctx,
+       TcorePlugin *plg, struct sat_manager_queue_data *q_data, gboolean display_status)
 {
        char *path;
        TelephonySAT *sat;
@@ -5811,7 +5772,7 @@ static gboolean _sat_manager_handle_send_ss_ui_display_status(struct custom_data
 #endif
        enum dbus_tapi_sim_slot_id slot_id;
 
-       if(!display_status){
+       if (!display_status) {
                struct treq_sat_terminal_rsp_data *tr = NULL;
                dbg("[SAT] fail to show ui display for send ss");
 
@@ -5828,12 +5789,12 @@ static gboolean _sat_manager_handle_send_ss_ui_display_status(struct custom_data
                tr->terminal_rsp_data.send_ss.result_type = RESULT_ME_UNABLE_TO_PROCESS_COMMAND;
 
                sat_manager_send_terminal_response(ctx->comm, plg, tr);
-               free (tr);
+               free(tr);
 
                return TRUE;
        }
 
-       //emit send ss signal
+       /* emit send ss signal */
        cp_name = tcore_server_get_cp_name_by_plugin(plg);
        if (cp_name == NULL) {
                err("CP name is NULL");
@@ -5874,7 +5835,8 @@ static gboolean _sat_manager_handle_send_ss_ui_display_status(struct custom_data
        return TRUE;
 }
 
-static gboolean _sat_manager_handle_send_ussd_ui_display_status(struct custom_data *ctx, TcorePlugin *plg,struct sat_manager_queue_data *q_data, gboolean display_status)
+static gboolean _sat_manager_handle_send_ussd_ui_display_status(struct custom_data *ctx,
+       TcorePlugin *plg, struct sat_manager_queue_data *q_data, gboolean display_status)
 {
        char *path;
        TelephonySAT *sat;
@@ -5892,7 +5854,7 @@ static gboolean _sat_manager_handle_send_ussd_ui_display_status(struct custom_da
 #endif
        enum dbus_tapi_sim_slot_id slot_id;
 
-       if(!display_status){
+       if (!display_status) {
                struct treq_sat_terminal_rsp_data *tr = NULL;
                dbg("[SAT] fail to show ui display for send ussd");
 
@@ -5914,7 +5876,7 @@ static gboolean _sat_manager_handle_send_ussd_ui_display_status(struct custom_da
                return TRUE;
        }
 
-       //emit send ussd signal
+       /* emit send ussd signal */
        cp_name = tcore_server_get_cp_name_by_plugin(plg);
        if (cp_name == NULL) {
                err("CP name is NULL");
@@ -5948,12 +5910,13 @@ static gboolean _sat_manager_handle_send_ussd_ui_display_status(struct custom_da
 
        slot_id = get_sim_slot_id_by_cp_name((char *)tcore_server_get_cp_name_by_plugin(plg));
        dbg("slot_id: [%d]", slot_id);
-       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_USSD, send_ussd,slot_id);
+       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_USSD, send_ussd, slot_id);
 
        return TRUE;
 }
 
-static gboolean _sat_manager_handle_send_dtmf_ui_display_status(struct custom_data *ctx, TcorePlugin *plg,struct sat_manager_queue_data *q_data, gboolean display_status)
+static gboolean _sat_manager_handle_send_dtmf_ui_display_status(struct custom_data *ctx,
+       TcorePlugin *plg, struct sat_manager_queue_data *q_data, gboolean display_status)
 {
        char *path;
        TelephonySAT *sat;
@@ -5969,7 +5932,7 @@ static gboolean _sat_manager_handle_send_dtmf_ui_display_status(struct custom_da
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        GVariant *icon_id = NULL;
 #endif
-       if(!display_status){
+       if (!display_status) {
                struct treq_sat_terminal_rsp_data *tr = NULL;
                dbg("[SAT] fail to show ui display for send_dtmf");
 
@@ -5991,7 +5954,7 @@ static gboolean _sat_manager_handle_send_dtmf_ui_display_status(struct custom_da
                return TRUE;
        }
 
-       //emit send_dtmf signal
+       /* emit send_dtmf signal */
        cp_name = tcore_server_get_cp_name_by_plugin(plg);
        if (cp_name == NULL) {
                err("CP name is NULL");
@@ -6026,7 +5989,8 @@ static gboolean _sat_manager_handle_send_dtmf_ui_display_status(struct custom_da
        return TRUE;
 }
 
-static gboolean _sat_manager_handle_open_channel_ui_display_status(struct custom_data *ctx, TcorePlugin *plg,struct sat_manager_queue_data *q_data, gboolean display_status)
+static gboolean _sat_manager_handle_open_channel_ui_display_status(struct custom_data *ctx,
+       TcorePlugin *plg, struct sat_manager_queue_data *q_data, gboolean display_status)
 {
        char *path;
        TelephonyObjectSkeleton *object;
@@ -6045,7 +6009,7 @@ static gboolean _sat_manager_handle_open_channel_ui_display_status(struct custom
        GVariant *icon_id;
 #endif
 
-       if(!display_status){
+       if (!display_status) {
                struct treq_sat_terminal_rsp_data *tr = NULL;
                dbg("[SAT] fail to show ui display for open channel");
 
@@ -6067,7 +6031,7 @@ static gboolean _sat_manager_handle_open_channel_ui_display_status(struct custom
                return TRUE;
        }
 
-       //emit send_dtmf signal
+       /* emit send_dtmf signal */
        cp_name = tcore_server_get_cp_name_by_plugin(plg);
        if (cp_name == NULL) {
                err("CP name is NULL");
@@ -6090,18 +6054,22 @@ static gboolean _sat_manager_handle_open_channel_ui_display_status(struct custom
 
        dbg("open channel type_format(%s)", g_variant_get_type_string(open_channel));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       g_variant_get(open_channel,"(isi@vbbbi@viiiis@v)", &command_id, &text, &text_len, &icon_id, &immediate_link, &auto_reconnection, &bg_mode,
-                       &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
+       g_variant_get(open_channel, "(isi@vbbbi@viiiis@v)", &command_id, &text,
+               &text_len, &icon_id, &immediate_link, &auto_reconnection, &bg_mode,
+               &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number,
+               &dest_addr_type, &dest_address, &bearer_detail);
 #else
-       g_variant_get(open_channel,"(isibbbi@viiiis@v)", &command_id, &text, &text_len, &immediate_link, &auto_reconnection, &bg_mode,
-                       &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
+       g_variant_get(open_channel, "(isibbbi@viiiis@v)", &command_id, &text, &text_len,
+               &immediate_link, &auto_reconnection, &bg_mode, &bearer_type, &bearer_param,
+               &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
 #endif
-       /*telephony_sat_emit_open_channel(sat, command_id, text, text_len, immediate_link, auto_reconnection, bg_mode,
-                       bearer_type, bearer_param, buffer_size, protocol_type, port_number, dest_addr_type, dest_address, bearer_detail);*/
+       /* telephony_sat_emit_open_channel(sat, command_id, text, text_len, immediate_link,
+               auto_reconnection, bg_mode, bearer_type, bearer_param, buffer_size,
+               protocol_type, port_number, dest_addr_type, dest_address, bearer_detail); */
        g_free(text);
        g_free(dest_address);
 
-       //BIP Manager
+       /* BIP Manager */
        {
                GDBusConnection *conn = NULL;
                const gchar *g_path = NULL;
@@ -6128,51 +6096,52 @@ gboolean sat_manager_handle_ui_display_status(struct custom_data *ctx, TcorePlug
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
-       switch(q_data.cmd_type){
-               case SAT_PROATV_CMD_PLAY_TONE:
-                       result = _sat_manager_handle_play_tone_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_SEND_SMS:
-                       result = _sat_manager_handle_send_sms_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_SEND_SS:
-                       result = _sat_manager_handle_send_ss_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_SEND_USSD:
-                       result = _sat_manager_handle_send_ussd_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT:
-                       result = _sat_manager_handle_setup_idle_mode_text_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_REFRESH:
-                       result = _sat_manager_handle_refresh_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_SEND_DTMF:
-                       result = _sat_manager_handle_send_dtmf_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_OPEN_CHANNEL:
-                       result = _sat_manager_handle_open_channel_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               default:
-                       dbg("[SAT] cannot handle ui display status command(0x%x)", q_data.cmd_type);
-                       break;
+       switch (q_data.cmd_type) {
+       case SAT_PROATV_CMD_PLAY_TONE:
+               result = _sat_manager_handle_play_tone_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_SEND_SMS:
+               result = _sat_manager_handle_send_sms_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_SEND_SS:
+               result = _sat_manager_handle_send_ss_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_SEND_USSD:
+               result = _sat_manager_handle_send_ussd_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT:
+               result = _sat_manager_handle_setup_idle_mode_text_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_REFRESH:
+               result = _sat_manager_handle_refresh_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_SEND_DTMF:
+               result = _sat_manager_handle_send_dtmf_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_OPEN_CHANNEL:
+               result = _sat_manager_handle_open_channel_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       default:
+               dbg("[SAT] cannot handle ui display status command(0x%x)", q_data.cmd_type);
+               break;
        }
 
        return result;
 }
 #else
-static gboolean _sat_manager_handle_open_channel_ui_display_status(struct custom_data *ctx, TcorePlugin *plg,struct sat_manager_queue_data *q_data, gboolean display_status)
+static gboolean _sat_manager_handle_open_channel_ui_display_status(struct custom_data *ctx,
+       TcorePlugin *plg, struct sat_manager_queue_data *q_data, gboolean display_status)
 {
        TReturn rv = TCORE_RETURN_FAILURE;
        gboolean result = FALSE;
        struct treq_sat_user_confirmation_data *conf_data;
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -6183,14 +6152,14 @@ static gboolean _sat_manager_handle_open_channel_ui_display_status(struct custom
 
        dbg("display_status[%d]", display_status);
 
-       if(display_status)
+       if (display_status)
                conf_data->user_conf = USER_CONFIRM_YES;
        else
                conf_data->user_conf = USER_CONFIRM_NO_OR_CANCEL;
 
        result = TRUE;
        rv = sat_manager_send_user_confirmation(ctx->comm, plg, conf_data);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send user confirmation message");
                result = FALSE;
        }
@@ -6211,64 +6180,64 @@ gboolean sat_manager_handle_ui_display_status(struct custom_data *ctx, TcorePlug
                return result;
        }
 
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
 
-       switch(q_data.cmd_type){
-               case SAT_PROATV_CMD_PLAY_TONE:
-                       result = _sat_manager_handle_play_tone_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT:
-                       result = _sat_manager_handle_setup_idle_mode_text_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_REFRESH:
-                       result = _sat_manager_handle_refresh_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_OPEN_CHANNEL:
-                       result = _sat_manager_handle_open_channel_ui_display_status(ctx, plg, &q_data, display_status);
-                       break;
-               case SAT_PROATV_CMD_SEND_SMS:
-               case SAT_PROATV_CMD_SEND_SS:
-               case SAT_PROATV_CMD_SEND_USSD:
-               case SAT_PROATV_CMD_SEND_DTMF:
-                       dbg("[SAT] command(0x%x) will be handled by CP", q_data.cmd_type);
-                       result = TRUE;
-                       if(q_data.noti_required) {
-                               TelephonySAT *sat;
-                               TelephonyObjectSkeleton *object;
-                               const gchar *cp_name;
-                               gchar *path = NULL;
-
-                               dbg("Noti flag is set, send session end evt.");
-                               //emit session end
-
-                               cp_name = tcore_server_get_cp_name_by_plugin(plg);
-                               if (cp_name == NULL) {
-                                       err("CP name is NULL");
-                                       return FALSE;
-                               }
+       switch (q_data.cmd_type) {
+       case SAT_PROATV_CMD_PLAY_TONE:
+               result = _sat_manager_handle_play_tone_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT:
+               result = _sat_manager_handle_setup_idle_mode_text_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_REFRESH:
+               result = _sat_manager_handle_refresh_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_OPEN_CHANNEL:
+               result = _sat_manager_handle_open_channel_ui_display_status(ctx, plg, &q_data, display_status);
+               break;
+       case SAT_PROATV_CMD_SEND_SMS:
+       case SAT_PROATV_CMD_SEND_SS:
+       case SAT_PROATV_CMD_SEND_USSD:
+       case SAT_PROATV_CMD_SEND_DTMF:
+               dbg("[SAT] command(0x%x) will be handled by CP", q_data.cmd_type);
+               result = TRUE;
+               if (q_data.noti_required) {
+                       TelephonySAT *sat;
+                       TelephonyObjectSkeleton *object;
+                       const gchar *cp_name;
+                       gchar *path = NULL;
 
-                               dbg("CP Name: [%s]", cp_name);
-                               path = g_strdup_printf("%s/%s", MY_DBUS_PATH, cp_name);
+                       dbg("Noti flag is set, send session end evt.");
+                       /* emit session end */
 
-                               /* Look-up Hash table for Object */
-                               object = g_hash_table_lookup(ctx->objects, path);
-                               dbg("Path: [%s] Interface object: [%p]", path, object);
-                               g_free(path);
-                               if (object == NULL) {
-                                       err("Object is NOT defined!!!");
-                                       return FALSE;
-                               }
+                       cp_name = tcore_server_get_cp_name_by_plugin(plg);
+                       if (cp_name == NULL) {
+                               err("CP name is NULL");
+                               return FALSE;
+                       }
+
+                       dbg("CP Name: [%s]", cp_name);
+                       path = g_strdup_printf("%s/%s", MY_DBUS_PATH, cp_name);
 
-                               sat = telephony_object_peek_sat(TELEPHONY_OBJECT(object));
-                               telephony_sat_emit_end_proactive_session(sat, SAT_PROATV_CMD_TYPE_END_PROACTIVE_SESSION);
+                       /* Look-up Hash table for Object */
+                       object = g_hash_table_lookup(ctx->objects, path);
+                       dbg("Path: [%s] Interface object: [%p]", path, object);
+                       g_free(path);
+                       if (object == NULL) {
+                               err("Object is NOT defined!!!");
+                               return FALSE;
                        }
-                       break;
-               default:
-                       dbg("[SAT] cannot handle ui display status command(0x%x)", q_data.cmd_type);
-                       break;
+
+                       sat = telephony_object_peek_sat(TELEPHONY_OBJECT(object));
+                       telephony_sat_emit_end_proactive_session(sat, SAT_PROATV_CMD_TYPE_END_PROACTIVE_SESSION);
+               }
+               break;
+       default:
+               dbg("[SAT] cannot handle ui display status command(0x%x)", q_data.cmd_type);
+               break;
        }
        return result;
 }
@@ -6283,72 +6252,70 @@ gboolean sat_manager_handle_event_download_envelop(int event_type,  int src_dev,
        g_variant_get(download_data, "v", &data);
 
 
-       if(g_evt_list[event_type] == TRUE){
+       if (g_evt_list[event_type] == TRUE) {
                dbg("event (%d) shoud be passed to sim", event_type);
                rv = TRUE;
        }
 
-       if(!rv){
+       if (!rv) {
                dbg("(%d) event does not requested by sim", event_type);
                return FALSE;
        }
 
-       switch(event_type)
-       {
-               case EVENT_USER_ACTIVITY:
-                       dbg("data type_format(%s)", g_variant_get_type_string(data));
-                       evt_download->device_identitie.src = src_dev;
-                       evt_download->device_identitie.dest = dest_dev;
-                       break;
-               case EVENT_IDLE_SCREEN_AVAILABLE:
-                       dbg("data type_format(%s)", g_variant_get_type_string(data));
-                       g_variant_get(data, "(b)", &evt_download->idle_screen);
-                       evt_download->device_identitie.src = DEVICE_ID_DISPLAY;
-                       evt_download->device_identitie.dest = dest_dev;
-                       dbg("idle screen available (%d)", evt_download->idle_screen);
-                       break;
-               case EVENT_LANGUAGE_SELECTION:
-                       dbg("data type_format(%s)", g_variant_get_type_string(data));
-                       g_variant_get(data, "(i)", &evt_download->language);
-                       evt_download->device_identitie.src = src_dev;
-                       evt_download->device_identitie.dest = dest_dev;
-                       dbg("selected language (%d)", evt_download->language);
-                       break;
-               case EVENT_BROWSER_TERMINATION:{
-                       dbg("data type_format(%s)", g_variant_get_type_string(data));
-                       g_variant_get(data, "(i)", &evt_download->browser_termination);
-                       evt_download->device_identitie.src = src_dev;
-                       evt_download->device_identitie.dest = dest_dev;
-                       dbg("browser termination cause(%d)", evt_download->browser_termination);
-               } break;
-               case EVENT_DATA_AVAILABLE:{
-                       gint channel_id, channel_status, channel_info, channel_data_len;
-
-                       dbg("data type_format(%s)", g_variant_get_type_string(data));
-                       g_variant_get(data, "(iiii)", &channel_id, &channel_status, &channel_info, &channel_data_len);
-                       evt_download->device_identitie.src = src_dev;
-                       evt_download->device_identitie.dest = dest_dev;
-                       evt_download->channel_status.channel_id = channel_id;
-                       evt_download->channel_status.status = channel_status;
-                       evt_download->channel_status.status_info = channel_info;
-                       evt_download->channel_data_len.data_len = channel_data_len;
-                       dbg("data available channel id (%d)", evt_download->channel_status.channel_id);
-               } break;
-               case EVENT_CHANNEL_STATUS:{
-                       gint channel_id, channel_status, channel_info;
-
-                       dbg("data type_format(%s)", g_variant_get_type_string(data));
-                       g_variant_get(data, "(iii)", &channel_id, &channel_status, &channel_info);
-                       evt_download->device_identitie.src = src_dev;
-                       evt_download->device_identitie.dest = dest_dev;
-                       evt_download->channel_status.channel_id = channel_id;
-                       evt_download->channel_status.status = channel_status;
-                       evt_download->channel_status.status_info = channel_info;
-
-               } break;
-               default :
-                       dbg("not support download event (%d)", event_type);
-                       break;
+       switch (event_type) {
+       case EVENT_USER_ACTIVITY:
+               dbg("data type_format(%s)", g_variant_get_type_string(data));
+               evt_download->device_identitie.src = src_dev;
+               evt_download->device_identitie.dest = dest_dev;
+               break;
+       case EVENT_IDLE_SCREEN_AVAILABLE:
+               dbg("data type_format(%s)", g_variant_get_type_string(data));
+               g_variant_get(data, "(b)", &evt_download->idle_screen);
+               evt_download->device_identitie.src = DEVICE_ID_DISPLAY;
+               evt_download->device_identitie.dest = dest_dev;
+               dbg("idle screen available (%d)", evt_download->idle_screen);
+               break;
+       case EVENT_LANGUAGE_SELECTION:
+               dbg("data type_format(%s)", g_variant_get_type_string(data));
+               g_variant_get(data, "(i)", &evt_download->language);
+               evt_download->device_identitie.src = src_dev;
+               evt_download->device_identitie.dest = dest_dev;
+               dbg("selected language (%d)", evt_download->language);
+               break;
+       case EVENT_BROWSER_TERMINATION: {
+               dbg("data type_format(%s)", g_variant_get_type_string(data));
+               g_variant_get(data, "(i)", &evt_download->browser_termination);
+               evt_download->device_identitie.src = src_dev;
+               evt_download->device_identitie.dest = dest_dev;
+               dbg("browser termination cause(%d)", evt_download->browser_termination);
+       } break;
+       case EVENT_DATA_AVAILABLE: {
+               gint channel_id, channel_status, channel_info, channel_data_len;
+
+               dbg("data type_format(%s)", g_variant_get_type_string(data));
+               g_variant_get(data, "(iiii)", &channel_id, &channel_status, &channel_info, &channel_data_len);
+               evt_download->device_identitie.src = src_dev;
+               evt_download->device_identitie.dest = dest_dev;
+               evt_download->channel_status.channel_id = channel_id;
+               evt_download->channel_status.status = channel_status;
+               evt_download->channel_status.status_info = channel_info;
+               evt_download->channel_data_len.data_len = channel_data_len;
+               dbg("data available channel id (%d)", evt_download->channel_status.channel_id);
+       } break;
+       case EVENT_CHANNEL_STATUS: {
+               gint channel_id, channel_status, channel_info;
+
+               dbg("data type_format(%s)", g_variant_get_type_string(data));
+               g_variant_get(data, "(iii)", &channel_id, &channel_status, &channel_info);
+               evt_download->device_identitie.src = src_dev;
+               evt_download->device_identitie.dest = dest_dev;
+               evt_download->channel_status.channel_id = channel_id;
+               evt_download->channel_status.status = channel_status;
+               evt_download->channel_status.status_info = channel_info;
+       } break;
+       default:
+               dbg("not support download event (%d)", event_type);
+               break;
        }
 
        return TRUE;
@@ -6373,7 +6340,7 @@ gboolean sat_manager_update_language(struct custom_data *ctx, const char *cp_nam
        strg = tcore_server_find_storage(s, "vconf");
 
        plg = tcore_server_find_plugin(ctx->server, cp_name);
-       if (!plg){
+       if (!plg) {
                dbg("there is no valid plugin at this point");
                return result;
        }
@@ -6388,24 +6355,22 @@ gboolean sat_manager_update_language(struct custom_data *ctx, const char *cp_nam
                return result;
        }
 
-       if(q_data.cmd_type != SAT_PROATV_CMD_LANGUAGE_NOTIFICATION){
+       if (q_data.cmd_type != SAT_PROATV_CMD_LANGUAGE_NOTIFICATION) {
                dbg("[SAT] Language Noti dequeue failed. didn't find in command Q!!");
                return result;
        }
 
        if (b_specified) {
                lang_str = _convert_sim_lang_to_string((enum tel_sim_language_type)language);
-               if(!lang_str){
+               if (!lang_str)
                        dbg("language is not exist");
-               }
                dbg("converted lang (%s)", lang_str);
 
-               if(_sat_manager_check_language_set(lang_str)) {
+               if (_sat_manager_check_language_set(lang_str)) {
                        dbg("supprted language, set vconf.");
-                       result = tcore_storage_set_string(strg,STORAGE_KEY_LANGUAGE_SET, (const char*)lang_str);
-                       if(!result){
+                       result = tcore_storage_set_string(strg, STORAGE_KEY_LANGUAGE_SET, (const char *)lang_str);
+                       if (!result)
                                dbg("fail to update language");
-                       }
                }
        }
 
@@ -6425,7 +6390,7 @@ gboolean sat_manager_update_language(struct custom_data *ctx, const char *cp_nam
 
        result = TRUE;
        rv = sat_manager_send_terminal_response(ctx->comm, plg, tr);
-       if(rv != TCORE_RETURN_SUCCESS){
+       if (rv != TCORE_RETURN_SUCCESS) {
                dbg("fail to send terminal response");
                g_free(tr);
                result = FALSE;
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 0574c59..0758b7d
@@ -7,11 +7,10 @@
 #include <errno.h>
 #include <aul.h>
 #include <appsvc.h>
-#include <bundle.h>
+#include <bundle_internal.h>
 
 #include "TelSat.h"
 #include "sat_ui_support.h"
-#include "package-manager.h"
 
 struct sat_ui_app_launch_data {
        bundle *bundle_data; /**<bundle data*/
@@ -24,25 +23,24 @@ static gpointer __launch_sat_ui_app(gpointer data)
        int i = 0;
        struct sat_ui_app_launch_data *app_data = (struct sat_ui_app_launch_data *)data;
 
-       if(!app_data) {
+       if (!app_data) {
                err("app_data does not exist");
                goto EXIT;
        }
-       if(!app_data->bundle_data) {
+       if (!app_data->bundle_data) {
                err("bundle_data not present");
                goto EXIT;
        }
-       if(!app_data->slot_info) {
+       if (!app_data->slot_info) {
                err("slot_info not present");
                goto EXIT;
        }
 
-       for (i=0; i<RETRY_MAXCOUNT; i++)
-       {
-               if(g_str_has_suffix(app_data->slot_info , "0")){
+       for (i = 0; i < RETRY_MAXCOUNT; i++) {
+               if (g_str_has_suffix(app_data->slot_info , "0")) {
                        dbg("slot 0");
                        rv = aul_launch_app("org.tizen.sat-ui", app_data->bundle_data);
-               } else if (g_str_has_suffix(app_data->slot_info , "1")){
+               } else if (g_str_has_suffix(app_data->slot_info , "1")) {
                        dbg("slot 1");
                        rv = aul_launch_app("org.tizen.sat-ui-2", app_data->bundle_data);
                } else {
@@ -78,11 +76,10 @@ static gboolean __dispatch_on_new_thread(gchar *name, GThreadFunc thread_cb, gpo
                return FALSE;
        }
        thread = g_thread_new(name, thread_cb, thread_data);
-       if (thread == NULL){
+       if (thread == NULL)
                return FALSE;
-       }else{
+       else
                dbg("Thread %p is created for %s", thread, name);
-       }
 
        return TRUE;
 }
@@ -91,7 +88,7 @@ static gboolean __sat_ui_support_app_launch(bundle *bundle_data, char *slot_info
 {
        struct sat_ui_app_launch_data *app_data = NULL;
 
-       app_data= g_malloc0(sizeof(struct sat_ui_app_launch_data));
+       app_data = g_malloc0(sizeof(struct sat_ui_app_launch_data));
        if (!app_data) {
                err("malloc failed");
                return FALSE;
@@ -161,12 +158,12 @@ static gboolean _sat_ui_support_processing_setup_menu_ind(GVariant *data, char *
        g_free(title);
 
        setup_menu.satMainMenuNum = item_cnt;
-       if(items && item_cnt > 0){
+       if (items && item_cnt > 0) {
                unbox = g_variant_get_variant(items);
                dbg("items(%p) items type_format(%s)", items, g_variant_get_type_string(unbox));
 
                g_variant_get(unbox, "a(si)", &iter);
-               while(g_variant_iter_loop(iter,"(si)",&item_str, &item_id)){
+               while (g_variant_iter_loop(iter, "(si)", &item_str, &item_id)) {
                        setup_menu.satMainMenuItem[local_index].itemId = item_id;
                        memcpy(setup_menu.satMainMenuItem[local_index].itemString, item_str, TAPI_SAT_DEF_ITEM_STR_LEN_MAX + 6);
                        local_index++;
@@ -177,12 +174,12 @@ static gboolean _sat_ui_support_processing_setup_menu_ind(GVariant *data, char *
        setup_menu.bIsUpdatedSatMainMenu = (b_updated ? 1 : 0);
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       if(icon_id) {
+       if (icon_id) {
                unbox = g_variant_get_variant(icon_id);
                g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)){
-                       if(!is_exist)
+               while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                       if (!is_exist)
                                break;
                        setup_menu.iconId.bIsPresent = is_exist;
                        setup_menu.iconId.iconQualifier = icon_quali;
@@ -190,7 +187,7 @@ static gboolean _sat_ui_support_processing_setup_menu_ind(GVariant *data, char *
                        setup_menu.iconId.iconInfo.width = width;
                        setup_menu.iconId.iconInfo.height = height;
                        setup_menu.iconId.iconInfo.ics = ics;
-                       if(icon_data_len > 0) {
+                       if (icon_data_len > 0) {
                                setup_menu.iconId.iconInfo.iconDataLen = icon_data_len;
                                memcpy(setup_menu.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                        }
@@ -200,12 +197,12 @@ static gboolean _sat_ui_support_processing_setup_menu_ind(GVariant *data, char *
                g_variant_iter_free(iter);
        }
 
-       if(icon_list){
+       if (icon_list) {
                unbox_list = g_variant_get_variant(icon_list);
                g_variant_get(unbox_list, "a(biiv)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)){
-                       if(!is_list_exist)
+               while (g_variant_iter_loop(iter, "(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)) {
+                       if (!is_list_exist)
                                break;
                        setup_menu.iconIdList.bIsPresent = is_list_exist;
                        setup_menu.iconIdList.iconListQualifier = icon_list_quali;
@@ -214,12 +211,12 @@ static gboolean _sat_ui_support_processing_setup_menu_ind(GVariant *data, char *
                        unbox_list_info = g_variant_get_variant(icon_list_info);
                        g_variant_get(unbox_list_info, "a(iiiiis)", &iter2);
 
-                       while(g_variant_iter_loop(iter2,"(iiiiis)",&icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)){
-                               setup_menu.iconIdList.iconIdentifierList[icon_index]= icon_identifier;
+                       while (g_variant_iter_loop(iter2, "(iiiiis)", &icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)) {
+                               setup_menu.iconIdList.iconIdentifierList[icon_index] = icon_identifier;
                                setup_menu.iconIdList.iconInfo[icon_index].width = list_width;
                                setup_menu.iconIdList.iconInfo[icon_index].height = list_height;
                                setup_menu.iconIdList.iconInfo[icon_index].ics = list_ics;
-                               if(icon_list_data_len > 0) {
+                               if (icon_list_data_len > 0) {
                                        setup_menu.iconIdList.iconInfo[icon_index].iconDataLen = icon_list_data_len;
                                        memcpy(setup_menu.iconIdList.iconInfo[icon_index].iconFile, icon_list_data, icon_list_data_len);
                                }
@@ -285,12 +282,12 @@ static gboolean _sat_ui_support_processing_display_text_ind(GVariant *data, char
        display_text.b_immediately_resp = (immediately_rsp ? 1 : 0);
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       if(icon_id) {
+       if (icon_id) {
                unbox = g_variant_get_variant(icon_id);
                g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                       if(!is_exist)
+               while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                       if (!is_exist)
                                break;
                        display_text.iconId.bIsPresent = is_exist;
                        display_text.iconId.iconQualifier = icon_quali;
@@ -298,7 +295,7 @@ static gboolean _sat_ui_support_processing_display_text_ind(GVariant *data, char
                        display_text.iconId.iconInfo.width = width;
                        display_text.iconId.iconInfo.height = height;
                        display_text.iconId.iconInfo.ics = ics;
-                       if(icon_data_len > 0) {
+                       if (icon_data_len > 0) {
                                display_text.iconId.iconInfo.iconDataLen = icon_data_len;
                                memcpy(display_text.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                        }
@@ -336,7 +333,7 @@ static gboolean _sat_ui_support_processing_select_item_ind(GVariant *data, char
 
        gboolean help_info ;
        gchar *selected_text = NULL;
-       gint command_id, default_item_id, menu_cnt, text_len =0;
+       gint command_id, default_item_id, menu_cnt, text_len = 0;
        GVariant *menu_items;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        GVariant *icon_id, *icon_list;
@@ -380,12 +377,12 @@ static gboolean _sat_ui_support_processing_select_item_ind(GVariant *data, char
        select_item.text.stringLen = text_len;
        select_item.defaultItemIndex = default_item_id;
        select_item.menuItemCount = menu_cnt;
-       if(menu_items && menu_cnt > 0){
+       if (menu_items && menu_cnt > 0) {
                unbox = g_variant_get_variant(menu_items);
                dbg("items(%p) items type_format(%s)", menu_items, g_variant_get_type_string(unbox));
 
                g_variant_get(unbox, "a(iis)", &iter);
-               while(g_variant_iter_loop(iter,"(iis)",&item_id, &item_len, &item_str)){
+               while (g_variant_iter_loop(iter, "(iis)", &item_id, &item_len, &item_str)) {
                        select_item.menuItem[local_index].itemId = item_id;
                        select_item.menuItem[local_index].textLen = item_len;
                        memcpy(select_item.menuItem[local_index].text, item_str, TAPI_SAT_ITEM_TEXT_LEN_MAX + 1);
@@ -395,12 +392,12 @@ static gboolean _sat_ui_support_processing_select_item_ind(GVariant *data, char
        }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       if(icon_id) {
+       if (icon_id) {
                unbox = g_variant_get_variant(icon_id);
                g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                       if(!is_exist)
+               while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                       if (!is_exist)
                                break;
                        select_item.iconId.bIsPresent = is_exist;
                        select_item.iconId.iconQualifier = icon_quali;
@@ -408,7 +405,7 @@ static gboolean _sat_ui_support_processing_select_item_ind(GVariant *data, char
                        select_item.iconId.iconInfo.width = width;
                        select_item.iconId.iconInfo.height = height;
                        select_item.iconId.iconInfo.ics = ics;
-                       if(icon_data_len > 0) {
+                       if (icon_data_len > 0) {
                                select_item.iconId.iconInfo.iconDataLen = icon_data_len;
                                memcpy(select_item.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                        }
@@ -418,12 +415,12 @@ static gboolean _sat_ui_support_processing_select_item_ind(GVariant *data, char
                g_variant_iter_free(iter);
        }
 
-       if(icon_list){
+       if (icon_list) {
                unbox_list = g_variant_get_variant(icon_list);
                g_variant_get(unbox_list, "a(biiv)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)) {
-                       if(!is_list_exist)
+               while (g_variant_iter_loop(iter, "(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)) {
+                       if (!is_list_exist)
                                break;
                        select_item.iconIdList.bIsPresent = is_list_exist;
                        select_item.iconIdList.iconListQualifier = icon_list_quali;
@@ -432,12 +429,12 @@ static gboolean _sat_ui_support_processing_select_item_ind(GVariant *data, char
                        unbox_list_info = g_variant_get_variant(icon_list_info);
                        g_variant_get(unbox_list_info, "a(iiiiis)", &iter2);
 
-                       while(g_variant_iter_loop(iter2,"(iiiiis)",&icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)){
-                               select_item.iconIdList.iconIdentifierList[icon_index]= icon_identifier;
+                       while (g_variant_iter_loop(iter2, "(iiiiis)", &icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)) {
+                               select_item.iconIdList.iconIdentifierList[icon_index] = icon_identifier;
                                select_item.iconIdList.iconInfo[icon_index].width = list_width;
                                select_item.iconIdList.iconInfo[icon_index].height = list_height;
                                select_item.iconIdList.iconInfo[icon_index].ics = list_ics;
-                               if(icon_list_data_len > 0) {
+                               if (icon_list_data_len > 0) {
                                        select_item.iconIdList.iconInfo[icon_index].iconDataLen = icon_list_data_len;
                                        memcpy(select_item.iconIdList.iconInfo[icon_index].iconFile, icon_list_data, icon_list_data_len);
                                }
@@ -488,10 +485,10 @@ static gboolean _sat_ui_support_processing_get_inkey_ind(GVariant *data, char *s
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
        g_variant_get(data, "(iiibbsii@v)", &command_id, &key_type, &input_character_mode,
-               &b_numeric,&b_help_info, &text, &text_len, &duration, &icon_id);
+               &b_numeric, &b_help_info, &text, &text_len, &duration, &icon_id);
 #else
        g_variant_get(data, "(iiibbsii)", &command_id, &key_type, &input_character_mode,
-               &b_numeric,&b_help_info, &text, &text_len, &duration);
+               &b_numeric, &b_help_info, &text, &text_len, &duration);
 #endif
        get_inkey.commandId = command_id;
        get_inkey.keyType = key_type;
@@ -505,12 +502,12 @@ static gboolean _sat_ui_support_processing_get_inkey_ind(GVariant *data, char *s
        get_inkey.duration = duration;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       if(icon_id) {
+       if (icon_id) {
                unbox = g_variant_get_variant(icon_id);
                g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                       if(!is_exist)
+               while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                       if (!is_exist)
                        break;
                        get_inkey.iconId.bIsPresent = is_exist;
                        get_inkey.iconId.iconQualifier = icon_quali;
@@ -518,7 +515,7 @@ static gboolean _sat_ui_support_processing_get_inkey_ind(GVariant *data, char *s
                        get_inkey.iconId.iconInfo.width = width;
                        get_inkey.iconId.iconInfo.height = height;
                        get_inkey.iconId.iconInfo.ics = ics;
-                       if(icon_data_len > 0) {
+                       if (icon_data_len > 0) {
                                get_inkey.iconId.iconInfo.iconDataLen = icon_data_len;
                                memcpy(get_inkey.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                        }
@@ -588,12 +585,12 @@ static gboolean _sat_ui_support_processing_get_input_ind(GVariant *data, char *s
        g_free(def_text);
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       if(icon_id) {
+       if (icon_id) {
                unbox = g_variant_get_variant(icon_id);
                g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                       if(!is_exist)
+               while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                       if (!is_exist)
                                break;
                        get_input.iconId.bIsPresent = is_exist;
                        get_input.iconId.iconQualifier = icon_quali;
@@ -601,7 +598,7 @@ static gboolean _sat_ui_support_processing_get_input_ind(GVariant *data, char *s
                        get_input.iconId.iconInfo.width = width;
                        get_input.iconId.iconInfo.height = height;
                        get_input.iconId.iconInfo.ics = ics;
-                       if(icon_data_len > 0) {
+                       if (icon_data_len > 0) {
                                get_input.iconId.iconInfo.iconDataLen = icon_data_len;
                                memcpy(get_input.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                        }
@@ -636,7 +633,7 @@ static gboolean _sat_ui_support_processing_refresh_ind(GVariant *data, char *slo
        TelSatRefreshIndUiInfo_t refresh_info;
 
        gint command_id = 0;
-       gint refresh_type =0;
+       gint refresh_type = 0;
        GVariant *file_list = NULL;
 
        memset(&refresh_info, 0, sizeof(TelSatRefreshIndUiInfo_t));
@@ -705,12 +702,12 @@ static gboolean _sat_ui_support_processing_play_tone_ind(GVariant *data, char *s
        play_tone_info.tone.type = tone_type;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       if(icon_id) {
+       if (icon_id) {
                unbox = g_variant_get_variant(icon_id);
                g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                       if(!is_exist)
+               while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                       if (!is_exist)
                                break;
                        play_tone_info.iconId.bIsPresent = is_exist;
                        play_tone_info.iconId.iconQualifier = icon_quali;
@@ -718,7 +715,7 @@ static gboolean _sat_ui_support_processing_play_tone_ind(GVariant *data, char *s
                        play_tone_info.iconId.iconInfo.width = width;
                        play_tone_info.iconId.iconInfo.height = height;
                        play_tone_info.iconId.iconInfo.ics = ics;
-                       if(icon_data_len > 0) {
+                       if (icon_data_len > 0) {
                                play_tone_info.iconId.iconInfo.iconDataLen = icon_data_len;
                                memcpy(play_tone_info.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                        }
@@ -775,12 +772,12 @@ static gboolean _sat_ui_support_processing_idle_mode_text_ind(GVariant *data, ch
        g_free(text);
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       if(icon_id) {
+       if (icon_id) {
                unbox = g_variant_get_variant(icon_id);
                g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                       if(!is_exist)
+               while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                       if (!is_exist)
                                break;
                        idle_mode_text_info.iconId.bIsPresent = is_exist;
                        idle_mode_text_info.iconId.iconQualifier = icon_quali;
@@ -788,7 +785,7 @@ static gboolean _sat_ui_support_processing_idle_mode_text_ind(GVariant *data, ch
                        idle_mode_text_info.iconId.iconInfo.width = width;
                        idle_mode_text_info.iconId.iconInfo.height = height;
                        idle_mode_text_info.iconId.iconInfo.ics = ics;
-                       if(icon_data_len > 0) {
+                       if (icon_data_len > 0) {
                                idle_mode_text_info.iconId.iconInfo.iconDataLen = icon_data_len;
                                memcpy(idle_mode_text_info.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                        }
@@ -815,9 +812,8 @@ static gboolean _sat_ui_support_processing_idle_mode_text_ind(GVariant *data, ch
        /* P130527-4589 (I8800): Megafone Russia SIM cards.
         * Need to check for debug without execption handling.
         */
-       if (rv != TRUE) {
+       if (rv != TRUE)
                err("result is error");
-       }
 
        return TRUE;
 }
@@ -857,12 +853,12 @@ static gboolean _sat_ui_support_processing_ui_info_ind(enum tel_sat_proactive_cm
        ui_info.user_confirm = (user_confirm ? 1 : 0);
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       if(icon_id) {
+       if (icon_id) {
                unbox = g_variant_get_variant(icon_id);
                g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                       if(!is_exist)
+               while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                       if (!is_exist)
                                break;
                        ui_info.iconId.bIsPresent = is_exist;
                        ui_info.iconId.iconQualifier = icon_quali;
@@ -870,7 +866,7 @@ static gboolean _sat_ui_support_processing_ui_info_ind(enum tel_sat_proactive_cm
                        ui_info.iconId.iconInfo.width = width;
                        ui_info.iconId.iconInfo.height = height;
                        ui_info.iconId.iconInfo.ics = ics;
-                       if(icon_data_len > 0) {
+                       if (icon_data_len > 0) {
                                ui_info.iconId.iconInfo.iconDataLen = icon_data_len;
                                memcpy(ui_info.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                        }
@@ -934,42 +930,42 @@ gboolean sat_ui_support_launch_sat_ui(enum tel_sat_proactive_cmd_type cmd_type,
        snprintf(slot_info, 2, "%d", slot_id);
        dbg("slot_id : [%s]", slot_info);
 
-       switch(cmd_type){
-               case SAT_PROATV_CMD_NONE:
-               case SAT_PROATV_CMD_SEND_DTMF:
-               case SAT_PROATV_CMD_LAUNCH_BROWSER:
-               case SAT_PROATV_CMD_SEND_SMS:
-                       result = _sat_ui_support_processing_ui_info_ind(cmd_type, data, slot_info);
-               break;
-               case SAT_PROATV_CMD_SETUP_MENU:
-                       result = _sat_ui_support_processing_setup_menu_ind(data, slot_info);
-               break;
-               case SAT_PROATV_CMD_DISPLAY_TEXT:
-                       result = _sat_ui_support_processing_display_text_ind(data, slot_info);
-               break;
-               case SAT_PROATV_CMD_SELECT_ITEM:
-                       result = _sat_ui_support_processing_select_item_ind(data, slot_info);
-               break;
-               case SAT_PROATV_CMD_GET_INKEY:
-                       result = _sat_ui_support_processing_get_inkey_ind(data, slot_info);
-               break;
-               case SAT_PROATV_CMD_GET_INPUT:
-                       result = _sat_ui_support_processing_get_input_ind(data, slot_info);
-               break;
-               case SAT_PROATV_CMD_REFRESH:
-                       result = _sat_ui_support_processing_refresh_ind(data, slot_info);
-               break;
-               case SAT_PROATV_CMD_PLAY_TONE:
-                       result = _sat_ui_support_processing_play_tone_ind(data, slot_info);
-               break;
-               case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT:
-                       result = _sat_ui_support_processing_idle_mode_text_ind(data, slot_info);
-               break;
-               case SAT_PROATV_CMD_SETUP_EVENT_LIST:
-               break;
-               default:
-                       dbg("does not need to launch sat-ui");
-               break;
+       switch (cmd_type) {
+       case SAT_PROATV_CMD_NONE:
+       case SAT_PROATV_CMD_SEND_DTMF:
+       case SAT_PROATV_CMD_LAUNCH_BROWSER:
+       case SAT_PROATV_CMD_SEND_SMS:
+               result = _sat_ui_support_processing_ui_info_ind(cmd_type, data, slot_info);
+       break;
+       case SAT_PROATV_CMD_SETUP_MENU:
+               result = _sat_ui_support_processing_setup_menu_ind(data, slot_info);
+       break;
+       case SAT_PROATV_CMD_DISPLAY_TEXT:
+               result = _sat_ui_support_processing_display_text_ind(data, slot_info);
+       break;
+       case SAT_PROATV_CMD_SELECT_ITEM:
+               result = _sat_ui_support_processing_select_item_ind(data, slot_info);
+       break;
+       case SAT_PROATV_CMD_GET_INKEY:
+               result = _sat_ui_support_processing_get_inkey_ind(data, slot_info);
+       break;
+       case SAT_PROATV_CMD_GET_INPUT:
+               result = _sat_ui_support_processing_get_input_ind(data, slot_info);
+       break;
+       case SAT_PROATV_CMD_REFRESH:
+               result = _sat_ui_support_processing_refresh_ind(data, slot_info);
+       break;
+       case SAT_PROATV_CMD_PLAY_TONE:
+               result = _sat_ui_support_processing_play_tone_ind(data, slot_info);
+       break;
+       case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT:
+               result = _sat_ui_support_processing_idle_mode_text_ind(data, slot_info);
+       break;
+       case SAT_PROATV_CMD_SETUP_EVENT_LIST:
+       break;
+       default:
+               dbg("does not need to launch sat-ui");
+       break;
        }
 
        return result;
@@ -985,52 +981,52 @@ gboolean sat_ui_support_launch_call_application(enum tel_sat_proactive_cmd_type
        bundle_data = bundle_create();
 
        appsvc_set_operation(bundle_data, APPSVC_OPERATION_CALL);
-       appsvc_set_uri(bundle_data,"tel:MT");
+       appsvc_set_uri(bundle_data, "tel:MT");
 
-       switch(cmd_type){
-               case SAT_PROATV_CMD_SETUP_CALL:{
-                       gint command_id, call_type, confirm_text_len, text_len, duration;
-                       gchar *confirm_text = NULL, *text = NULL, *call_number = NULL;
+       switch (cmd_type) {
+       case SAT_PROATV_CMD_SETUP_CALL: {
+               gint command_id, call_type, confirm_text_len, text_len, duration;
+               gchar *confirm_text = NULL, *text = NULL, *call_number = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       dbg("setup call type_format(%s)", g_variant_get_type_string(data));
+               dbg("setup call type_format(%s)", g_variant_get_type_string(data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(data, "(isisi@visi)", &command_id, &confirm_text, &confirm_text_len, &text, &text_len, &icon_id, &call_type, &call_number, &duration);
+               g_variant_get(data, "(isisi@visi)", &command_id, &confirm_text, &confirm_text_len, &text, &text_len, &icon_id, &call_type, &call_number, &duration);
 #else
-                       g_variant_get(data, "(isisiisi)", &command_id, &confirm_text, &confirm_text_len, &text, &text_len, &call_type, &call_number, &duration);
+               g_variant_get(data, "(isisiisi)", &command_id, &confirm_text, &confirm_text_len, &text, &text_len, &call_type, &call_number, &duration);
 #endif
-                       appsvc_add_data(bundle_data, "launch-type","SATSETUPCALL");
+               appsvc_add_data(bundle_data, "launch-type", "SATSETUPCALL");
 
-                       snprintf(buffer, 300, "%d",command_id);
-                       appsvc_add_data(bundle_data, "cmd_id",buffer);
-                       dbg("cmd_id(%s)",buffer);
+               snprintf(buffer, 300, "%d", command_id);
+               appsvc_add_data(bundle_data, "cmd_id", buffer);
+               dbg("cmd_id(%s)", buffer);
 
-                       snprintf(buffer, 300, "%d",call_type);
-                       appsvc_add_data(bundle_data, "cmd_qual", buffer);
-                       dbg("cmd_qual(%s)",buffer);
+               snprintf(buffer, 300, "%d", call_type);
+               appsvc_add_data(bundle_data, "cmd_qual", buffer);
+               dbg("cmd_qual(%s)", buffer);
 
-                       snprintf(buffer, 300, "%s", text);
-                       appsvc_add_data(bundle_data, "disp_text", buffer);
-                       dbg("disp_text(%s)",buffer);
+               snprintf(buffer, 300, "%s", text);
+               appsvc_add_data(bundle_data, "disp_text", buffer);
+               dbg("disp_text(%s)", buffer);
 
-                       snprintf(buffer, 300, "%s", call_number);
-                       appsvc_add_data(bundle_data, "call_num", buffer);
-                       dbg("call_num(%s)",buffer);
+               snprintf(buffer, 300, "%s", call_number);
+               appsvc_add_data(bundle_data, "call_num", buffer);
+               dbg("call_num(%s)", buffer);
 
-                       snprintf(buffer, 300, "%d", duration);
-                       appsvc_add_data(bundle_data, "dur", buffer);
-                       dbg("dur(%s)",buffer);
+               snprintf(buffer, 300, "%d", duration);
+               appsvc_add_data(bundle_data, "dur", buffer);
+               dbg("dur(%s)", buffer);
 
-                       g_free(confirm_text);
-                       g_free(text);
-                       g_free(call_number);
-               } break;
+               g_free(confirm_text);
+               g_free(text);
+               g_free(call_number);
+       } break;
 
-               default:
-                       bundle_free(bundle_data);
-                       return FALSE;
-               break;
+       default:
+               bundle_free(bundle_data);
+               return FALSE;
+       break;
        }
 
        snprintf(slot_info, 2, "%d", slot_id);
@@ -1055,52 +1051,51 @@ gboolean sat_ui_support_launch_browser_application(enum tel_sat_proactive_cmd_ty
 
        appsvc_set_pkgname(bundle_data, "org.tizen.browser");
 
-       switch(cmd_type){
-               case SAT_PROATV_CMD_LAUNCH_BROWSER:{
-                       gint command_id, launch_type, browser_id;
-                       gint url_len, text_len, gateway_proxy_len;
-                       gchar *url = NULL, *text = NULL, *gateway_proxy = NULL;
+       switch (cmd_type) {
+       case SAT_PROATV_CMD_LAUNCH_BROWSER: {
+               gint command_id, launch_type, browser_id;
+               gint url_len, text_len, gateway_proxy_len;
+               gchar *url = NULL, *text = NULL, *gateway_proxy = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id = NULL;
+               GVariant *icon_id = NULL;
 #endif
-                       dbg("launch_browser type_format(%s)", g_variant_get_type_string(data));
+               dbg("launch_browser type_format(%s)", g_variant_get_type_string(data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(data, "(iiisisisi@v)", &command_id, &launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len, &icon_id);
+               g_variant_get(data, "(iiisisisi@v)", &command_id, &launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len, &icon_id);
 #else
-                       g_variant_get(data, "(iiisisisi)", &command_id, &launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len);
+               g_variant_get(data, "(iiisisisi)", &command_id, &launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len);
 #endif
-                       if(!url || strlen(url) < 7){
-                               g_free(url);
-                               url = g_strdup("http://");
-                       }
-                       dbg("url (%s)", url);
-                       appsvc_set_uri(bundle_data, url);
+               if (!url || strlen(url) < 7) {
                        g_free(url);
+                       url = g_strdup("http://");
+               }
+               dbg("url (%s)", url);
+               appsvc_set_uri(bundle_data, url);
+               g_free(url);
 
-                       snprintf(buffer, 300, "%d",TRUE);
-                       appsvc_add_data(bundle_data, "sat",buffer);
-
-                       snprintf(buffer, 300, "%d",command_id);
-                       appsvc_add_data(bundle_data, "cmd_id",buffer);
-                       dbg("cmd_id(%s)",buffer);
+               snprintf(buffer, 300, "%d", TRUE);
+               appsvc_add_data(bundle_data, "sat", buffer);
 
-                       snprintf(buffer, 300, "%d",launch_type);
-                       appsvc_add_data(bundle_data, "launch_type", buffer);
-                       dbg("launch_type(%s)",buffer);
+               snprintf(buffer, 300, "%d", command_id);
+               appsvc_add_data(bundle_data, "cmd_id", buffer);
+               dbg("cmd_id(%s)", buffer);
 
-                       snprintf(buffer, 300, "%s", gateway_proxy);
-                       appsvc_add_data(bundle_data, "proxy", buffer);
-                       dbg("proxy(%s)",buffer);
+               snprintf(buffer, 300, "%d", launch_type);
+               appsvc_add_data(bundle_data, "launch_type", buffer);
+               dbg("launch_type(%s)", buffer);
 
-                       g_free(text);
-                       g_free(gateway_proxy);
+               snprintf(buffer, 300, "%s", gateway_proxy);
+               appsvc_add_data(bundle_data, "proxy", buffer);
+               dbg("proxy(%s)", buffer);
 
-               } break;
+               g_free(text);
+               g_free(gateway_proxy);
+       } break;
 
-               default:
-                       bundle_free(bundle_data);
-                       return FALSE;
-               break;
+       default:
+               bundle_free(bundle_data);
+               return FALSE;
+       break;
        }
 
        snprintf(slot_info, 2, "%d", slot_id);
@@ -1124,73 +1119,71 @@ gboolean sat_ui_support_launch_ciss_application(enum tel_sat_proactive_cmd_type
        bundle_data = bundle_create();
        appsvc_set_pkgname(bundle_data, "org.tizen.ciss");
 
-       switch(cmd_type){
-               case SAT_PROATV_CMD_SEND_SS:{
-                       TelSatSendSsIndSsData_t ss_info;
-
-                       gint command_id, ton, npi;
-                       gint text_len, ss_str_len;
-                       gchar* text = NULL, *ss_string = NULL;
+       switch (cmd_type) {
+       case SAT_PROATV_CMD_SEND_SS: {
+               TelSatSendSsIndSsData_t ss_info;
+               gint command_id, ton, npi;
+               gint text_len, ss_str_len;
+               gchar* text = NULL, *ss_string = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       dbg("launch ciss ui for send ss proactive cmd");
+               dbg("launch ciss ui for send ss proactive cmd");
 
-                       memset(&ss_info, 0, sizeof(TelSatSendSsIndSsData_t));
+               memset(&ss_info, 0, sizeof(TelSatSendSsIndSsData_t));
 
-                       dbg("send ss type_format(%s)", g_variant_get_type_string(data));
+               dbg("send ss type_format(%s)", g_variant_get_type_string(data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(data, "(isi@viiis)", &command_id, &text, &text_len, &icon_id, &ton, &npi, &ss_str_len, &ss_string);
+               g_variant_get(data, "(isi@viiis)", &command_id, &text, &text_len, &icon_id, &ton, &npi, &ss_str_len, &ss_string);
 #else
-                       g_variant_get(data, "(isiiiis)", &command_id, &text, &text_len, &ton, &npi, &ss_str_len, &ss_string);
+               g_variant_get(data, "(isiiiis)", &command_id, &text, &text_len, &ton, &npi, &ss_str_len, &ss_string);
 #endif
-                       ss_info.commandId = command_id;
-                       ss_info.ton = ton;
-                       ss_info.npi = npi;
-                       memcpy(ss_info.ssString, ss_string, TAPI_SAT_DEF_SS_LEN_MAX+1);
-                       ss_info.ssStringLen = ss_str_len;
-                       g_free(text);
-                       g_free(ss_string);
-
-                       cmd = g_strdup_printf("%d", cmd_type);
-                       encoded_data = g_base64_encode((const guchar*)&ss_info, sizeof(TelSatSendSsIndSsData_t));
-               } break;
-
-               case SAT_PROATV_CMD_SEND_USSD:{
-                       TelSatSendUssdIndUssdData_t ussd_info;
-
-                       gint command_id;
-                       gint text_len, ussd_str_len;
-                       guchar dcs;
-                       gchar* text = NULL, *ussd_string = NULL;
+               ss_info.commandId = command_id;
+               ss_info.ton = ton;
+               ss_info.npi = npi;
+               memcpy(ss_info.ssString, ss_string, TAPI_SAT_DEF_SS_LEN_MAX+1);
+               ss_info.ssStringLen = ss_str_len;
+               g_free(text);
+               g_free(ss_string);
+
+               cmd = g_strdup_printf("%d", cmd_type);
+               encoded_data = g_base64_encode((const guchar*)&ss_info, sizeof(TelSatSendSsIndSsData_t));
+       } break;
+
+       case SAT_PROATV_CMD_SEND_USSD:{
+               TelSatSendUssdIndUssdData_t ussd_info;
+               gint command_id;
+               gint text_len, ussd_str_len;
+               guchar dcs;
+               gchar* text = NULL, *ussd_string = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       dbg("launch ciss ui for send ussd proactive cmd");
+               dbg("launch ciss ui for send ussd proactive cmd");
 
-                       memset(&ussd_info, 0, sizeof(TelSatSendUssdIndUssdData_t));
+               memset(&ussd_info, 0, sizeof(TelSatSendUssdIndUssdData_t));
 
-                       dbg("send ussd type_format(%s)", g_variant_get_type_string(data));
+               dbg("send ussd type_format(%s)", g_variant_get_type_string(data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(data, "(isi@vyis)", &command_id, &text, &text_len, &icon_id, &dcs, &ussd_str_len, &ussd_string);
+               g_variant_get(data, "(isi@vyis)", &command_id, &text, &text_len, &icon_id, &dcs, &ussd_str_len, &ussd_string);
 #else
-                       g_variant_get(data, "(isiyis)", &command_id, &text, &text_len, &dcs, &ussd_str_len, &ussd_string);
+               g_variant_get(data, "(isiyis)", &command_id, &text, &text_len, &dcs, &ussd_str_len, &ussd_string);
 #endif
-                       ussd_info.commandId = command_id;
-                       ussd_info.rawDcs = dcs;
-                       memcpy(ussd_info.ussdString, ussd_string, TAPI_SAT_DEF_USSD_LEN_MAX+1);
-                       ussd_info.ussdStringLen = ussd_str_len;
-                       g_free(text);
-                       g_free(ussd_string);
-
-                       cmd = g_strdup_printf("%d", cmd_type);
-                       encoded_data = g_base64_encode((const guchar*)&ussd_info, sizeof(TelSatSendUssdIndUssdData_t));
-               } break;
-
-               default:
-                       bundle_free(bundle_data);
-                       return FALSE;
-               break;
+               ussd_info.commandId = command_id;
+               ussd_info.rawDcs = dcs;
+               memcpy(ussd_info.ussdString, ussd_string, TAPI_SAT_DEF_USSD_LEN_MAX+1);
+               ussd_info.ussdStringLen = ussd_str_len;
+               g_free(text);
+               g_free(ussd_string);
+
+               cmd = g_strdup_printf("%d", cmd_type);
+               encoded_data = g_base64_encode((const guchar*)&ussd_info, sizeof(TelSatSendUssdIndUssdData_t));
+       } break;
+
+       default:
+               bundle_free(bundle_data);
+               return FALSE;
+       break;
        }
 
        snprintf(slot_info, 2, "%d", slot_id);
@@ -1221,50 +1214,50 @@ gboolean sat_ui_support_launch_setting_application(enum tel_sat_proactive_cmd_ty
 
        /*TODO : need to make a sync with app engineer*/
 
-       switch(cmd_type){
-               case SAT_PROATV_CMD_LANGUAGE_NOTIFICATION:{
-                       gint command_id, call_type, text_len, duration;
-                       gchar *text = NULL, *call_number = NULL;
+       switch (cmd_type) {
+       case SAT_PROATV_CMD_LANGUAGE_NOTIFICATION: {
+               gint command_id, call_type, text_len, duration;
+               gchar *text = NULL, *call_number = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       dbg("setup call type_format(%s)", g_variant_get_type_string(data));
+               dbg("setup call type_format(%s)", g_variant_get_type_string(data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(data, "(isi@visi)", &command_id, &text, &text_len, &icon_id, &call_type, &call_number, &duration);
+               g_variant_get(data, "(isi@visi)", &command_id, &text, &text_len, &icon_id, &call_type, &call_number, &duration);
 #else
-                       g_variant_get(data, "(isiisi)", &command_id, &text, &text_len, &call_type, &call_number, &duration);
+               g_variant_get(data, "(isiisi)", &command_id, &text, &text_len, &call_type, &call_number, &duration);
 #endif
-                       bundle_add(bundle_data, "launch-type","SATSETUPCALL");
+               bundle_add(bundle_data, "launch-type", "SATSETUPCALL");
 
-                       snprintf(buffer, 300, "%d",command_id);
-                       bundle_add(bundle_data, "cmd_id",buffer);
-                       dbg("cmd_id(%s)",buffer);
+               snprintf(buffer, 300, "%d", command_id);
+               bundle_add(bundle_data, "cmd_id", buffer);
+               dbg("cmd_id(%s)", buffer);
 
-                       snprintf(buffer, 300, "%d",call_type);
-                       bundle_add(bundle_data, "cmd_qual", buffer);
-                       dbg("cmd_qual(%s)",buffer);
+               snprintf(buffer, 300, "%d", call_type);
+               bundle_add(bundle_data, "cmd_qual", buffer);
+               dbg("cmd_qual(%s)", buffer);
 
-                       snprintf(buffer, 300, "%s", text);
-                       bundle_add(bundle_data, "disp_text", buffer);
-                       dbg("disp_text(%s)",buffer);
+               snprintf(buffer, 300, "%s", text);
+               bundle_add(bundle_data, "disp_text", buffer);
+               dbg("disp_text(%s)", buffer);
 
-                       snprintf(buffer, 300, "%s", call_number);
-                       bundle_add(bundle_data, "call_num", buffer);
-                       dbg("call_num(%s)",buffer);
+               snprintf(buffer, 300, "%s", call_number);
+               bundle_add(bundle_data, "call_num", buffer);
+               dbg("call_num(%s)", buffer);
 
-                       snprintf(buffer, 300, "%d", duration);
-                       bundle_add(bundle_data, "dur", buffer);
-                       dbg("dur(%s)",buffer);
+               snprintf(buffer, 300, "%d", duration);
+               bundle_add(bundle_data, "dur", buffer);
+               dbg("dur(%s)", buffer);
 
-                       g_free(text);
-                       g_free(call_number);
-               } break;
+               g_free(text);
+               g_free(call_number);
+       } break;
 
-               case SAT_PROATV_CMD_PROVIDE_LOCAL_INFO:
-                       break;
+       case SAT_PROATV_CMD_PROVIDE_LOCAL_INFO:
+               break;
 
-               default:
-                       return FALSE;
+       default:
+               return FALSE;
                break;
        }
 
@@ -1272,7 +1265,7 @@ gboolean sat_ui_support_launch_setting_application(enum tel_sat_proactive_cmd_ty
        dbg("slot_id : [%s]", slot_info);
        bundle_add(bundle_data, "slot_id", slot_info);
 
-       rv = aul_launch_app("org.tizen.call",bundle_data);
+       rv = aul_launch_app("org.tizen.call", bundle_data);
        dbg("rv of aul_launch_app()=[%d]", rv);
        bundle_free(bundle_data);
 
@@ -1285,108 +1278,119 @@ gboolean sat_ui_support_exec_bip(GDBusConnection *connection, const gchar *path,
        gchar *signal_name = NULL;
        GVariant *out_param = NULL;
 
-       switch(cmd_type){
-               case SAT_PROATV_CMD_OPEN_CHANNEL:{
-                       gint command_id, bearer_type, protocol_type, dest_addr_type;
-                       gboolean immediate_link, auto_reconnection, bg_mode;
-                       gint text_len, buffer_size, port_number;
-                       gchar *text = NULL, *dest_address = NULL;
-                       GVariant *bearer_param;
-                       GVariant *bearer_detail;
+       switch (cmd_type) {
+       case SAT_PROATV_CMD_OPEN_CHANNEL:{
+               gint command_id, bearer_type, protocol_type, dest_addr_type;
+               gboolean immediate_link, auto_reconnection, bg_mode;
+               gint text_len, buffer_size, port_number;
+               gchar *text = NULL, *dest_address = NULL;
+               GVariant *bearer_param;
+               GVariant *bearer_detail;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       dbg("open channel type_format(%s)", g_variant_get_type_string(data));
+               dbg("open channel type_format(%s)", g_variant_get_type_string(data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(data,"(isi@vbbbiviiiisv)", &command_id, &text, &text_len, &icon_id, &immediate_link, &auto_reconnection, &bg_mode,
-                                       &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
+               g_variant_get(data, "(isi@vbbbiviiiisv)", &command_id, &text,
+                       &text_len, &icon_id, &immediate_link, &auto_reconnection,
+                       &bg_mode, &bearer_type, &bearer_param, &buffer_size,
+                       &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
 #else
-                       g_variant_get(data,"(isibbbiviiiisv)", &command_id, &text, &text_len, &immediate_link, &auto_reconnection, &bg_mode,
-                                                               &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);
+               g_variant_get(data, "(isibbbiviiiisv)", &command_id, &text,
+                       &text_len, &immediate_link, &auto_reconnection, &bg_mode,
+                       &bearer_type, &bearer_param, &buffer_size, &protocol_type,
+                       &port_number, &dest_addr_type, &dest_address, &bearer_detail);
 #endif
-                       out_param = g_variant_new("(isibbbiviiiisv)", command_id, text, text_len, immediate_link, auto_reconnection, bg_mode,
-                               bearer_type, bearer_param, buffer_size, protocol_type, port_number, dest_addr_type, dest_address, bearer_detail);
-                       signal_name = g_strdup("OpenChannel");
-
-                       g_free(text);
-                       g_free(dest_address);
-               } break;
-               case SAT_PROATV_CMD_CLOSE_CHANNEL:{
-                       gint command_id, channel_id, text_len;
-                       gchar *text = NULL;
+               out_param = g_variant_new("(isibbbiviiiisv)", command_id, text,
+                       text_len, immediate_link, auto_reconnection, bg_mode,
+                       bearer_type, bearer_param, buffer_size, protocol_type,
+                       port_number, dest_addr_type, dest_address, bearer_detail);
+               signal_name = g_strdup("OpenChannel");
+
+               g_free(text);
+               g_free(dest_address);
+       } break;
+       case SAT_PROATV_CMD_CLOSE_CHANNEL:{
+               gint command_id, channel_id, text_len;
+               gchar *text = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       dbg("close channel type_format(%s)", g_variant_get_type_string(data));
+               dbg("close channel type_format(%s)", g_variant_get_type_string(data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(data, "(isi@vi)", &command_id, &text, &text_len, &icon_id, &channel_id);
+               g_variant_get(data, "(isi@vi)", &command_id, &text, &text_len, &icon_id, &channel_id);
 #else
-                       g_variant_get(data, "(isii)", &command_id, &text, &text_len, &channel_id);
+               g_variant_get(data, "(isii)", &command_id, &text, &text_len, &channel_id);
 #endif
-                       out_param = g_variant_new("(isii)", command_id, text, text_len, channel_id);
-                       signal_name = g_strdup("CloseChannel");
-
-                       g_free(text);
-               } break;
-               case SAT_PROATV_CMD_RECEIVE_DATA:{
-                       gint command_id, text_len, channel_id, channel_data_len = 0;
-                       gchar *text = NULL;
+               out_param = g_variant_new("(isii)", command_id, text, text_len, channel_id);
+               signal_name = g_strdup("CloseChannel");
+
+               g_free(text);
+       } break;
+       case SAT_PROATV_CMD_RECEIVE_DATA:{
+               gint command_id, text_len, channel_id, channel_data_len = 0;
+               gchar *text = NULL;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       dbg("receive data type_format(%s)", g_variant_get_type_string(data));
+               dbg("receive data type_format(%s)", g_variant_get_type_string(data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(data, "(isi@vii)", &command_id, &text, &text_len, &icon_id, &channel_id, &channel_data_len);
+               g_variant_get(data, "(isi@vii)", &command_id, &text, &text_len, &icon_id, &channel_id, &channel_data_len);
 #else
-                       g_variant_get(data, "(isiii)", &command_id, &text, &text_len, &channel_id, &channel_data_len);
+               g_variant_get(data, "(isiii)", &command_id, &text, &text_len, &channel_id, &channel_data_len);
 #endif
-                       out_param = g_variant_new("(isiii)", command_id, text, text_len, channel_id, channel_data_len);
-                       signal_name = g_strdup("ReceiveData");
-
-                       g_free(text);
-               } break;
-               case SAT_PROATV_CMD_SEND_DATA:{
-                       gint command_id, channel_id, text_len, channel_data_len;
-                       gboolean send_data_immediately;
-                       gchar *text = NULL;
-                       GVariant *channel_data;
+               out_param = g_variant_new("(isiii)", command_id, text, text_len, channel_id, channel_data_len);
+               signal_name = g_strdup("ReceiveData");
+
+               g_free(text);
+       } break;
+       case SAT_PROATV_CMD_SEND_DATA:{
+               gint command_id, channel_id, text_len, channel_data_len;
+               gboolean send_data_immediately;
+               gchar *text = NULL;
+               GVariant *channel_data;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       GVariant *icon_id;
+               GVariant *icon_id;
 #endif
-                       dbg("send data type_format(%s)", g_variant_get_type_string(data));
+               dbg("send data type_format(%s)", g_variant_get_type_string(data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(data, "(isi@vibvi)", &command_id, &text, &text_len, &icon_id, &channel_id, &send_data_immediately, &channel_data, &channel_data_len);
+               g_variant_get(data, "(isi@vibvi)", &command_id, &text,
+                       &text_len, &icon_id, &channel_id, &send_data_immediately,
+                       &channel_data, &channel_data_len);
 #else
-                       g_variant_get(data, "(isiibvi)", &command_id, &text, &text_len, &channel_id, &send_data_immediately, &channel_data, &channel_data_len);
+               g_variant_get(data, "(isiibvi)", &command_id, &text,
+                       &text_len, &channel_id, &send_data_immediately,
+                       &channel_data, &channel_data_len);
 #endif
-                       out_param = g_variant_new("(isiibvi)", command_id, text, text_len, channel_id, send_data_immediately, channel_data, channel_data_len);
-                       signal_name = g_strdup("SendData");
-
-                       g_free(text);
-               } break;
-               case SAT_PROATV_CMD_GET_CHANNEL_STATUS:{
-                       gint command_id;
-
-                       dbg("get channel status type_format(%s)", g_variant_get_type_string(data));
-                       g_variant_get(data, "(i)", &command_id);
-
-                       out_param = g_variant_new("(i)", command_id);
-                       signal_name = g_strdup("GetChannelStatus");
-               } break;
-               case SAT_PROATV_CMD_SETUP_EVENT_LIST:{
-                       gint event_cnt;
-                       GVariant *evt_list;
-
-                       dbg("setup event list type_format(%s)", g_variant_get_type_string(data));
-                       g_variant_get(data, "(iv)", &event_cnt, &evt_list);
-
-                       out_param = g_variant_new("(iv)", event_cnt, evt_list);
-                       signal_name = g_strdup("SetupEventList");
-               } break;
-               default:
-                       dbg("no matched command");
-                       return FALSE;
-               break;
+               out_param = g_variant_new("(isiibvi)", command_id, text,
+                       text_len, channel_id, send_data_immediately, channel_data, channel_data_len);
+               signal_name = g_strdup("SendData");
+
+               g_free(text);
+       } break;
+       case SAT_PROATV_CMD_GET_CHANNEL_STATUS:{
+               gint command_id;
+
+               dbg("get channel status type_format(%s)", g_variant_get_type_string(data));
+               g_variant_get(data, "(i)", &command_id);
+
+               out_param = g_variant_new("(i)", command_id);
+               signal_name = g_strdup("GetChannelStatus");
+       } break;
+       case SAT_PROATV_CMD_SETUP_EVENT_LIST:{
+               gint event_cnt;
+               GVariant *evt_list;
+
+               dbg("setup event list type_format(%s)", g_variant_get_type_string(data));
+               g_variant_get(data, "(iv)", &event_cnt, &evt_list);
+
+               out_param = g_variant_new("(iv)", event_cnt, evt_list);
+               signal_name = g_strdup("SetupEventList");
+       } break;
+       default:
+               dbg("no matched command");
+               return FALSE;
+       break;
        }
 
        dbg("dbus conn(%p), path(%s)", connection, path);
@@ -1409,17 +1413,17 @@ gboolean sat_ui_support_exec_evtdw(GDBusConnection *connection, const gchar *pat
 
        dbg("dbus conn(%p), path(%s)", connection, path);
 
-       if(g_str_has_suffix(path , "0")){
+       if (g_str_has_suffix(path , "0")) {
                interface_name = g_strdup("org.tizen.sat-event-downloader");
 
-       } else if (g_str_has_suffix(path , "1")){
+       } else if (g_str_has_suffix(path , "1")) {
                interface_name = g_strdup("org.tizen.sat-event-downloader-2");
        } else {
                err("invalid sim slot id");
                return FALSE;
        }
 
-       if (cmd_type == SAT_PROATV_CMD_SETUP_EVENT_LIST){
+       if (cmd_type == SAT_PROATV_CMD_SETUP_EVENT_LIST) {
                dbg("setup event list type_format(%s)", g_variant_get_type_string(data));
                g_variant_get(data, "(iv)", &event_cnt, &evt_list);
 
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 0ce5669..0e8eb78
--- a/src/sim.c
+++ b/src/sim.c
 #define DBUS_SIM_GET_COSIM(invocation, co_sim, server) { \
        co_sim = __get_sim_co_by_cp_name(server, GET_CP_NAME(invocation)); \
        if (!co_sim) { \
-               err("SIM Core object is NULL"); \
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED); \
+               err("[%s] SIM Core object is NULL", GET_CP_NAME(invocation)); \
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED); \
                return TRUE; \
        } \
 }
 
-#define DBUS_SIM_CHECK_SIM_STATUS(op_type, co_sim) {\
+#define DBUS_SIM_CHECK_SIM_STATUS(invocation, op_type, co_sim) {\
        if (__check_sim_state(op_type, tcore_sim_get_status(co_sim)) == FALSE) { \
-               err("Invalid SIM status"); \
+               err("[%s] Invalid SIM status", GET_CP_NAME(invocation)); \
                __return_fail_response(invocation, tcore_sim_get_status(co_sim)); \
                return TRUE; \
        } \
        } \
 }
 
-#define DBUS_SIM_CHECK_SIM_SERVICE_TABLE(op_type, co_sim) {\
+#define DBUS_SIM_CHECK_SIM_SERVICE_TABLE(invocation, op_type, co_sim) {\
        gboolean b_cphs = FALSE; \
        b_cphs = tcore_sim_get_cphs_status(co_sim); \
        if (b_cphs && op_type != GET_MSISDN) { \
-               dbg("CPHS SIM... Do not check SST"); \
+               dbg("[%s] CPHS SIM... Do not check SST", GET_CP_NAME(invocation)); \
        } else { \
                struct tel_sim_service_table* svct = tcore_sim_get_service_table(co_sim); \
                if (svct != NULL) { \
                        if (__check_sim_service_table(op_type, svct) == FALSE) { \
-                               err("'Service' is disabled in SST"); \
+                               err("[%s] 'Service' is disabled in SST", GET_CP_NAME(invocation)); \
                                FAIL_RESPONSE(invocation, DBUS_SIM_SERVICE_IS_DISABLED); \
                                free(svct); \
                                return TRUE; \
                        } else { \
-                               dbg("Request to modem"); \
+                               dbg("[%s] Request to modem", GET_CP_NAME(invocation)); \
                                free(svct); \
                        } \
                } \
 #define DBUS_SIM_CHECK_DISPATCH_RET(ret, invocation, ur) {\
        if (ret != TCORE_RETURN_SUCCESS) { \
                if (ret == TCORE_RETURN_SIM_DISABLED_IN_SST) { \
-                       err("'Service' is disabled in SST"); \
-                       FAIL_RESPONSE (invocation, DBUS_SIM_SERVICE_IS_DISABLED); \
+                       err("[%s] 'Service' is disabled in SST", GET_CP_NAME(invocation)); \
+                       FAIL_RESPONSE(invocation, DBUS_SIM_SERVICE_IS_DISABLED); \
                } else { \
-                       err("Dispatch request failed: [0x%x]", ret); \
-                       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED); \
+                       err("[%s] Dispatch request failed: [0x%x]", GET_CP_NAME(invocation), ret); \
+                       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED); \
                } \
                tcore_user_request_unref(ur); \
        } \
 }
 
 enum dbus_tapi_sim_gdbus_method_name {
-        /* EF Get */
+       /* EF Get */
        GET_INIT_STATUS = 1,
        GET_CARD_TYPE,
        GET_IMSI,
@@ -143,7 +143,7 @@ enum dbus_tapi_sim_gdbus_method_name {
        GET_LOCK_INFO,
        TRANSFER_APDU,
        GET_ATR,
-       GET_FIELDS = 30,        //for get various data at once
+       GET_FIELDS = 30,        /* for get various data at once */
        GET_GID,
        SET_POWERSTATE,
        GET_IMPI,
@@ -160,7 +160,7 @@ enum dbus_tapi_sim_gdbus_method_name {
 
 static gboolean __is_valid_sim_status(enum tel_sim_status sim_status)
 {
-       switch(sim_status) {
+       switch (sim_status) {
        case SIM_STATUS_INIT_COMPLETED:
        case SIM_STATUS_INITIALIZING:
        case SIM_STATUS_PIN_REQUIRED:
@@ -226,7 +226,7 @@ static gboolean __check_sim_state(enum dbus_tapi_sim_gdbus_method_name method, e
        case AUTHENTICATION:
        case TRANSFER_APDU:
        case GET_ATR:
-       // Regarding Lock facilities
+       /* Regarding Lock facilities */
        case CHANGE_PIN:
        case ENABLE_FACILITY:
        case DISABLE_FACILITY:
@@ -263,9 +263,8 @@ static gboolean __check_sim_state(enum dbus_tapi_sim_gdbus_method_name method, e
        case GET_PCSCF:
        case GET_APP_LIST:
        case GET_ISIM_SERVICE_TABLE:
-               if (sim_status != SIM_STATUS_INIT_COMPLETED) {
+               if (sim_status != SIM_STATUS_INIT_COMPLETED)
                        ret = FALSE;
-               }
        break;
        case SET_POWERSTATE:
                if (sim_status != SIM_STATUS_INIT_COMPLETED
@@ -292,29 +291,29 @@ static gboolean __check_sim_service_table(enum dbus_tapi_sim_gdbus_method_name m
 
        switch (method) {
        case GET_MSISDN:
-               if ( !(svct->sim_type == SIM_TYPE_GSM && svct->table.sst.service[SIM_SST_MSISDN]) &&
-                               !(svct->sim_type == SIM_TYPE_USIM && svct->table.ust.service[SIM_UST_MSISDN]) ) {
+               if (!(svct->sim_type == SIM_TYPE_GSM && svct->table.sst.service[SIM_SST_MSISDN]) &&
+                               !(svct->sim_type == SIM_TYPE_USIM && svct->table.ust.service[SIM_UST_MSISDN])) {
                        ret = FALSE;
                }
        break;
        case GET_CALL_FORWARDING:
        case SET_CALL_FORWARDING:
-               if ( !(svct->sim_type == SIM_TYPE_GSM && svct->table.sst.service[SIM_SST_CFIS]) &&
-                               !(svct->sim_type == SIM_TYPE_USIM && svct->table.ust.service[SIM_UST_CFIS]) ) {
+               if (!(svct->sim_type == SIM_TYPE_GSM && svct->table.sst.service[SIM_SST_CFIS]) &&
+                               !(svct->sim_type == SIM_TYPE_USIM && svct->table.ust.service[SIM_UST_CFIS])) {
                        ret = FALSE;
                }
        break;
        case GET_MESSAGE_WAITING:
        case SET_MESSAGE_WAITING:
-               if ( !(svct->sim_type == SIM_TYPE_GSM && svct->table.sst.service[SIM_SST_MWIS]) &&
-                               !(svct->sim_type == SIM_TYPE_USIM && svct->table.ust.service[SIM_UST_MWIS]) ) {
+               if (!(svct->sim_type == SIM_TYPE_GSM && svct->table.sst.service[SIM_SST_MWIS]) &&
+                               !(svct->sim_type == SIM_TYPE_USIM && svct->table.ust.service[SIM_UST_MWIS])) {
                        ret = FALSE;
                }
        break;
        case GET_MAILBOX:
        case SET_MAILBOX:
-               if ( !(svct->sim_type == SIM_TYPE_GSM && svct->table.sst.service[SIM_SST_MBDN]) &&
-                               !(svct->sim_type == SIM_TYPE_USIM && svct->table.ust.service[SIM_UST_MBDN]) ) {
+               if (!(svct->sim_type == SIM_TYPE_GSM && svct->table.sst.service[SIM_SST_MBDN]) &&
+                               !(svct->sim_type == SIM_TYPE_USIM && svct->table.ust.service[SIM_UST_MBDN])) {
                        ret = FALSE;
                }
        break;
@@ -328,7 +327,7 @@ static gboolean __check_sim_service_table(enum dbus_tapi_sim_gdbus_method_name m
 
 static void __return_fail_response(GDBusMethodInvocation *invocation, enum tel_sim_status sim_status)
 {
-       dbg("SIM Status: [%d]", sim_status);
+       dbg("[%s] SIM Status: [%d]", GET_CP_NAME(invocation), sim_status);
 
        switch (sim_status) {
        case SIM_STATUS_CARD_NOT_PRESENT:
@@ -374,17 +373,17 @@ static gboolean on_sim_get_init_status(TelephonySim *sim, GDBusMethodInvocation
        enum tel_sim_status sim_status = SIM_STATUS_UNKNOWN;
        gboolean sim_changed = FALSE;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
 
        sim_status = tcore_sim_get_status(co_sim);
        sim_changed = tcore_sim_get_identification(co_sim);
-       dbg("SIM - Status: [%d] Changed: [%s]",
-               sim_status, (sim_changed ? "Yes" : "No"));
+       dbg("[%s] SIM - Status: [%d] Changed: [%s]",
+               GET_CP_NAME(invocation), sim_status, (sim_changed ? "Yes" : "No"));
 
        telephony_sim_complete_get_init_status(sim, invocation, sim_status, sim_changed);
 
@@ -397,13 +396,13 @@ static gboolean on_sim_get_card_type(TelephonySim *sim, GDBusMethodInvocation *i
        struct custom_data *ctx = user_data;
        enum tel_sim_type sim_type = SIM_TYPE_UNKNOWN;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_CARD_TYPE, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_CARD_TYPE, co_sim);
 
        sim_type = tcore_sim_get_type(co_sim);
 
@@ -418,17 +417,17 @@ static gboolean on_sim_get_imsi(TelephonySim *sim, GDBusMethodInvocation *invoca
        struct custom_data *ctx = user_data;
        struct tel_sim_imsi *n_imsi;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_IMSI, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_IMSI, co_sim);
 
        n_imsi = tcore_sim_get_imsi(co_sim);
        if (!n_imsi) {
-               FAIL_RESPONSE (invocation, DBUS_SIM_RESPONSE_DATA_ERROR);
+               FAIL_RESPONSE(invocation, DBUS_SIM_RESPONSE_DATA_ERROR);
                return TRUE;
        } else {
                telephony_sim_complete_get_imsi(sim, invocation, n_imsi->plmn, n_imsi->msin);
@@ -444,13 +443,13 @@ static gboolean on_sim_get_ecc(TelephonySim *sim, GDBusMethodInvocation *invocat
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct tel_sim_ecc_list *ecc_list = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_ECC, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_ECC, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get ECC");
 
        ecc_list = tcore_sim_get_ecc_list(co_sim);
@@ -458,13 +457,13 @@ static gboolean on_sim_get_ecc(TelephonySim *sim, GDBusMethodInvocation *invocat
                struct custom_data *ctx = user_data;
                UserRequest *ur = NULL;
                TReturn ret;
-               dbg("po->ecc_list is NULL. Request to Modem.");
+               dbg("[%s] po->ecc_list is NULL. Request to Modem.", GET_CP_NAME(invocation));
                ur = MAKE_UR(ctx, sim, invocation);
                tcore_user_request_set_command(ur, TREQ_SIM_GET_ECC);
                ret = tcore_communicator_dispatch_request(ctx->comm, ur);
                if (ret != TCORE_RETURN_SUCCESS) {
-                       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-                       dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+                       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+                       dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                        tcore_user_request_unref(ur);
                }
        } else {
@@ -472,9 +471,12 @@ static gboolean on_sim_get_ecc(TelephonySim *sim, GDBusMethodInvocation *invocat
                GVariantBuilder b;
                int i;
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-               for (i = 0; i<ecc_list->ecc_count; i++) {
-                       dbg("ecc[%d] : ecc_category=[0x%x], ecc_num=[%s], ecc_string=[%s]",
-                                       i, ecc_list->ecc[i].ecc_category, ecc_list->ecc[i].ecc_num, ecc_list->ecc[i].ecc_string);
+               for (i = 0; i < ecc_list->ecc_count; i++) {
+                       dbg("[%s] ecc[%d] : ecc_category=[0x%x], ecc_num=[%s], ecc_string=[%s]",
+                               GET_CP_NAME(invocation), i,
+                               ecc_list->ecc[i].ecc_category,
+                               ecc_list->ecc[i].ecc_num,
+                               ecc_list->ecc[i].ecc_string);
                        g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "category", g_variant_new_int32(ecc_list->ecc[i].ecc_category));
                        g_variant_builder_add(&b, "{sv}", "number", g_variant_new_string(ecc_list->ecc[i].ecc_num));
@@ -483,7 +485,7 @@ static gboolean on_sim_get_ecc(TelephonySim *sim, GDBusMethodInvocation *invocat
                }
                gv = g_variant_builder_end(&b);
                if (!gv)
-                       dbg("error - ecc gv is NULL");
+                       err("error - ecc gv is NULL");
 
                telephony_sim_complete_get_ecc(sim, invocation, gv);
 
@@ -501,15 +503,13 @@ static gboolean on_sim_get_iccid(TelephonySim *sim, GDBusMethodInvocation *invoc
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct tel_sim_iccid* iccid = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
-
-       dbg("Func Entrance");
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_ICCID, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_ICCID, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get ICCID");
 
        iccid = tcore_sim_get_iccid(co_sim);
@@ -521,7 +521,7 @@ static gboolean on_sim_get_iccid(TelephonySim *sim, GDBusMethodInvocation *invoc
                ret = tcore_communicator_dispatch_request(ctx->comm, ur);
 
                if (ret != TCORE_RETURN_SUCCESS) {
-                       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+                       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                        dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                        tcore_user_request_unref(ur);
                }
@@ -541,13 +541,13 @@ static gboolean on_sim_get_language(TelephonySim *sim, GDBusMethodInvocation *in
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_LANGUAGE, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_LANGUAGE, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get Language");
 
        ur = MAKE_UR(ctx, sim, invocation);
@@ -555,8 +555,8 @@ static gboolean on_sim_get_language(TelephonySim *sim, GDBusMethodInvocation *in
        tcore_user_request_set_command(ur, TREQ_SIM_GET_LANGUAGE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -571,13 +571,13 @@ static gboolean on_sim_set_language(TelephonySim *sim, GDBusMethodInvocation *in
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_set_language set_language;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(SET_LANGUAGE, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_LANGUAGE, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Set Language");
 
        memset(&set_language, 0, sizeof(struct treq_sim_set_language));
@@ -590,8 +590,8 @@ static gboolean on_sim_set_language(TelephonySim *sim, GDBusMethodInvocation *in
        tcore_user_request_set_command(ur, TREQ_SIM_SET_LANGUAGE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -605,15 +605,15 @@ static gboolean on_sim_get_call_forwarding(TelephonySim *sim, GDBusMethodInvocat
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_CALL_FORWARDING, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_CALL_FORWARDING, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get Call Forwarding");
-       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(GET_CALL_FORWARDING, co_sim);
+       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(invocation, GET_CALL_FORWARDING, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
        tcore_user_request_set_command(ur, TREQ_SIM_GET_CALLFORWARDING);
@@ -645,15 +645,15 @@ static gboolean on_sim_set_call_forwarding(TelephonySim *sim, GDBusMethodInvocat
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_set_callforwarding req_cf;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(SET_CALL_FORWARDING, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_CALL_FORWARDING, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Set Call Forwarding");
-       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(SET_CALL_FORWARDING, co_sim);
+       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(invocation, SET_CALL_FORWARDING, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
 
@@ -666,8 +666,8 @@ static gboolean on_sim_set_call_forwarding(TelephonySim *sim, GDBusMethodInvocat
                req_cf.cphs_cf.b_line2 = arg_cphs_line2;
                req_cf.cphs_cf.b_fax = arg_cphs_fax;
                req_cf.cphs_cf.b_data = arg_cphs_data;
-               dbg("b_line1[%d], b_line2[%d], b_fax[%d], b_data[%d]",
-                               req_cf.cphs_cf.b_line1, req_cf.cphs_cf.b_line2,
+               dbg("[%s] b_line1[%d], b_line2[%d], b_fax[%d], b_data[%d]",
+                               GET_CP_NAME(invocation), req_cf.cphs_cf.b_line1, req_cf.cphs_cf.b_line2,
                                req_cf.cphs_cf.b_fax, req_cf.cphs_cf.b_data);
        } else {
                req_cf.cf.rec_index = arg_rec_index;
@@ -678,9 +678,9 @@ static gboolean on_sim_set_call_forwarding(TelephonySim *sim, GDBusMethodInvocat
                memcpy(&req_cf.cf.cfu_num, arg_number, strlen(arg_number));
                req_cf.cf.cc2_id = arg_cc2_id;
                req_cf.cf.ext7_id = arg_ext7_id;
-               dbg("rec_index[%d], msp_num[%d], cfu_status[0x%x], ton[%d], "
+               dbg("[%s] rec_index[%d], msp_num[%d], cfu_status[0x%x], ton[%d], "
                                "npi[%d], cfu_num[%s], cc2_id[%d], ext7_id[%d]",
-                               req_cf.cf.rec_index, req_cf.cf.msp_num, req_cf.cf.cfu_status, req_cf.cf.ton,
+                               GET_CP_NAME(invocation), req_cf.cf.rec_index, req_cf.cf.msp_num, req_cf.cf.cfu_status, req_cf.cf.ton,
                                req_cf.cf.npi, req_cf.cf.cfu_num, req_cf.cf.cc2_id, req_cf.cf.ext7_id);
        }
 
@@ -700,15 +700,15 @@ static gboolean on_sim_get_message_waiting(TelephonySim *sim, GDBusMethodInvocat
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_MESSAGE_WAITING, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_MESSAGE_WAITING, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get Message Waiting");
-       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(GET_MESSAGE_WAITING, co_sim);
+       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(invocation, GET_MESSAGE_WAITING, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
        tcore_user_request_set_command(ur, TREQ_SIM_GET_MESSAGEWAITING);
@@ -739,15 +739,15 @@ static gboolean on_sim_set_message_waiting(TelephonySim *sim, GDBusMethodInvocat
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_set_messagewaiting req_mw;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(SET_MESSAGE_WAITING, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_MESSAGE_WAITING, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Set Message Waiting");
-       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(SET_MESSAGE_WAITING, co_sim);
+       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(invocation, SET_MESSAGE_WAITING, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
 
@@ -760,7 +760,8 @@ static gboolean on_sim_set_message_waiting(TelephonySim *sim, GDBusMethodInvocat
                req_mw.cphs_mw.b_voice2 = arg_cphs_voice2;
                req_mw.cphs_mw.b_fax = arg_cphs_fax;
                req_mw.cphs_mw.b_data = arg_cphs_data;
-               dbg("b_voice1[%d],b_voice2[%d],b_fax[%d], b_data[%d]",
+               dbg("[%s] b_voice1[%d],b_voice2[%d],b_fax[%d], b_data[%d]",
+                               GET_CP_NAME(invocation),
                                req_mw.cphs_mw.b_voice1,
                                req_mw.cphs_mw.b_voice2,
                                req_mw.cphs_mw.b_fax,
@@ -773,7 +774,8 @@ static gboolean on_sim_set_message_waiting(TelephonySim *sim, GDBusMethodInvocat
                req_mw.mw.email_count = arg_email_cnt;
                req_mw.mw.other_count = arg_other_cnt;
                req_mw.mw.video_count = arg_video_cnt;
-               dbg("rec_index[%d], indicator_status[0x%x],     voice_count[%d], fax_count[%d], email_count[%d], other_count[%d], video_count[%d]",
+               dbg("[%s] rec_index[%d], indicator_status[0x%x],        voice_count[%d], fax_count[%d], email_count[%d], other_count[%d], video_count[%d]",
+                               GET_CP_NAME(invocation),
                                req_mw.mw.rec_index,
                                req_mw.mw.indicator_status,
                                req_mw.mw.voice_count,
@@ -799,15 +801,15 @@ static gboolean on_sim_get_mailbox(TelephonySim *sim, GDBusMethodInvocation *inv
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_MAILBOX, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_MAILBOX, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get Mailbox");
-       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(GET_MAILBOX, co_sim);
+       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(invocation, GET_MAILBOX, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
        tcore_user_request_set_command(ur, TREQ_SIM_GET_MAILBOX);
@@ -837,15 +839,15 @@ static gboolean on_sim_set_mailbox(TelephonySim *sim, GDBusMethodInvocation *inv
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_set_mailbox req_mb;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "w"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(SET_MAILBOX, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_MAILBOX, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Set Mailbox");
-       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(SET_MAILBOX, co_sim);
+       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(invocation, SET_MAILBOX, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
 
@@ -866,8 +868,9 @@ static gboolean on_sim_set_mailbox(TelephonySim *sim, GDBusMethodInvocation *inv
        req_mb.mb_info.number_info.cc_id = arg_ext1_id;
        req_mb.mb_info.number_info.ext1_id = arg_ext1_id;
 
-       dbg("b_cphs[%d] mb_type[%d], rec_index[%d], profile_number[%d], alpha_id_max_len[%d], "
+       dbg("[%s] b_cphs[%d] mb_type[%d], rec_index[%d], profile_number[%d], alpha_id_max_len[%d], "
                        "alpha_id[%s], ton[%d], npi[%d], num[%s], cc_id[%d], ext1_id[%d]",
+                       GET_CP_NAME(invocation),
                        req_mb.b_cphs,
                        req_mb.mb_info.mb_type,
                        req_mb.mb_info.rec_index,
@@ -878,7 +881,7 @@ static gboolean on_sim_set_mailbox(TelephonySim *sim, GDBusMethodInvocation *inv
                        req_mb.mb_info.number_info.npi,
                        req_mb.mb_info.number_info.num,
                        req_mb.mb_info.number_info.cc_id,
-                       req_mb.mb_info.number_info.ext1_id)
+                       req_mb.mb_info.number_info.ext1_id);
 
        tcore_user_request_set_data(ur, sizeof(struct treq_sim_set_mailbox), &req_mb);
        tcore_user_request_set_command(ur, TREQ_SIM_SET_MAILBOX);
@@ -896,13 +899,13 @@ static gboolean on_sim_get_cphsinfo(TelephonySim *sim, GDBusMethodInvocation *in
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_CPHS_INFO, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_CPHS_INFO, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get CPHS Info");
 
        ur = MAKE_UR(ctx, sim, invocation);
@@ -910,8 +913,8 @@ static gboolean on_sim_get_cphsinfo(TelephonySim *sim, GDBusMethodInvocation *in
        tcore_user_request_set_command(ur, TREQ_SIM_GET_CPHS_INFO);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -924,13 +927,13 @@ static gboolean on_sim_get_service_table(TelephonySim *sim, GDBusMethodInvocatio
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct tel_sim_service_table *svct = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_SVCT, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_SVCT, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get SVCT");
 
        svct = tcore_sim_get_service_table(co_sim);
@@ -944,50 +947,46 @@ static gboolean on_sim_get_service_table(TelephonySim *sim, GDBusMethodInvocatio
                tcore_user_request_set_command(ur, TREQ_SIM_GET_SERVICE_TABLE);
                ret = tcore_communicator_dispatch_request(ctx->comm, ur);
                if (ret != TCORE_RETURN_SUCCESS) {
-                       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-                       dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+                       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+                       dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                        tcore_user_request_unref(ur);
                }
        } else {
                GVariantBuilder builder;
                GVariant * inner_gv = NULL;
                GVariant *svct_gv = NULL;
-               int i =0;
-               dbg("TRESP_SIM_GET_SERVICE_TABLE");
+               int i = 0;
+               dbg("[%s] GET_SERVICE_TABLE", GET_CP_NAME(invocation));
 
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
                if (svct->sim_type == SIM_TYPE_GSM) {
-                       for (i = 0; i < SIM_SST_SERVICE_CNT_MAX; i++) {
-                               g_variant_builder_add (&builder, "y", svct->table.sst.service[i]);
-                       }
+                       for (i = 0; i < SIM_SST_SERVICE_CNT_MAX; i++)
+                               g_variant_builder_add(&builder, "y", svct->table.sst.service[i]);
                } else if (svct->sim_type == SIM_TYPE_USIM) {
-                       for (i = 0; i < SIM_UST_SERVICE_CNT_MAX; i++) {
-                               g_variant_builder_add (&builder, "y", svct->table.ust.service[i]);
-                       }
-               } else if(svct->sim_type == SIM_TYPE_RUIM) {
-                       if(SIM_CDMA_SVC_TABLE == svct->table.cst.cdma_svc_table) {
-                               for(i = 0; i < SIM_CDMA_ST_SERVICE_CNT_MAX; i++) {
-                                       g_variant_builder_add (&builder, "iy", svct->table.cst.cdma_svc_table,
-                                                                                       svct->table.cst.service.cdma_service[i]);
+                       for (i = 0; i < SIM_UST_SERVICE_CNT_MAX; i++)
+                               g_variant_builder_add(&builder, "y", svct->table.ust.service[i]);
+               } else if (svct->sim_type == SIM_TYPE_RUIM) {
+                       if (SIM_CDMA_SVC_TABLE == svct->table.cst.cdma_svc_table) {
+                               for (i = 0; i < SIM_CDMA_ST_SERVICE_CNT_MAX; i++) {
+                                       g_variant_builder_add(&builder, "iy", svct->table.cst.cdma_svc_table,
+                                               svct->table.cst.service.cdma_service[i]);
                                }
-                       } else if(SIM_CSIM_SVC_TABLE == svct->table.cst.cdma_svc_table) {
-                               for(i = 0; i < SIM_CSIM_ST_SERVICE_CNT_MAX; i++) {
-                                       g_variant_builder_add (&builder, "iy", svct->table.cst.cdma_svc_table,
-                                                                                       svct->table.cst.service.csim_service[i]);
+                       } else if (SIM_CSIM_SVC_TABLE == svct->table.cst.cdma_svc_table) {
+                               for (i = 0; i < SIM_CSIM_ST_SERVICE_CNT_MAX; i++) {
+                                       g_variant_builder_add(&builder, "iy", svct->table.cst.cdma_svc_table,
+                                               svct->table.cst.service.csim_service[i]);
                                }
                        } else {
                                err("Invalid cdma_svc_table:[%d]", svct->table.cst.cdma_svc_table);
                        }
                } else {
-                       err("Unknown SIM type: [%d]", svct->sim_type);
+                       err("[%s] Unknown SIM type: [%d]", GET_CP_NAME(invocation), svct->sim_type);
                }
                inner_gv = g_variant_builder_end(&builder);
                svct_gv = g_variant_new("v", inner_gv);
 
-               telephony_sim_complete_get_service_table (sim, invocation,
-                               SIM_ACCESS_SUCCESS,
-                               svct->sim_type,
-                               svct_gv);
+               telephony_sim_complete_get_service_table(sim, invocation,
+                       SIM_ACCESS_SUCCESS, svct->sim_type, svct_gv);
 
                free(svct);
        }
@@ -1002,16 +1001,16 @@ static gboolean on_sim_get_msisdn(TelephonySim *sim, GDBusMethodInvocation *invo
        CoreObject *co_sim = NULL;
        struct tel_sim_msisdn_list *msisdn_list = NULL;
        gboolean read_from_modem = FALSE;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_MSISDN, co_sim);
-       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(GET_MSISDN, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_MSISDN, co_sim);
+       DBUS_SIM_CHECK_SIM_SERVICE_TABLE(invocation, GET_MSISDN, co_sim);
 
-       if(SIM_TYPE_NVSIM == tcore_sim_get_type(co_sim)) {
+       if (SIM_TYPE_NVSIM == tcore_sim_get_type(co_sim)) {
                dbg("In NV SIM, don't use MSISDN cached");
                read_from_modem = TRUE;
        } else {
@@ -1022,11 +1021,11 @@ static gboolean on_sim_get_msisdn(TelephonySim *sim, GDBusMethodInvocation *invo
                        read_from_modem = TRUE;
        }
 
-       if(read_from_modem) {
+       if (read_from_modem) {
                UserRequest *ur = NULL;
 
                ur = MAKE_UR(ctx, sim, invocation);
-               dbg("Not cached. Request to modem");
+               dbg("[%s] Not cached. Request to modem", GET_CP_NAME(invocation));
                tcore_user_request_set_command(ur, TREQ_SIM_GET_MSISDN);
 
                ret = tcore_communicator_dispatch_request(ctx->comm, ur);
@@ -1035,23 +1034,24 @@ static gboolean on_sim_get_msisdn(TelephonySim *sim, GDBusMethodInvocation *invo
                GVariant *gv = NULL;
                int i;
                GVariantBuilder b;
-               dbg("TRESP_SIM_GET_MSISDN");
+
+               dbg("[%s] GET_MSISDN. count:[%d]", GET_CP_NAME(invocation), msisdn_list->count);
+
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-               dbg("msisdn_list->count = %d", msisdn_list->count);
-               for (i = 0;i < msisdn_list->count; i++) {
-                       g_variant_builder_open(&b,G_VARIANT_TYPE("a{sv}"));
+               for (i = 0; i < msisdn_list->count; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "name", g_variant_new_string((const gchar *)msisdn_list->msisdn[i].name));
                        if (msisdn_list->msisdn[i].ton == SIM_TON_INTERNATIONAL) {
                                unsigned char *tmp = (unsigned char *)calloc(SIM_MSISDN_NUMBER_LEN_MAX + 1, 1);
-                               if (tmp!=NULL) {
+                               if (tmp != NULL) {
                                        tmp[0] = '+';
                                        strncpy((char *)tmp+1, (const char*)msisdn_list->msisdn[i].num, SIM_MSISDN_NUMBER_LEN_MAX - 1);
                                        tmp[SIM_MSISDN_NUMBER_LEN_MAX] = '\0';
                                        g_variant_builder_add(&b, "{sv}", "number", g_variant_new_string((const gchar *)tmp));
                                        free(tmp);
                                } else {
-                                       dbg("calloc failed.");
+                                       warn("calloc failed.");
                                        g_variant_builder_add(&b, "{sv}", "number", g_variant_new_string((const gchar *)msisdn_list->msisdn[i].num));
                                }
                        } else {
@@ -1061,7 +1061,7 @@ static gboolean on_sim_get_msisdn(TelephonySim *sim, GDBusMethodInvocation *invo
                }
                gv = g_variant_builder_end(&b);
 
-               telephony_sim_complete_get_msisdn (sim, invocation,     SIM_ACCESS_SUCCESS, gv);
+               telephony_sim_complete_get_msisdn(sim, invocation, SIM_ACCESS_SUCCESS, gv);
                free(msisdn_list);
        }
 
@@ -1075,13 +1075,13 @@ static gboolean on_sim_get_oplmnwact(TelephonySim *sim, GDBusMethodInvocation *i
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_OPLMWACT, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_OPLMWACT, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get OPLMNWACT");
 
        ur = MAKE_UR(ctx, sim, invocation);
@@ -1089,8 +1089,8 @@ static gboolean on_sim_get_oplmnwact(TelephonySim *sim, GDBusMethodInvocation *i
        tcore_user_request_set_command(ur, TREQ_SIM_GET_OPLMNWACT);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1105,13 +1105,13 @@ static gboolean on_sim_get_spn(TelephonySim *sim, GDBusMethodInvocation *invocat
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct tel_sim_spn* spn = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_SPN, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_SPN, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get SPN");
 
        spn = tcore_sim_get_spn(co_sim);
@@ -1123,13 +1123,13 @@ static gboolean on_sim_get_spn(TelephonySim *sim, GDBusMethodInvocation *invocat
                ret = tcore_communicator_dispatch_request(ctx->comm, ur);
 
                if (ret != TCORE_RETURN_SUCCESS) {
-                       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-                       dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+                       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+                       dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                        tcore_user_request_unref(ur);
                }
        } else {
-               telephony_sim_complete_get_spn (sim, invocation, SIM_ACCESS_SUCCESS,
-                                                               spn->display_condition, (const gchar *)spn->spn);
+               telephony_sim_complete_get_spn(sim, invocation, SIM_ACCESS_SUCCESS,
+                       spn->display_condition, (const gchar *)spn->spn);
                free(spn);
        }
        return TRUE;
@@ -1143,13 +1143,13 @@ static gboolean on_sim_get_cphs_netname(TelephonySim *sim, GDBusMethodInvocation
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct tel_sim_cphs_netname *cphs_netname = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_CPHS_NET_NAME, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_CPHS_NET_NAME, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get CPHS Net Name");
 
        cphs_netname = tcore_sim_get_cphs_netname(co_sim);
@@ -1160,14 +1160,15 @@ static gboolean on_sim_get_cphs_netname(TelephonySim *sim, GDBusMethodInvocation
                tcore_user_request_set_command(ur, TREQ_SIM_GET_CPHS_NETNAME);
                ret = tcore_communicator_dispatch_request(ctx->comm, ur);
                if (ret != TCORE_RETURN_SUCCESS) {
-                       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+                       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                        dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                        tcore_user_request_unref(ur);
                }
        } else {
-               telephony_sim_complete_get_cphs_net_name (sim, invocation, SIM_ACCESS_SUCCESS,
-                                                                                       (const gchar *)cphs_netname->full_name,
-                                                                                       (const gchar *)cphs_netname->short_name);
+               telephony_sim_complete_get_cphs_net_name(sim, invocation,
+                       SIM_ACCESS_SUCCESS,
+                       (const gchar *)cphs_netname->full_name,
+                       (const gchar *)cphs_netname->short_name);
                free(cphs_netname);
        }
 
@@ -1181,13 +1182,13 @@ static gboolean on_sim_get_gid(TelephonySim *sim, GDBusMethodInvocation *invocat
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_GID, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_GID, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get GID");
 
        ur = MAKE_UR(ctx, sim, invocation);
@@ -1195,7 +1196,7 @@ static gboolean on_sim_get_gid(TelephonySim *sim, GDBusMethodInvocation *invocat
        tcore_user_request_set_command(ur, TREQ_SIM_GET_GID);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -1215,17 +1216,17 @@ static gboolean on_sim_authentication(TelephonySim *sim, GDBusMethodInvocation *
        GVariant *rand_gv = NULL;
        GVariant *autn_gv = NULL;
        guchar rt_i;
-       int i =0;
+       int i = 0;
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_req_authentication req_auth;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(AUTHENTICATION, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, AUTHENTICATION, co_sim);
 
        memset(&req_auth, 0, sizeof(struct treq_sim_req_authentication));
 
@@ -1233,7 +1234,7 @@ static gboolean on_sim_authentication(TelephonySim *sim, GDBusMethodInvocation *
 
        rand_gv = g_variant_get_variant(arg_rand);
        g_variant_get(rand_gv, "ay", &iter);
-       while ( g_variant_iter_loop (iter, "y", &rt_i)) {
+       while (g_variant_iter_loop(iter, "y", &rt_i)) {
                req_auth.rand_data[i] = rt_i;
                i++;
        }
@@ -1242,7 +1243,7 @@ static gboolean on_sim_authentication(TelephonySim *sim, GDBusMethodInvocation *
        i = 0;
        autn_gv = g_variant_get_variant(arg_autn);
        g_variant_get(autn_gv, "ay", &iter);
-       while ( g_variant_iter_loop (iter, "y", &rt_i)) {
+       while (g_variant_iter_loop(iter, "y", &rt_i)) {
                req_auth.autn_data[i] = rt_i;
                i++;
        }
@@ -1263,23 +1264,24 @@ static gboolean on_sim_authentication(TelephonySim *sim, GDBusMethodInvocation *
                GVariant *it_gv = NULL;
                GVariant *resp_gv = NULL;
 
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
                ak = g_variant_builder_end(&builder);
                ak_gv = g_variant_new("v", ak);
 
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
                cp = g_variant_builder_end(&builder);
                cp_gv = g_variant_new("v", cp);
 
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
                it = g_variant_builder_end(&builder);
                it_gv = g_variant_new("v", it);
 
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
                resp = g_variant_builder_end(&builder);
                resp_gv = g_variant_new("v", resp);
 
-               telephony_sim_complete_authentication (sim, invocation, SIM_ACCESS_FAILED, 0, 0,        ak_gv,  cp_gv, it_gv, resp_gv);
+               telephony_sim_complete_authentication(sim, invocation,
+                       SIM_ACCESS_FAILED, 0, 0, ak_gv, cp_gv, it_gv, resp_gv);
                tcore_user_request_unref(ur);
        }
 
@@ -1296,13 +1298,13 @@ static gboolean on_sim_verify_sec(TelephonySim *sim, GDBusMethodInvocation *invo
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_verify_pins verify_pins;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(VERIFY_SEC, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, VERIFY_SEC, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Verify Sec");
 
        memset(&verify_pins, 0, sizeof(struct treq_sim_verify_pins));
@@ -1316,8 +1318,8 @@ static gboolean on_sim_verify_sec(TelephonySim *sim, GDBusMethodInvocation *invo
        tcore_user_request_set_command(ur, TREQ_SIM_VERIFY_PINS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1335,13 +1337,13 @@ static gboolean on_sim_verify_puk(TelephonySim *sim, GDBusMethodInvocation *invo
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_verify_puks verify_puks;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(VERIFY_PUK, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, VERIFY_PUK, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Verify PUK");
 
        memset(&verify_puks, 0, sizeof(struct treq_sim_verify_puks));
@@ -1357,8 +1359,8 @@ static gboolean on_sim_verify_puk(TelephonySim *sim, GDBusMethodInvocation *invo
        tcore_user_request_set_command(ur, TREQ_SIM_VERIFY_PUKS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1376,13 +1378,13 @@ static gboolean on_sim_change_pin(TelephonySim *sim, GDBusMethodInvocation *invo
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_change_pins change_pins;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(CHANGE_PIN, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, CHANGE_PIN, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Change PIN");
 
        memset(&change_pins, 0, sizeof(struct treq_sim_change_pins));
@@ -1398,8 +1400,8 @@ static gboolean on_sim_change_pin(TelephonySim *sim, GDBusMethodInvocation *invo
        tcore_user_request_set_command(ur, TREQ_SIM_CHANGE_PINS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1416,43 +1418,43 @@ static gboolean on_sim_disable_facility(TelephonySim *sim, GDBusMethodInvocation
        TReturn ret;
        struct treq_sim_disable_facility dis_facility;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(DISABLE_FACILITY, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, DISABLE_FACILITY, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Diable Facility");
 
        memset(&dis_facility, 0, sizeof(struct treq_sim_disable_facility));
 
        dbg("arg_type[%d]", arg_type);
        switch (arg_type) {
-               case 1:
-                       dis_facility.type = SIM_FACILITY_PS;
-                       break;
-               case 3:
-                       dis_facility.type = SIM_FACILITY_SC;
-                       break;
-               case 4:
-                       dis_facility.type = SIM_FACILITY_FD;
-                       break;
-               case 5:
-                       dis_facility.type = SIM_FACILITY_PN;
-                       break;
-               case 6:
-                       dis_facility.type = SIM_FACILITY_PU;
-                       break;
-               case 7:
-                       dis_facility.type = SIM_FACILITY_PP;
-                       break;
-               case 8:
-                       dis_facility.type = SIM_FACILITY_PC;
-                       break;
-               default:
-                       err("Unhandled/Unknown type[0x%x]", arg_type);
-                       break;
+       case 1:
+               dis_facility.type = SIM_FACILITY_PS;
+               break;
+       case 3:
+               dis_facility.type = SIM_FACILITY_SC;
+               break;
+       case 4:
+               dis_facility.type = SIM_FACILITY_FD;
+               break;
+       case 5:
+               dis_facility.type = SIM_FACILITY_PN;
+               break;
+       case 6:
+               dis_facility.type = SIM_FACILITY_PU;
+               break;
+       case 7:
+               dis_facility.type = SIM_FACILITY_PP;
+               break;
+       case 8:
+               dis_facility.type = SIM_FACILITY_PC;
+               break;
+       default:
+               err("Unhandled/Unknown type[0x%x]", arg_type);
+               break;
        }
        dis_facility.password_length = strlen(arg_password);
        memcpy(dis_facility.password, arg_password, dis_facility.password_length);
@@ -1462,8 +1464,8 @@ static gboolean on_sim_disable_facility(TelephonySim *sim, GDBusMethodInvocation
        tcore_user_request_set_command(ur, TREQ_SIM_DISABLE_FACILITY);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1480,43 +1482,43 @@ static gboolean on_sim_enable_facility(TelephonySim *sim, GDBusMethodInvocation
        TReturn ret;
        struct treq_sim_enable_facility en_facility;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(ENABLE_FACILITY, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, ENABLE_FACILITY, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Enable Facility");
 
        memset(&en_facility, 0, sizeof(struct treq_sim_enable_facility));
 
-       dbg("arg_type[%d]", arg_type);
+       dbg("[%s] arg_type[%d]", GET_CP_NAME(invocation), arg_type);
        switch (arg_type) {
-               case 1:
-                       en_facility.type = SIM_FACILITY_PS;
-                       break;
-               case 3:
-                       en_facility.type = SIM_FACILITY_SC;
-                       break;
-               case 4:
-                       en_facility.type = SIM_FACILITY_FD;
-                       break;
-               case 5:
-                       en_facility.type = SIM_FACILITY_PN;
-                       break;
-               case 6:
-                       en_facility.type = SIM_FACILITY_PU;
-                       break;
-               case 7:
-                       en_facility.type = SIM_FACILITY_PP;
-                       break;
-               case 8:
-                       en_facility.type = SIM_FACILITY_PC;
-                       break;
-               default:
-                       err("Unhandled/Unknown type[0x%x]", arg_type);
-                       break;
+       case 1:
+               en_facility.type = SIM_FACILITY_PS;
+               break;
+       case 3:
+               en_facility.type = SIM_FACILITY_SC;
+               break;
+       case 4:
+               en_facility.type = SIM_FACILITY_FD;
+               break;
+       case 5:
+               en_facility.type = SIM_FACILITY_PN;
+               break;
+       case 6:
+               en_facility.type = SIM_FACILITY_PU;
+               break;
+       case 7:
+               en_facility.type = SIM_FACILITY_PP;
+               break;
+       case 8:
+               en_facility.type = SIM_FACILITY_PC;
+               break;
+       default:
+               err("Unhandled/Unknown type[0x%x]", arg_type);
+               break;
        }
        en_facility.password_length = strlen(arg_password);
        memcpy(en_facility.password, arg_password, en_facility.password_length);
@@ -1526,8 +1528,8 @@ static gboolean on_sim_enable_facility(TelephonySim *sim, GDBusMethodInvocation
        tcore_user_request_set_command(ur, TREQ_SIM_ENABLE_FACILITY);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1543,44 +1545,44 @@ static gboolean on_sim_get_facility(TelephonySim *sim, GDBusMethodInvocation *in
        TReturn ret;
        struct treq_sim_get_facility_status facility;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_FACILITY, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_FACILITY, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get Facility");
 
        memset(&facility, 0, sizeof(struct treq_sim_get_facility_status));
 
-       dbg("arg_type[%d]", arg_type);
+       dbg("[%s] arg_type[%d]", GET_CP_NAME(invocation), arg_type);
 
        switch (arg_type) {
-               case 1:
-                       facility.type = SIM_FACILITY_PS;
-                       break;
-               case 3:
-                       facility.type = SIM_FACILITY_SC;
-                       break;
-               case 4:
-                       facility.type = SIM_FACILITY_FD;
-                       break;
-               case 5:
-                       facility.type = SIM_FACILITY_PN;
-                       break;
-               case 6:
-                       facility.type = SIM_FACILITY_PU;
-                       break;
-               case 7:
-                       facility.type = SIM_FACILITY_PP;
-                       break;
-               case 8:
-                       facility.type = SIM_FACILITY_PC;
-                       break;
-               default:
-                       err("Unhandled/Unknown type[0x%x]", arg_type);
-                       break;
+       case 1:
+               facility.type = SIM_FACILITY_PS;
+               break;
+       case 3:
+               facility.type = SIM_FACILITY_SC;
+               break;
+       case 4:
+               facility.type = SIM_FACILITY_FD;
+               break;
+       case 5:
+               facility.type = SIM_FACILITY_PN;
+               break;
+       case 6:
+               facility.type = SIM_FACILITY_PU;
+               break;
+       case 7:
+               facility.type = SIM_FACILITY_PP;
+               break;
+       case 8:
+               facility.type = SIM_FACILITY_PC;
+               break;
+       default:
+               err("Unhandled/Unknown type[0x%x]", arg_type);
+               break;
        }
 
        ur = MAKE_UR(ctx, sim, invocation);
@@ -1588,8 +1590,8 @@ static gboolean on_sim_get_facility(TelephonySim *sim, GDBusMethodInvocation *in
        tcore_user_request_set_command(ur, TREQ_SIM_GET_FACILITY_STATUS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1605,43 +1607,43 @@ static gboolean on_sim_get_lock_info(TelephonySim *sim, GDBusMethodInvocation *i
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_get_lock_info lock_info;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_LOCK_INFO, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_LOCK_INFO, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get Lock Info");
 
        memset(&lock_info, 0, sizeof(struct treq_sim_get_lock_info));
 
-       dbg("arg_type[%d]", arg_type);
+       dbg("[%s] arg_type[%d]", GET_CP_NAME(invocation), arg_type);
        switch (arg_type) {
-               case 1:
-                       lock_info.type = SIM_FACILITY_PS;
-                       break;
-               case 3:
-                       lock_info.type = SIM_FACILITY_SC;
-                       break;
-               case 4:
-                       lock_info.type = SIM_FACILITY_FD;
-                       break;
-               case 5:
-                       lock_info.type = SIM_FACILITY_PN;
-                       break;
-               case 6:
-                       lock_info.type = SIM_FACILITY_PU;
-                       break;
-               case 7:
-                       lock_info.type = SIM_FACILITY_PP;
-                       break;
-               case 8:
-                       lock_info.type = SIM_FACILITY_PC;
-                       break;
-               default:
-                       err("Unhandled/Unknown type[0x%x]", arg_type);
-                       break;
+       case 1:
+               lock_info.type = SIM_FACILITY_PS;
+               break;
+       case 3:
+               lock_info.type = SIM_FACILITY_SC;
+               break;
+       case 4:
+               lock_info.type = SIM_FACILITY_FD;
+               break;
+       case 5:
+               lock_info.type = SIM_FACILITY_PN;
+               break;
+       case 6:
+               lock_info.type = SIM_FACILITY_PU;
+               break;
+       case 7:
+               lock_info.type = SIM_FACILITY_PP;
+               break;
+       case 8:
+               lock_info.type = SIM_FACILITY_PC;
+               break;
+       default:
+               err("Unhandled/Unknown type[0x%x]", arg_type);
+               break;
        }
 
        ur = MAKE_UR(ctx, sim, invocation);
@@ -1649,8 +1651,8 @@ static gboolean on_sim_get_lock_info(TelephonySim *sim, GDBusMethodInvocation *i
        tcore_user_request_set_command(ur, TREQ_SIM_GET_LOCK_INFO);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1669,14 +1671,14 @@ static gboolean on_sim_transfer_apdu(TelephonySim *sim, GDBusMethodInvocation *i
        guchar rt_i;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       int i =0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       int i = 0;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "x"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(TRANSFER_APDU, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, TRANSFER_APDU, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Transfer APDU");
 
        memset(&send_apdu, 0, sizeof(struct treq_sim_transmit_apdu));
@@ -1684,7 +1686,7 @@ static gboolean on_sim_transfer_apdu(TelephonySim *sim, GDBusMethodInvocation *i
        inner_gv = g_variant_get_variant(arg_apdu);
 
        g_variant_get(inner_gv, "ay", &iter);
-       while ( g_variant_iter_loop (iter, "y", &rt_i)) {
+       while (g_variant_iter_loop(iter, "y", &rt_i)) {
                send_apdu.apdu[i] = rt_i;
                i++;
        }
@@ -1700,8 +1702,8 @@ static gboolean on_sim_transfer_apdu(TelephonySim *sim, GDBusMethodInvocation *i
        tcore_user_request_set_command(ur, TREQ_SIM_TRANSMIT_APDU);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1715,13 +1717,13 @@ static gboolean on_sim_get_atr(TelephonySim *sim, GDBusMethodInvocation *invocat
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control (p_cynara, invocation, AC_SIM, "r"))
+       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_ATR, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_ATR, co_sim);
        DBUS_SIM_CHECK_SIM_TYPE(co_sim, "Get ATR");
 
        ur = MAKE_UR(ctx, sim, invocation);
@@ -1729,8 +1731,8 @@ static gboolean on_sim_get_atr(TelephonySim *sim, GDBusMethodInvocation *invocat
        tcore_user_request_set_command(ur, TREQ_SIM_GET_ATR);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1742,15 +1744,10 @@ static gboolean on_sim_get_fields(TelephonySim *sim, GDBusMethodInvocation *invo
 {
        struct custom_data *ctx = user_data;
        struct tel_sim_imsi *n_imsi = NULL;
-       //struct tel_sim_msisdn_list *msisdn_list = NULL;
-       //struct tel_sim_iccid *iccid = NULL;
-       //struct tel_sim_spn *spn= NULL;
        CoreObject *co_sim = NULL;
        GVariantBuilder b;
        GVariant *gv_fields = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
-
-       dbg("Func Entrance");
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
@@ -1759,7 +1756,7 @@ static gboolean on_sim_get_fields(TelephonySim *sim, GDBusMethodInvocation *invo
 
        g_variant_builder_init(&b, G_VARIANT_TYPE("a{svv}}"));
 
-       DBUS_SIM_CHECK_SIM_STATUS(GET_IMSI, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_IMSI, co_sim);
 
        n_imsi = tcore_sim_get_imsi(co_sim);
        if (n_imsi != NULL) {
@@ -1768,20 +1765,16 @@ static gboolean on_sim_get_fields(TelephonySim *sim, GDBusMethodInvocation *invo
                free(n_imsi);
        }
 
-       DBUS_SIM_CHECK_SIM_STATUS(GET_ICCID, co_sim);
-       //n_imsi = tcore_sim_get_imsi(co_sim);
-       //if (n_imsi != NULL) {
-               g_variant_builder_add(&b, "{svv}", "iccid", g_variant_new_string(""), g_variant_new_string(""));
-               //free(n_imsi);
-       //}
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_ICCID, co_sim);
+       g_variant_builder_add(&b, "{svv}", "iccid", g_variant_new_string(""), g_variant_new_string(""));
 
-       DBUS_SIM_CHECK_SIM_STATUS(GET_MSISDN, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_MSISDN, co_sim);
        g_variant_builder_add(&b, "{svv}", "msisdn", g_variant_new_string("name"), g_variant_new_string("number"));
 
-       DBUS_SIM_CHECK_SIM_STATUS(GET_SPN, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_SPN, co_sim);
        g_variant_builder_add(&b, "{svv}", "spn", g_variant_new_uint16(255), g_variant_new_string("network name"));
 
-       DBUS_SIM_CHECK_SIM_STATUS(GET_INIT_STATUS, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_INIT_STATUS, co_sim);
        g_variant_builder_add(&b, "{svv}", "init_status", g_variant_new_uint16(0), g_variant_new_boolean(TRUE));
 
        gv_fields = g_variant_builder_end(&b);
@@ -1799,26 +1792,26 @@ static gboolean on_sim_set_power_state(TelephonySim *sim, GDBusMethodInvocation
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_set_powerstate set_powerstate;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(SET_POWERSTATE, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_POWERSTATE, co_sim);
 
        memset(&set_powerstate, 0, sizeof(struct treq_sim_set_powerstate));
        set_powerstate.state = arg_state;
 
-       dbg("set_powerstate.state[%d]", set_powerstate.state);
+       dbg("[%s] powerstate:[%d]", GET_CP_NAME(invocation), set_powerstate.state);
        ur = MAKE_UR(ctx, sim, invocation);
 
        tcore_user_request_set_data(ur, sizeof(struct treq_sim_set_powerstate), &set_powerstate);
        tcore_user_request_set_command(ur, TREQ_SIM_SET_POWERSTATE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
+               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
 
@@ -1832,13 +1825,13 @@ static gboolean on_sim_get_impi(TelephonySim *sim,
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_IMPI, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_IMPI, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
 
@@ -1860,13 +1853,13 @@ static gboolean on_sim_get_impu(TelephonySim *sim,
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_IMPU, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_IMPU, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
 
@@ -1888,13 +1881,13 @@ static gboolean on_sim_get_domain(TelephonySim *sim,
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_DOMAIN, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_DOMAIN, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
 
@@ -1916,13 +1909,13 @@ static gboolean on_sim_get_pcscf(TelephonySim *sim,
        UserRequest *ur = NULL;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_PCSCF, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_PCSCF, co_sim);
 
        ur = MAKE_UR(ctx, sim, invocation);
 
@@ -1943,15 +1936,13 @@ static gboolean on_sim_get_app_list(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        unsigned char app_list = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
-
-       dbg("Func Entrance");
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_APP_LIST, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_APP_LIST, co_sim);
 
        app_list = tcore_sim_get_app_list(co_sim);
        telephony_sim_complete_get_app_list(sim, invocation, app_list);
@@ -1964,15 +1955,13 @@ static gboolean on_sim_get_isim_service_table(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        struct tel_sim_ist *ist = NULL;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
-
-       dbg("Func Entrance");
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
                return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
-       DBUS_SIM_CHECK_SIM_STATUS(GET_ISIM_SERVICE_TABLE, co_sim);
+       DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_ISIM_SERVICE_TABLE, co_sim);
 
        ist = tcore_sim_get_isim_service_table(co_sim);
        if (ist) {
@@ -1981,10 +1970,9 @@ static gboolean on_sim_get_isim_service_table(TelephonySim *sim,
                GVariant *inner_gv = NULL;
                int i;
 
-               g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-               for (i = 0; i < SIM_IST_SERVICE_CNT_MAX; i++) {
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < SIM_IST_SERVICE_CNT_MAX; i++)
                        g_variant_builder_add(&builder, "y", ist->service[i]);
-               }
                inner_gv = g_variant_builder_end(&builder);
                ist_gv = g_variant_new("v", inner_gv);
 
@@ -1996,7 +1984,6 @@ static gboolean on_sim_get_isim_service_table(TelephonySim *sim,
                TReturn ret;
                ur = MAKE_UR(ctx, sim, invocation);
 
-               dbg("Not cached. Request to modem");
                tcore_user_request_set_command(ur, TREQ_SIM_GET_ISIM_SERVICE_TABLE);
                ret = tcore_communicator_dispatch_request(ctx->comm, ur);
                if (ret != TCORE_RETURN_SUCCESS) {
@@ -2016,199 +2003,161 @@ gboolean dbus_plugin_setup_sim_interface(TelephonyObjectSkeleton *object, struct
        telephony_object_skeleton_set_sim(object, sim);
        g_object_unref(sim);
 
-       dbg("sim: [%p]", sim);
+       dbg("sim = %p", sim);
 
        telephony_sim_set_cf_state(sim, FALSE);
 
-       g_signal_connect (sim,
-                       "handle-get-init-status",
-                       G_CALLBACK (on_sim_get_init_status),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-card-type",
-                       G_CALLBACK (on_sim_get_card_type),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-imsi",
-                       G_CALLBACK (on_sim_get_imsi),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-ecc",
-                       G_CALLBACK (on_sim_get_ecc),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-iccid",
-                       G_CALLBACK (on_sim_get_iccid),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-language",
-                       G_CALLBACK (on_sim_get_language),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-set-language",
-                       G_CALLBACK (on_sim_set_language),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-call-forwarding",
-                       G_CALLBACK (on_sim_get_call_forwarding),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-set-call-forwarding",
-                       G_CALLBACK (on_sim_set_call_forwarding),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-message-waiting",
-                       G_CALLBACK (on_sim_get_message_waiting),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-set-message-waiting",
-                       G_CALLBACK (on_sim_set_message_waiting),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-mailbox",
-                       G_CALLBACK (on_sim_get_mailbox),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-set-mailbox",
-                       G_CALLBACK (on_sim_set_mailbox),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-cphsinfo",
-                       G_CALLBACK (on_sim_get_cphsinfo),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-service-table",
-                       G_CALLBACK (on_sim_get_service_table),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-msisdn",
-                       G_CALLBACK (on_sim_get_msisdn),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-oplmnwact",
-                       G_CALLBACK (on_sim_get_oplmnwact),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-spn",
-                       G_CALLBACK (on_sim_get_spn),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-cphs-net-name",
-                       G_CALLBACK (on_sim_get_cphs_netname),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-gid",
-                       G_CALLBACK (on_sim_get_gid),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-authentication",
-                       G_CALLBACK (on_sim_authentication),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-verify-sec",
-                       G_CALLBACK (on_sim_verify_sec),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-verify-puk",
-                       G_CALLBACK (on_sim_verify_puk),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-change-pin",
-                       G_CALLBACK (on_sim_change_pin),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-disable-facility",
-                       G_CALLBACK (on_sim_disable_facility),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-enable-facility",
-                       G_CALLBACK (on_sim_enable_facility),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-facility",
-                       G_CALLBACK (on_sim_get_facility),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-lock-info",
-                       G_CALLBACK (on_sim_get_lock_info),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-transfer-apdu",
-                       G_CALLBACK (on_sim_transfer_apdu),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-atr",
-                       G_CALLBACK (on_sim_get_atr),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-fields",
-                       G_CALLBACK (on_sim_get_fields),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-set-powerstate",
-                       G_CALLBACK (on_sim_set_power_state),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-impi",
-                       G_CALLBACK (on_sim_get_impi),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-impu",
-                       G_CALLBACK (on_sim_get_impu),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-domain",
-                       G_CALLBACK (on_sim_get_domain),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-pcscf",
-                       G_CALLBACK (on_sim_get_pcscf),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-app-list",
-                       G_CALLBACK (on_sim_get_app_list),
-                       ctx);
-
-       g_signal_connect (sim,
-                       "handle-get-isim-service-table",
-                       G_CALLBACK (on_sim_get_isim_service_table),
-                       ctx);
+       g_signal_connect(sim,
+               "handle-get-init-status",
+               G_CALLBACK(on_sim_get_init_status), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-card-type",
+               G_CALLBACK(on_sim_get_card_type), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-imsi",
+               G_CALLBACK(on_sim_get_imsi), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-ecc",
+               G_CALLBACK(on_sim_get_ecc), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-iccid",
+               G_CALLBACK(on_sim_get_iccid), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-language",
+               G_CALLBACK(on_sim_get_language), ctx);
+
+       g_signal_connect(sim,
+               "handle-set-language",
+               G_CALLBACK(on_sim_set_language), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-call-forwarding",
+               G_CALLBACK(on_sim_get_call_forwarding), ctx);
+
+       g_signal_connect(sim,
+               "handle-set-call-forwarding",
+               G_CALLBACK(on_sim_set_call_forwarding), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-message-waiting",
+               G_CALLBACK(on_sim_get_message_waiting), ctx);
+
+       g_signal_connect(sim,
+               "handle-set-message-waiting",
+               G_CALLBACK(on_sim_set_message_waiting), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-mailbox",
+               G_CALLBACK(on_sim_get_mailbox), ctx);
+
+       g_signal_connect(sim,
+               "handle-set-mailbox",
+               G_CALLBACK(on_sim_set_mailbox), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-cphsinfo",
+               G_CALLBACK(on_sim_get_cphsinfo), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-service-table",
+               G_CALLBACK(on_sim_get_service_table), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-msisdn",
+               G_CALLBACK(on_sim_get_msisdn), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-oplmnwact",
+               G_CALLBACK(on_sim_get_oplmnwact), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-spn",
+               G_CALLBACK(on_sim_get_spn), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-cphs-net-name",
+               G_CALLBACK(on_sim_get_cphs_netname), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-gid",
+               G_CALLBACK(on_sim_get_gid), ctx);
+
+       g_signal_connect(sim,
+               "handle-authentication",
+               G_CALLBACK(on_sim_authentication), ctx);
+
+       g_signal_connect(sim,
+               "handle-verify-sec",
+               G_CALLBACK(on_sim_verify_sec), ctx);
+
+       g_signal_connect(sim,
+               "handle-verify-puk",
+               G_CALLBACK(on_sim_verify_puk), ctx);
+
+       g_signal_connect(sim,
+               "handle-change-pin",
+               G_CALLBACK(on_sim_change_pin), ctx);
+
+       g_signal_connect(sim,
+               "handle-disable-facility",
+               G_CALLBACK(on_sim_disable_facility), ctx);
+
+       g_signal_connect(sim,
+               "handle-enable-facility",
+               G_CALLBACK(on_sim_enable_facility), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-facility",
+               G_CALLBACK(on_sim_get_facility), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-lock-info",
+               G_CALLBACK(on_sim_get_lock_info), ctx);
+
+       g_signal_connect(sim,
+               "handle-transfer-apdu",
+               G_CALLBACK(on_sim_transfer_apdu), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-atr",
+               G_CALLBACK(on_sim_get_atr), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-fields",
+               G_CALLBACK(on_sim_get_fields), ctx);
+
+       g_signal_connect(sim,
+               "handle-set-powerstate",
+               G_CALLBACK(on_sim_set_power_state), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-impi",
+               G_CALLBACK(on_sim_get_impi), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-impu",
+               G_CALLBACK(on_sim_get_impu), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-domain",
+               G_CALLBACK(on_sim_get_domain), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-pcscf",
+               G_CALLBACK(on_sim_get_pcscf), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-app-list",
+               G_CALLBACK(on_sim_get_app_list), ctx);
+
+       g_signal_connect(sim,
+               "handle-get-isim-service-table",
+               G_CALLBACK(on_sim_get_isim_service_table), ctx);
 
        return TRUE;
 }
@@ -2217,8 +2166,7 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
        struct dbus_request_info *dbus_info, enum tcore_response_command command,
        unsigned int data_len, const void *data)
 {
-       dbg("Response!!! Command: [0x%x] CP Name: [%s]",
-               command, GET_CP_NAME(dbus_info->invocation));
+       char *cpname = dbus_info ? GET_CP_NAME(dbus_info->invocation) : "";
 
        switch (command) {
        case TRESP_SIM_GET_ECC: {
@@ -2228,8 +2176,7 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariantBuilder b;
                int i = 0;
 
-               dbg("TRESP_SIM_GET_ECC - Result: [%s])",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_ECC - [%s])", cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                co_sim = __get_sim_co_from_ur(ctx->server, ur);
                if (!co_sim) {
@@ -2237,15 +2184,15 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                        return FALSE;
                }
 
-               if (resp_read->result == SIM_ACCESS_SUCCESS) {
+               if (resp_read->result == SIM_ACCESS_SUCCESS)
                        tcore_sim_set_ecc_list(co_sim, &resp_read->data.ecc);
-               } else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND) {
+               else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND)
                        tcore_sim_set_ecc_list(co_sim, NULL);
-               }
 
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
                for (i = 0; i < resp_read->data.ecc.ecc_count; i++) {
-                       dbg("ecc[%d] : ecc_category=[0x%x], ecc_num=[%s], ecc_string=[%s]", i,
+                       dbg("[%s] ecc[%d] : ecc_category=[0x%x], ecc_num=[%s], ecc_string=[%s]",
+                               cpname, i,
                                resp_read->data.ecc.ecc[i].ecc_category,
                                resp_read->data.ecc.ecc[i].ecc_num,
                                resp_read->data.ecc.ecc[i].ecc_string);
@@ -2258,7 +2205,7 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                }
                gv = g_variant_builder_end(&b);
 
-               telephony_sim_complete_get_ecc (dbus_info->interface_object, dbus_info->invocation, gv);
+               telephony_sim_complete_get_ecc(dbus_info->interface_object, dbus_info->invocation, gv);
        }
        break;
 
@@ -2266,8 +2213,8 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                const struct tresp_sim_read *resp_read = data;
                CoreObject *co_sim = NULL;
 
-               dbg("TRESP_SIM_GET_ICCID - Result: [%s] ICCID: [%s])",
-                        (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_ICCID - [%s] ICCID: [%s])",
+                        cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
                         resp_read->data.iccid.iccid);
 
                co_sim = __get_sim_co_from_ur(ctx->server, ur);
@@ -2276,39 +2223,36 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                        return FALSE;
                }
 
-               if (resp_read->result == SIM_ACCESS_SUCCESS) {
+               if (resp_read->result == SIM_ACCESS_SUCCESS)
                        tcore_sim_set_iccid(co_sim, &resp_read->data.iccid);
-               } else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND) {
+               else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND)
                        tcore_sim_set_iccid(co_sim, NULL);
-               }
 
                telephony_sim_complete_get_iccid(dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               resp_read->data.iccid.iccid);
+                       resp_read->result, resp_read->data.iccid.iccid);
        }
        break;
 
        case TRESP_SIM_GET_LANGUAGE: {
                const struct tresp_sim_read *resp_read = data;
 
-               dbg("TRESP_SIM_GET_LANGUAGE - Result: [%s] Language: [0x%2x]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_LANGUAGE - [%s] Language: [0x%2x]",
+                       cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
                        resp_read->data.language.language[0]);
 
                telephony_sim_complete_get_language(dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               resp_read->data.language.language[0]);
+                       resp_read->result, resp_read->data.language.language[0]);
        }
        break;
 
        case TRESP_SIM_SET_LANGUAGE: {
                const struct tresp_sim_set_data *resp_set_data = data;
 
-               dbg("TRESP_SIM_SET_LANGUAGE - Result: [%s]",
-                       (resp_set_data->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] SET_LANGUAGE - [%s]",
+                       cpname, (resp_set_data->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
-               telephony_sim_complete_set_language(dbus_info->interface_object, dbus_info->invocation,
-                               resp_set_data->result);
+               telephony_sim_complete_set_language(dbus_info->interface_object,
+                       dbus_info->invocation, resp_set_data->result);
        }
        break;
 
@@ -2318,13 +2262,13 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariant *gv_cphs_cf = NULL;
                GVariantBuilder b;
 
-               dbg("TRESP_SIM_GET_CALLFORWARDING - Result: [%s] CPHS: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_CALLFORWARDING - [%s] CPHS: [%s]",
+                       cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
                        (resp_read->data.cf.b_cphs ? "Yes" : "No"));
 
                if (resp_read->data.cf.b_cphs) {
-                       dbg("b_line1[%d], b_line2[%d], b_fax[%d], b_data[%d]",
-                               resp_read->data.cf.cphs_cf.b_line1, resp_read->data.cf.cphs_cf.b_line2,
+                       dbg("[%s] b_line1[%d], b_line2[%d], b_fax[%d], b_data[%d]",
+                               cpname, resp_read->data.cf.cphs_cf.b_line1, resp_read->data.cf.cphs_cf.b_line2,
                                resp_read->data.cf.cphs_cf.b_fax, resp_read->data.cf.cphs_cf.b_data);
 
                        g_variant_builder_init(&b, G_VARIANT_TYPE("a{sv}"));
@@ -2338,15 +2282,15 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                        gv_cf = g_variant_builder_end(&b);
 
                } else {
-                       int i =0;
+                       int i = 0;
 
-                       dbg("profile_count[%d]",resp_read->data.cf.cf_list.profile_count);
+                       dbg("[%s] profile_count[%d]", cpname, resp_read->data.cf.cf_list.profile_count);
 
                        g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
                        for (i = 0; i < resp_read->data.cf.cf_list.profile_count; i++) {
-                               dbg("[%d] : rec_index[0x%x], msp_num[0x%x], cfu_status[0x%x], "
+                               dbg("[%s] [%d] : rec_index[0x%x], msp_num[0x%x], cfu_status[0x%x], "
                                        "cfu_num[%s], ton[0x%x], npi[0x%x], cc2_id[0x%x], ext7_id[0x%x]",
-                                       i, resp_read->data.cf.cf_list.cf[i].rec_index, resp_read->data.cf.cf_list.cf[i].msp_num,
+                                       cpname, i, resp_read->data.cf.cf_list.cf[i].rec_index, resp_read->data.cf.cf_list.cf[i].msp_num,
                                        resp_read->data.cf.cf_list.cf[i].cfu_status, resp_read->data.cf.cf_list.cf[i].cfu_num,
                                        resp_read->data.cf.cf_list.cf[i].ton, resp_read->data.cf.cf_list.cf[i].npi,
                                        resp_read->data.cf.cf_list.cf[i].cc2_id, resp_read->data.cf.cf_list.cf[i].ext7_id);
@@ -2368,19 +2312,16 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                        gv_cphs_cf = g_variant_builder_end(&b);
                }
 
-               telephony_sim_complete_get_call_forwarding (dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               resp_read->data.cf.b_cphs,
-                               gv_cf,
-                               gv_cphs_cf);
+               telephony_sim_complete_get_call_forwarding(dbus_info->interface_object, dbus_info->invocation,
+                       resp_read->result, resp_read->data.cf.b_cphs, gv_cf, gv_cphs_cf);
        }
        break;
 
        case TRESP_SIM_SET_CALLFORWARDING: {
                const struct tresp_sim_set_data *resp_set_data = data;
 
-               dbg("TRESP_SIM_SET_CALLFORWARDING - Result: [%s]",
-                       (resp_set_data->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] SET_CALLFORWARDING - [%s]",
+                       cpname, (resp_set_data->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                telephony_sim_complete_set_call_forwarding(dbus_info->interface_object, dbus_info->invocation,
                                resp_set_data->result);
@@ -2393,13 +2334,13 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariant *gv_cphs_mw = NULL;
                GVariantBuilder b;
 
-               dbg("TRESP_SIM_GET_MESSAGEWAITING - Result: [%s] CPHS: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_MESSAGEWAITING - [%s] CPHS: [%s]",
+                       cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
                        (resp_read->data.mw.b_cphs ? "Yes" : "No"));
 
                if (resp_read->data.mw.b_cphs) {
-                       dbg("b_voice1[%d], b_voice2[%d], b_fax[%d], b_data[%d]",
-                               resp_read->data.mw.cphs_mw.b_voice1, resp_read->data.mw.cphs_mw.b_voice2,
+                       dbg("[%s] b_voice1[%d], b_voice2[%d], b_fax[%d], b_data[%d]",
+                               cpname, resp_read->data.mw.cphs_mw.b_voice1, resp_read->data.mw.cphs_mw.b_voice2,
                                resp_read->data.mw.cphs_mw.b_fax, resp_read->data.mw.cphs_mw.b_data);
 
                        g_variant_builder_init(&b, G_VARIANT_TYPE("a{sv}"));
@@ -2413,24 +2354,24 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                        gv_mw = g_variant_builder_end(&b);
 
                } else {
-                       int i =0;
+                       int i = 0;
 
-                       dbg("profile_count[%d]", resp_read->data.mw.mw_list.profile_count);
+                       dbg("[%s] profile_count[%d]", cpname, resp_read->data.mw.mw_list.profile_count);
 
                        g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-                       for (i = 0; i <resp_read->data.mw.mw_list.profile_count; i++) {
-                               dbg("[%d] : rec_index[0x%x], indicator_status[0x%x], voice_count[0x%x], "
+                       for (i = 0; i < resp_read->data.mw.mw_list.profile_count; i++) {
+                               dbg("[%s] mw[%d] : rec_index[0x%x], indicator_status[0x%x], voice_count[0x%x], "
                                        "fax_count[0x%x] email_count[0x%x], other_count[0x%x], video_count[0x%x]",
-                                       i, resp_read->data.mw.mw_list.mw[i].rec_index, resp_read->data.mw.mw_list.mw[i].indicator_status,
+                                       cpname, i, resp_read->data.mw.mw_list.mw[i].rec_index, resp_read->data.mw.mw_list.mw[i].indicator_status,
                                        resp_read->data.mw.mw_list.mw[i].voice_count, resp_read->data.mw.mw_list.mw[i].fax_count,
                                        resp_read->data.mw.mw_list.mw[i].email_count, resp_read->data.mw.mw_list.mw[i].other_count,
                                        resp_read->data.mw.mw_list.mw[i].video_count);
 
                                g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b,"{sv}",        "rec_index", g_variant_new_int32(       resp_read->data.mw.mw_list.mw[i].rec_index));
+                               g_variant_builder_add(&b, "{sv}", "rec_index", g_variant_new_int32(resp_read->data.mw.mw_list.mw[i].rec_index));
                                g_variant_builder_add(&b, "{sv}", "indicator_status", g_variant_new_byte(resp_read->data.mw.mw_list.mw[i].indicator_status));
-                               g_variant_builder_add(&b,"{sv}",        "voice_count", g_variant_new_int32(resp_read->data.mw.mw_list.mw[i].voice_count));
-                               g_variant_builder_add(&b,"{sv}",        "fax_count", g_variant_new_int32(resp_read->data.mw.mw_list.mw[i].fax_count));
+                               g_variant_builder_add(&b, "{sv}", "voice_count", g_variant_new_int32(resp_read->data.mw.mw_list.mw[i].voice_count));
+                               g_variant_builder_add(&b, "{sv}", "fax_count", g_variant_new_int32(resp_read->data.mw.mw_list.mw[i].fax_count));
                                g_variant_builder_add(&b, "{sv}", "email_count", g_variant_new_int32(resp_read->data.mw.mw_list.mw[i].email_count));
                                g_variant_builder_add(&b, "{sv}", "other_count", g_variant_new_int32(resp_read->data.mw.mw_list.mw[i].other_count));
                                g_variant_builder_add(&b, "{sv}", "video_count", g_variant_new_int32(resp_read->data.mw.mw_list.mw[i].video_count));
@@ -2442,18 +2383,15 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                }
 
                telephony_sim_complete_get_message_waiting(dbus_info->interface_object, dbus_info->invocation,
-                                                                       resp_read->result,
-                                                                       resp_read->data.mw.b_cphs,
-                                                                       gv_mw,
-                                                                       gv_cphs_mw);
+                       resp_read->result, resp_read->data.mw.b_cphs, gv_mw, gv_cphs_mw);
        }
        break;
 
        case TRESP_SIM_SET_MESSAGEWAITING: {
                const struct tresp_sim_set_data *resp_set_data = data;
 
-               dbg("TRESP_SIM_SET_MESSAGEWAITING - Result: [%s]",
-                       (resp_set_data->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] SET_MESSAGEWAITING - [%s]",
+                       cpname, (resp_set_data->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                telephony_sim_complete_set_message_waiting(dbus_info->interface_object, dbus_info->invocation,
                                resp_set_data->result);
@@ -2464,19 +2402,18 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                const struct tresp_sim_read *resp_read = data;
                GVariant *gv = NULL;
                GVariantBuilder b;
-               int i =0;
+               int i = 0;
 
-               dbg("TRESP_SIM_GET_MAILBOX - Result: [%s] CPHS: [%s] Count: [%d])",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_MAILBOX - [%s] CPHS: [%s] Count: [%d])",
+                       cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
                        (resp_read->data.mb.b_cphs ? "Yes" : "No"),
                        resp_read->data.mb.count);
 
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-               for (i =0; i < resp_read->data.mb.count; i++) {
-                               dbg("resp_read->data.mb.mb[%d] : "
-                                               "rec_index[%d], profile_number[%d], mb_type[%d], alpha_id_max_len[%d]"
+               for (i = 0; i < resp_read->data.mb.count; i++) {
+                               dbg("[%s] mb[%d] : rec_index[%d], profile_number[%d], mb_type[%d], alpha_id_max_len[%d]"
                                                "alpha_id[%s], ton[%d], npi[%d], num[%s], cc_id[%d], ext1_id[%d]",
-                                               i, resp_read->data.mb.mb[i].rec_index, resp_read->data.mb.mb[i].profile_number,
+                                               cpname, i, resp_read->data.mb.mb[i].rec_index, resp_read->data.mb.mb[i].profile_number,
                                                resp_read->data.mb.mb[i].mb_type, resp_read->data.mb.mb[i].number_info.alpha_id_max_len,
                                                resp_read->data.mb.mb[i].number_info.alpha_id, resp_read->data.mb.mb[i].number_info.ton,
                                                resp_read->data.mb.mb[i].number_info.npi, resp_read->data.mb.mb[i].number_info.num,
@@ -2498,38 +2435,36 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
 
                gv = g_variant_builder_end(&b);
 
-               telephony_sim_complete_get_mailbox (dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               resp_read->data.mb.b_cphs,
-                               gv);
+               telephony_sim_complete_get_mailbox(dbus_info->interface_object, dbus_info->invocation,
+                       resp_read->result, resp_read->data.mb.b_cphs, gv);
        }
        break;
 
        case TRESP_SIM_SET_MAILBOX: {
                const struct tresp_sim_set_data *resp_set_data = data;
 
-               dbg("TRESP_SIM_SET_MAILBOX - Result: [%s]",
-                       (resp_set_data->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] SET_MAILBOX - [%s]",
+                       cpname, (resp_set_data->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
-               telephony_sim_complete_set_mailbox(dbus_info->interface_object, dbus_info->invocation,
-                               resp_set_data->result);
+               telephony_sim_complete_set_mailbox(dbus_info->interface_object,
+                       dbus_info->invocation, resp_set_data->result);
        }
        break;
 
        case TRESP_SIM_GET_CPHS_INFO: {
                const struct tresp_sim_read *resp_read = data;
 
-               dbg("TRESP_SIM_GET_CPHS_INFO - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_CPHS_INFO - [%s]",
+                       cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
-               telephony_sim_complete_get_cphsinfo (dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               resp_read->data.cphs.CphsPhase,
-                               resp_read->data.cphs.CphsServiceTable.bOperatorNameShortForm,
-                               resp_read->data.cphs.CphsServiceTable.bMailBoxNumbers,
-                               resp_read->data.cphs.CphsServiceTable.bServiceStringTable,
-                               resp_read->data.cphs.CphsServiceTable.bCustomerServiceProfile,
-                               resp_read->data.cphs.CphsServiceTable.bInformationNumbers);
+               telephony_sim_complete_get_cphsinfo(dbus_info->interface_object, dbus_info->invocation,
+                       resp_read->result,
+                       resp_read->data.cphs.CphsPhase,
+                       resp_read->data.cphs.CphsServiceTable.bOperatorNameShortForm,
+                       resp_read->data.cphs.CphsServiceTable.bMailBoxNumbers,
+                       resp_read->data.cphs.CphsServiceTable.bServiceStringTable,
+                       resp_read->data.cphs.CphsServiceTable.bCustomerServiceProfile,
+                       resp_read->data.cphs.CphsServiceTable.bInformationNumbers);
        }
        break;
 
@@ -2539,10 +2474,10 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariantBuilder builder;
                GVariant * inner_gv = NULL;
                GVariant *svct_gv = NULL;
-               int i =0;
+               int i = 0;
 
-               dbg("TRESP_SIM_GET_SERVICE_TABLE - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_SERVICE_TABLE - [%s]",
+                       cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                co_sim = __get_sim_co_from_ur(ctx->server, ur);
                if (!co_sim) {
@@ -2550,32 +2485,29 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                        return FALSE;
                }
 
-               if (resp_read->result == SIM_ACCESS_SUCCESS) {
+               if (resp_read->result == SIM_ACCESS_SUCCESS)
                        tcore_sim_set_service_table(co_sim, &resp_read->data.svct);
-               } else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND) {
+               else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND)
                        tcore_sim_set_service_table(co_sim, NULL);
-               }
 
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
 
                if (resp_read->data.svct.sim_type == SIM_TYPE_GSM) {
-                       for (i = 0; i < SIM_SST_SERVICE_CNT_MAX; i++) {
-                               g_variant_builder_add (&builder, "y", resp_read->data.svct.table.sst.service[i]);
-                       }
+                       for (i = 0; i < SIM_SST_SERVICE_CNT_MAX; i++)
+                               g_variant_builder_add(&builder, "y", resp_read->data.svct.table.sst.service[i]);
                } else if (resp_read->data.svct.sim_type == SIM_TYPE_USIM) {
-                       for (i = 0; i < SIM_UST_SERVICE_CNT_MAX; i++) {
-                               g_variant_builder_add (&builder, "y", resp_read->data.svct.table.ust.service[i]);
-                       }
-               } else if(resp_read->data.svct.sim_type == SIM_TYPE_RUIM) {
-                       if(SIM_CDMA_SVC_TABLE == resp_read->data.svct.table.cst.cdma_svc_table) {
-                               for(i = 0; i < SIM_CDMA_ST_SERVICE_CNT_MAX; i++) {
-                                       g_variant_builder_add (&builder, "iy", resp_read->data.svct.table.cst.cdma_svc_table,
-                                                                                       resp_read->data.svct.table.cst.service.cdma_service[i]);
+                       for (i = 0; i < SIM_UST_SERVICE_CNT_MAX; i++)
+                               g_variant_builder_add(&builder, "y", resp_read->data.svct.table.ust.service[i]);
+               } else if (resp_read->data.svct.sim_type == SIM_TYPE_RUIM) {
+                       if (SIM_CDMA_SVC_TABLE == resp_read->data.svct.table.cst.cdma_svc_table) {
+                               for (i = 0; i < SIM_CDMA_ST_SERVICE_CNT_MAX; i++) {
+                                       g_variant_builder_add(&builder, "iy", resp_read->data.svct.table.cst.cdma_svc_table,
+                                               resp_read->data.svct.table.cst.service.cdma_service[i]);
                                }
-                       } else if(SIM_CSIM_SVC_TABLE == resp_read->data.svct.table.cst.cdma_svc_table) {
-                               for(i = 0; i < SIM_CSIM_ST_SERVICE_CNT_MAX; i++) {
-                                       g_variant_builder_add (&builder, "iy", resp_read->data.svct.table.cst.cdma_svc_table,
-                                                                                       resp_read->data.svct.table.cst.service.csim_service[i]);
+                       } else if (SIM_CSIM_SVC_TABLE == resp_read->data.svct.table.cst.cdma_svc_table) {
+                               for (i = 0; i < SIM_CSIM_ST_SERVICE_CNT_MAX; i++) {
+                                       g_variant_builder_add(&builder, "iy", resp_read->data.svct.table.cst.cdma_svc_table,
+                                               resp_read->data.svct.table.cst.service.csim_service[i]);
                                }
                        } else {
                                err("Invalid cdma_svc_table:[%d]", resp_read->data.svct.table.cst.cdma_svc_table);
@@ -2586,18 +2518,16 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                inner_gv = g_variant_builder_end(&builder);
                svct_gv = g_variant_new("v", inner_gv);
 
-               telephony_sim_complete_get_service_table (dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               resp_read->data.svct.sim_type,
-                               svct_gv);
+               telephony_sim_complete_get_service_table(dbus_info->interface_object, dbus_info->invocation,
+                       resp_read->result, resp_read->data.svct.sim_type, svct_gv);
        }       break;
 
        case TRESP_SIM_GET_SPN: {
                const struct tresp_sim_read *resp_read = data;
                CoreObject *co_sim = NULL;
 
-               dbg("TRESP_SIM_GET_SPN - Result: [%s] Display condition: [%d] SPN: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_SPN - [%s] Display condition: [%d] SPN: [%s]",
+                       cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"),
                        resp_read->data.spn.display_condition, (const gchar *)resp_read->data.spn.spn);
 
                co_sim = __get_sim_co_from_ur(ctx->server, ur);
@@ -2606,15 +2536,14 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                        return FALSE;
                }
 
-               if (resp_read->result == SIM_ACCESS_SUCCESS) {
+               if (resp_read->result == SIM_ACCESS_SUCCESS)
                        tcore_sim_set_spn(co_sim, &resp_read->data.spn);
-               } else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND) {
+               else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND)
                        tcore_sim_set_spn(co_sim, NULL);
-               }
 
-               telephony_sim_complete_get_spn (dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               resp_read->data.spn.display_condition, (const gchar *)resp_read->data.spn.spn);
+               telephony_sim_complete_get_spn(dbus_info->interface_object, dbus_info->invocation,
+                       resp_read->result, resp_read->data.spn.display_condition,
+                       (const gchar *)resp_read->data.spn.spn);
        }
        break;
 
@@ -2622,8 +2551,8 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                const struct tresp_sim_read *resp_read = data;
                CoreObject *co_sim = NULL;
 
-               dbg("TRESP_SIM_GET_CPHS_NETNAME - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_CPHS_NETNAME - [%s]",
+                       cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                co_sim = __get_sim_co_from_ur(ctx->server, ur);
                if (!co_sim) {
@@ -2631,15 +2560,14 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                        return FALSE;
                }
 
-               if (resp_read->result == SIM_ACCESS_SUCCESS) {
+               if (resp_read->result == SIM_ACCESS_SUCCESS)
                        tcore_sim_set_cphs_netname(co_sim, &resp_read->data.cphs_net);
-               } else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND) {
+               else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND)
                        tcore_sim_set_cphs_netname(co_sim, NULL);
-               }
 
-               telephony_sim_complete_get_cphs_net_name (dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               (const gchar *)resp_read->data.cphs_net.full_name, (const gchar *)resp_read->data.cphs_net.short_name);
+               telephony_sim_complete_get_cphs_net_name(dbus_info->interface_object, dbus_info->invocation,
+                       resp_read->result, (const gchar *)resp_read->data.cphs_net.full_name,
+                       (const gchar *)resp_read->data.cphs_net.short_name);
        }
        break;
 
@@ -2648,23 +2576,19 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariantBuilder *builder = NULL;
                GVariant * inner_gv = NULL;
                GVariant *gid_gv = NULL;
-               int i =0;
+               int i = 0;
 
-               dbg("TRESP_SIM_GET_GID - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_GID - [%s]", cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
-               builder = g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+               builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
 
-               for(i = 0; i < resp_read->data.gid.GroupIdentifierLen; i++) {
-                       g_variant_builder_add (builder, "y", resp_read->data.gid.szGroupIdentifier[i]);
-               }
+               for (i = 0; i < resp_read->data.gid.GroupIdentifierLen; i++)
+                       g_variant_builder_add(builder, "y", resp_read->data.gid.szGroupIdentifier[i]);
                inner_gv = g_variant_builder_end(builder);
                gid_gv = g_variant_new("v", inner_gv);
 
-               telephony_sim_complete_get_gid (dbus_info->interface_object, dbus_info->invocation,
-                                               resp_read->result,
-                                               resp_read->data.gid.GroupIdentifierLen,
-                                               gid_gv);
+               telephony_sim_complete_get_gid(dbus_info->interface_object, dbus_info->invocation,
+                       resp_read->result, resp_read->data.gid.GroupIdentifierLen, gid_gv);
        }
        break;
 
@@ -2673,10 +2597,9 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                CoreObject *co_sim = NULL;
                GVariant *gv = NULL;
                GVariantBuilder b;
-               int i =0;
+               int i = 0;
 
-               dbg("TRESP_SIM_GET_MSISDN - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_MSISDN - [%s]", cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                co_sim = __get_sim_co_from_ur(ctx->server, ur);
                if (!co_sim) {
@@ -2685,18 +2608,17 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                }
 
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-               if (resp_read->result == SIM_ACCESS_SUCCESS) {
+               if (resp_read->result == SIM_ACCESS_SUCCESS)
                        tcore_sim_set_msisdn_list(co_sim, &resp_read->data.msisdn_list);
-               } else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND) {
+               else if (resp_read->result == SIM_ACCESS_FILE_NOT_FOUND)
                        tcore_sim_set_msisdn_list(co_sim, NULL);
-               }
 
                for (i = 0; i < resp_read->data.msisdn_list.count; i++) {
-                       g_variant_builder_open(&b,G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "name", g_variant_new_string((const gchar *)resp_read->data.msisdn_list.msisdn[i].name));
                        if (resp_read->data.msisdn_list.msisdn[i].ton == SIM_TON_INTERNATIONAL) {
                                unsigned char *tmp = (unsigned char *)calloc(SIM_MSISDN_NUMBER_LEN_MAX + 1, 1);
-                               if (tmp!=NULL) {
+                               if (tmp != NULL) {
                                        tmp[0] = '+';
                                        strncpy((char *)tmp+1, (const char*)resp_read->data.msisdn_list.msisdn[i].num, SIM_MSISDN_NUMBER_LEN_MAX - 1);
                                        tmp[SIM_MSISDN_NUMBER_LEN_MAX] = '\0';
@@ -2713,9 +2635,8 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                }
                gv = g_variant_builder_end(&b);
 
-               telephony_sim_complete_get_msisdn (dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               gv);
+               telephony_sim_complete_get_msisdn(dbus_info->interface_object,
+                       dbus_info->invocation, resp_read->result, gv);
        }
        break;
 
@@ -2723,14 +2644,13 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                const struct tresp_sim_read *resp_read = data;
                GVariant *gv = NULL;
                GVariantBuilder b;
-               int i =0;
+               int i = 0;
 
-               dbg("TRESP_SIM_GET_OPLMNWACT - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_OPLMNWACT - [%s]", cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-               for (i = 0;i < resp_read->data.opwa.opwa_count; i++) {
-                       g_variant_builder_open(&b,G_VARIANT_TYPE("a{sv}"));
+               for (i = 0; i < resp_read->data.opwa.opwa_count; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                        g_variant_builder_add(&b, "{sv}", "plmn", g_variant_new_string((const gchar *)resp_read->data.opwa.opwa[i].plmn));
                        g_variant_builder_add(&b, "{sv}", "b_umts", g_variant_new_boolean(resp_read->data.opwa.opwa[i].b_umts));
                        g_variant_builder_add(&b, "{sv}", "b_gsm", g_variant_new_boolean(resp_read->data.opwa.opwa[i].b_gsm));
@@ -2738,9 +2658,8 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                }
                gv = g_variant_builder_end(&b);
 
-               telephony_sim_complete_get_oplmnwact (dbus_info->interface_object, dbus_info->invocation,
-                               resp_read->result,
-                               gv);
+               telephony_sim_complete_get_oplmnwact(dbus_info->interface_object,
+                       dbus_info->invocation, resp_read->result, gv);
        }
        break;
 
@@ -2755,44 +2674,39 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariant *cp_gv = NULL;
                GVariant *it_gv = NULL;
                GVariant *resp_gv = NULL;
-               int i =0;
+               int i = 0;
 
-               dbg("TRESP_SIM_REQ_AUTHENTICATION - Result: [%s]",
-                       (resp_auth->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] REQ_AUTHENTICATION - [%s]", cpname, (resp_auth->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                tcore_util_hex_dump("[AUTH_KEY] ", resp_auth->authentication_key_length, resp_auth->authentication_key);
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
-               for (i = 0; i < (int)resp_auth->authentication_key_length; i++) {
-                       g_variant_builder_add (&builder, "y", resp_auth->authentication_key[i]);
-               }
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < (int)resp_auth->authentication_key_length; i++)
+                       g_variant_builder_add(&builder, "y", resp_auth->authentication_key[i]);
                ak = g_variant_builder_end(&builder);
                ak_gv = g_variant_new("v", ak);
 
                tcore_util_hex_dump("[CIPHER_DATA] ", resp_auth->cipher_length, resp_auth->cipher_data);
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
-               for (i = 0; i < (int)resp_auth->cipher_length; i++) {
-                       g_variant_builder_add (&builder, "y", resp_auth->cipher_data[i]);
-               }
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < (int)resp_auth->cipher_length; i++)
+                       g_variant_builder_add(&builder, "y", resp_auth->cipher_data[i]);
                cp = g_variant_builder_end(&builder);
                cp_gv = g_variant_new("v", cp);
 
                tcore_util_hex_dump("[INTEGRITY_DATA] ", resp_auth->integrity_length, resp_auth->integrity_data);
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
-               for (i = 0; i < (int)resp_auth->integrity_length; i++) {
-                       g_variant_builder_add (&builder, "y", resp_auth->integrity_data[i]);
-               }
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < (int)resp_auth->integrity_length; i++)
+                       g_variant_builder_add(&builder, "y", resp_auth->integrity_data[i]);
                it = g_variant_builder_end(&builder);
                it_gv = g_variant_new("v", it);
 
                tcore_util_hex_dump("[RESP_DATA] ", resp_auth->resp_length, resp_auth->resp_data);
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
-               for (i = 0; i < (int)resp_auth->resp_length; i++) {
-                       g_variant_builder_add (&builder, "y", resp_auth->resp_data[i]);
-               }
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < (int)resp_auth->resp_length; i++)
+                       g_variant_builder_add(&builder, "y", resp_auth->resp_data[i]);
                resp = g_variant_builder_end(&builder);
                resp_gv = g_variant_new("v", resp);
 
-               telephony_sim_complete_authentication (dbus_info->interface_object, dbus_info->invocation,
+               telephony_sim_complete_authentication(dbus_info->interface_object, dbus_info->invocation,
                                resp_auth->result,
                                resp_auth->auth_type,
                                resp_auth->auth_result,
@@ -2806,8 +2720,8 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_SIM_VERIFY_PINS: {
                const struct tresp_sim_verify_pins *resp_verify_pins = data;
 
-               dbg("TRESP_SIM_VERIFY_PINS - Result: [%s] PIN Type: [%d] Re-try count: [%d]",
-                       (resp_verify_pins->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] VERIFY_PINS - [%s] PIN Type: [%d] Re-try count: [%d]",
+                       cpname, (resp_verify_pins->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
                        resp_verify_pins->pin_type, resp_verify_pins->retry_count);
 
                telephony_sim_complete_verify_sec(dbus_info->interface_object, dbus_info->invocation,
@@ -2820,11 +2734,11 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_SIM_VERIFY_PUKS: {
                const struct tresp_sim_verify_puks *resp_verify_puks = data;
 
-               dbg("TRESP_SIM_VERIFY_PUKS - Result: [%s] PIN Type: [%d] Re-try count: [%d]",
-                       (resp_verify_puks->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] VERIFY_PUKS - [%s] PIN Type: [%d] Re-try count: [%d]",
+                       cpname, (resp_verify_puks->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
                        resp_verify_puks->pin_type, resp_verify_puks->retry_count);
 
-               telephony_sim_complete_verify_puk (dbus_info->interface_object, dbus_info->invocation,
+               telephony_sim_complete_verify_puk(dbus_info->interface_object, dbus_info->invocation,
                                resp_verify_puks->result,
                                resp_verify_puks->pin_type,
                                resp_verify_puks->retry_count);
@@ -2834,8 +2748,8 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_SIM_CHANGE_PINS: {
                const struct tresp_sim_change_pins *resp_change_pins = data;
 
-               dbg("TRESP_SIM_CHANGE_PINS - Result: [%s] PIN Type: [%d] Re-try count: [%d]",
-                       (resp_change_pins->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] CHANGE_PINS - [%s] PIN Type: [%d] Re-try count: [%d]",
+                       cpname, (resp_change_pins->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
                        resp_change_pins->pin_type, resp_change_pins->retry_count);
 
                telephony_sim_complete_change_pin(dbus_info->interface_object, dbus_info->invocation,
@@ -2847,10 +2761,10 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
 
        case TRESP_SIM_DISABLE_FACILITY: {
                const struct tresp_sim_disable_facility *resp_dis_facility = data;
-               gint f_type =0;
+               gint f_type = 0;
 
-               dbg("TRESP_SIM_DISABLE_FACILITY - Result: [%s] Type: [%d] Re-try count: [%d]",
-                       (resp_dis_facility->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] DISABLE_FACILITY - [%s] Type: [%d] Re-try count: [%d]",
+                       cpname, (resp_dis_facility->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
                        resp_dis_facility->type, resp_dis_facility->retry_count);
 
                switch (resp_dis_facility->type) {
@@ -2889,10 +2803,10 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
 
        case TRESP_SIM_ENABLE_FACILITY: {
                const struct tresp_sim_enable_facility *resp_en_facility = data;
-               gint f_type =0;
+               gint f_type = 0;
 
-               dbg("TRESP_SIM_ENABLE_FACILITY - Result: [%s] Type: [%d] Re-try count: [%d]",
-                       (resp_en_facility->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] ENABLE_FACILITY - [%s] Type: [%d] Re-try count: [%d]",
+                       cpname, (resp_en_facility->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
                        resp_en_facility->type, resp_en_facility->retry_count);
 
                switch (resp_en_facility->type) {
@@ -2931,10 +2845,10 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
 
        case TRESP_SIM_GET_FACILITY_STATUS: {
                const struct tresp_sim_get_facility_status *resp_get_facility = data;
-               gint f_type =0;
+               gint f_type = 0;
 
-               dbg("TRESP_SIM_GET_FACILITY_STATUS - Result: [%s] Type: [%d] Enable: [%s]",
-                       (resp_get_facility->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_FACILITY_STATUS - [%s] Type: [%d] Enable: [%s]",
+                       cpname, (resp_get_facility->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
                        resp_get_facility->type,
                        (resp_get_facility->b_enable ? "Yes" : "No"));
 
@@ -2974,10 +2888,10 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
 
        case TRESP_SIM_GET_LOCK_INFO: {
                const struct tresp_sim_get_lock_info *resp_lock = data;
-               gint f_type =0;
+               gint f_type = 0;
 
-               dbg("TRESP_SIM_GET_LOCK_INFO - Result: [%s] Type: [%d] Re-try count: [%d]",
-                       (resp_lock->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
+               dbg("[%s] GET_LOCK_INFO - [%s] Type: [%d] Re-try count: [%d]",
+                       cpname, (resp_lock->result == SIM_PIN_OPERATION_SUCCESS ? "Success" : "Fail"),
                        resp_lock->type, resp_lock->retry_count);
 
                switch (resp_lock->type) {
@@ -3020,17 +2934,15 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariantBuilder builder;
                GVariant * apdu_gv = NULL;
                GVariant *inner_gv = NULL;
-               int i =0;
+               int i = 0;
 
-               dbg("TRESP_SIM_TRANSMIT_APDU - Result: [%s]",
-                       (resp_apdu->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
-               tcore_util_hex_dump("[APDU_RESP] ",
-                       resp_apdu->apdu_resp_length, resp_apdu->apdu_resp);
+               dbg("[%s] TRANSMIT_APDU - [%s]",
+                       cpname, (resp_apdu->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               tcore_util_hex_dump("[APDU_RESP] ",     resp_apdu->apdu_resp_length, resp_apdu->apdu_resp);
 
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
-               for (i = 0; i < (int)resp_apdu->apdu_resp_length; i++) {
-                       g_variant_builder_add (&builder, "y", resp_apdu->apdu_resp[i]);
-               }
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < (int)resp_apdu->apdu_resp_length; i++)
+                       g_variant_builder_add(&builder, "y", resp_apdu->apdu_resp[i]);
                inner_gv = g_variant_builder_end(&builder);
                apdu_gv = g_variant_new("v", inner_gv);
 
@@ -3045,17 +2957,14 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariantBuilder builder;
                GVariant * atr_gv = NULL;
                GVariant *inner_gv = NULL;
-               int i =0;
+               int i = 0;
 
-               dbg("TRESP_SIM_GET_ATR - Result: [%s]",
-                       (resp_get_atr->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
-               tcore_util_hex_dump("[ATR_RESP] ",
-                       resp_get_atr->atr_length, resp_get_atr->atr);
+               dbg("[%s] GET_ATR - [%s]", cpname, (resp_get_atr->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               tcore_util_hex_dump("[ATR_RESP] ", resp_get_atr->atr_length, resp_get_atr->atr);
 
-               g_variant_builder_init (&builder, G_VARIANT_TYPE ("ay"));
-               for (i = 0; i < (int)resp_get_atr->atr_length; i++) {
-                       g_variant_builder_add (&builder, "y", resp_get_atr->atr[i]);
-               }
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < (int)resp_get_atr->atr_length; i++)
+                       g_variant_builder_add(&builder, "y", resp_get_atr->atr[i]);
                inner_gv = g_variant_builder_end(&builder);
                atr_gv = g_variant_new("v", inner_gv);
 
@@ -3068,8 +2977,7 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_SIM_SET_POWERSTATE: {
                const struct tresp_sim_set_powerstate *resp_power = data;
 
-               dbg("TRESP_SIM_SET_POWERSTATE - Result: [%s]",
-                       (resp_power->result == SIM_POWER_SET_SUCCESS ? "Success" : "Fail"));
+               info("[%s] SET_POWERSTATE - [%s]", cpname, (resp_power->result == SIM_POWER_SET_SUCCESS ? "Success" : "Fail"));
 
                telephony_sim_complete_set_powerstate(dbus_info->interface_object, dbus_info->invocation,
                                resp_power->result);
@@ -3079,8 +2987,7 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_SIM_GET_IMPI: {
                const struct tresp_sim_read *resp_read = data;
 
-               dbg("TRESP_SIM_GET_IMPI - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_IMPI - [%s]", cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                telephony_sim_complete_get_impi(dbus_info->interface_object,
                        dbus_info->invocation, resp_read->result,
@@ -3094,8 +3001,7 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariantBuilder b;
                unsigned int i;
 
-               dbg("TRESP_SIM_GET_IMPU - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_IMPU - [%s]", cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
                for (i = 0; i < resp_read->data.impu_list.count; i++) {
@@ -3113,8 +3019,7 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_SIM_GET_DOMAIN: {
                const struct tresp_sim_read *resp_read = data;
 
-               dbg("TRESP_SIM_GET_DOMAIN - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_DOMAIN - [%s]", cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                telephony_sim_complete_get_domain(dbus_info->interface_object,
                        dbus_info->invocation, resp_read->result,
@@ -3128,8 +3033,7 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariantBuilder b;
                unsigned int i;
 
-               dbg("TRESP_SIM_GET_PCSCF - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_PCSCF - [%s]", cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
                g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
                for (i = 0; i < resp_read->data.pcscf_list.count; i++) {
@@ -3154,13 +3058,11 @@ gboolean dbus_plugin_sim_response(struct custom_data *ctx, UserRequest *ur,
                GVariant *inner_gv = NULL;
                int i;
 
-               dbg("TRESP_SIM_GET_ISIM_SERVICE_TABLE - Result: [%s]",
-                       (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
+               dbg("[%s] GET_ISIM_SERVICE_TABLE - [%s]", cpname, (resp_read->result == SIM_ACCESS_SUCCESS ? "Success" : "Fail"));
 
-               g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-               for (i = 0; i < SIM_IST_SERVICE_CNT_MAX; i++) {
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < SIM_IST_SERVICE_CNT_MAX; i++)
                        g_variant_builder_add(&builder, "y", resp_read->data.ist.service[i]);
-               }
                inner_gv = g_variant_builder_end(&builder);
                ist_gv = g_variant_new("v", inner_gv);
 
@@ -3186,18 +3088,18 @@ gboolean dbus_plugin_sim_notification(struct custom_data *ctx, CoreObject *sourc
 
        cp_name = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
 
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-               command, cp_name);
-
        sim = telephony_object_peek_sim(TELEPHONY_OBJECT(object));
-       dbg("sim: [%p]", sim);
+       if (sim == NULL) {
+               err("sim object is NULL!!!");
+               return FALSE;
+       }
 
        switch (command) {
        case TNOTI_SIM_STATUS: {
                const struct tnoti_sim_status *n_sim_status = data;
                int count = 0;
 
-               info("[DBUSINFO][%s] SIM_STATUS : [%d]", cp_name, n_sim_status->sim_status);
+               info("[%s] SIM_STATUS : [%d]", cp_name, n_sim_status->sim_status);
 
 #ifdef ENABLE_KPI_LOGS
                if (n_sim_status->sim_status == SIM_STATUS_INIT_COMPLETED)
@@ -3220,7 +3122,7 @@ gboolean dbus_plugin_sim_notification(struct custom_data *ctx, CoreObject *sourc
 
        case TNOTI_SIM_REFRESHED: {
                const struct tnoti_sim_refreshed *n_sim_refreshed = data;
-               info("[DBUSINFO][%s] SIM_REFRESHED : b_full_file_changed: [%s] changed_file_count: [%d]",
+               info("[%s] SIM_REFRESHED : b_full_file_changed: [%s] changed_file_count: [%d]",
                        cp_name, (n_sim_refreshed->b_full_file_changed ? "Yes" : "No"), n_sim_refreshed->file_list.file_count);
 
                telephony_sim_emit_refreshed(sim, n_sim_refreshed->cmd_type);
@@ -3229,7 +3131,7 @@ gboolean dbus_plugin_sim_notification(struct custom_data *ctx, CoreObject *sourc
 
        case TNOTI_SIM_CALL_FORWARD_STATE: {
                const struct tnoti_sim_call_forward_state *info = data;
-               info("[DBUSINFO][%s] SIM_CALL_FORWARD_STATE : [%s]",
+               info("[%s] SIM_CALL_FORWARD_STATE : [%s]",
                        cp_name, info->b_forward ? "ON" : "OFF");
 
                telephony_sim_set_cf_state(sim, info->b_forward);
old mode 100755 (executable)
new mode 100644 (file)
index b9eee54..65acbbf
--- a/src/sms.c
+++ b/src/sms.c
@@ -53,7 +53,7 @@ on_sms_send_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        int i = 0;
        GVariantIter *iter = 0;
@@ -64,22 +64,22 @@ on_sms_send_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        memset(&sendMsg, 0 , sizeof(struct treq_sms_send_msg));
 
-       inner_gv = g_variant_get_variant( sca );
+       inner_gv = g_variant_get_variant(sca);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &sendMsg.msgDataPackage.sca[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &sendMsg.msgDataPackage.sca[i])) {
                i++;
-               if( i >= SMS_SMSP_ADDRESS_LEN )
+               if (i >= SMS_SMSP_ADDRESS_LEN)
                        break;
        }
 
        sendMsg.msgDataPackage.msgLength = tpdu_length;
 
        i = 0;
-       inner_gv = g_variant_get_variant( tpdu_data );
+       inner_gv = g_variant_get_variant(tpdu_data);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &sendMsg.msgDataPackage.tpduData[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &sendMsg.msgDataPackage.tpduData[i])) {
                i++;
-               if( i >= SMS_SMDATA_SIZE_MAX + 1 )
+               if (i >= SMS_SMDATA_SIZE_MAX + 1)
                        break;
        }
        g_variant_iter_free(iter);
@@ -93,18 +93,18 @@ on_sms_send_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        if (SMS_NETTYPE_3GPP == format) {
                tcore_user_request_set_command(ur, TREQ_SMS_SEND_UMTS_MSG);
-       } else if (SMS_NETTYPE_3GPP2 == format){
+       } else if (SMS_NETTYPE_3GPP2 == format) {
                tcore_user_request_set_command(ur, TREQ_SMS_SEND_CDMA_MSG);
        } else {
                err("Invalid Format Received:[%d]", format);
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
                return TRUE;
        }
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -120,7 +120,7 @@ on_sms_read_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
                return TRUE;
@@ -133,7 +133,7 @@ on_sms_read_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -153,7 +153,7 @@ on_sms_save_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        int i = 0;
        GVariantIter *iter = 0;
@@ -164,11 +164,11 @@ on_sms_save_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        if (SMS_NETTYPE_3GPP == format) {
                saveMsg.msgDataPackage.format = SMS_NETTYPE_3GPP;
-       } else if (SMS_NETTYPE_3GPP2 == format){
+       } else if (SMS_NETTYPE_3GPP2 == format) {
                saveMsg.msgDataPackage.format = SMS_NETTYPE_3GPP2;
        } else {
                err("Invalid Format Received:[%d]", format);
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
                return TRUE;
        }
@@ -176,20 +176,20 @@ on_sms_save_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
        saveMsg.simIndex = 0xffff;
        saveMsg.msgStatus = arg_msg_status;
 
-       inner_gv = g_variant_get_variant( arg_sca );
+       inner_gv = g_variant_get_variant(arg_sca);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &saveMsg.msgDataPackage.sca[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &saveMsg.msgDataPackage.sca[i])) {
                i++;
-               if( i >= SMS_SMSP_ADDRESS_LEN )
+               if (i >= SMS_SMSP_ADDRESS_LEN)
                        break;
        }
 
        i = 0;
-       inner_gv = g_variant_get_variant( arg_tpdu_data );
+       inner_gv = g_variant_get_variant(arg_tpdu_data);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &saveMsg.msgDataPackage.tpduData[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &saveMsg.msgDataPackage.tpduData[i])) {
                i++;
-               if( i >= SMS_SMDATA_SIZE_MAX + 1 )
+               if (i >= SMS_SMDATA_SIZE_MAX + 1)
                        break;
        }
        g_variant_iter_free(iter);
@@ -203,7 +203,7 @@ on_sms_save_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -219,7 +219,7 @@ on_sms_delete_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "x"))
                return TRUE;
@@ -232,7 +232,7 @@ on_sms_delete_msg(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -246,7 +246,7 @@ on_sms_get_msg_count(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
                return TRUE;
@@ -257,7 +257,7 @@ on_sms_get_msg_count(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -273,7 +273,7 @@ on_sms_get_sca(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
                return TRUE;
@@ -286,7 +286,7 @@ on_sms_get_sca(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -306,7 +306,7 @@ on_sms_set_sca(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        int i = 0;
        GVariantIter *iter = 0;
@@ -322,25 +322,20 @@ on_sms_set_sca(TelephonySms *sms, GDBusMethodInvocation *invocation,
        setSca.scaInfo.typeOfNum = arg_ton;
        setSca.scaInfo.numPlanId = arg_npi;
 
-       if ((setSca.scaInfo.dialNumLen <= 0) || (setSca.scaInfo.dialNumLen > (SMS_MAX_SMS_SERVICE_CENTER_ADDR + 1)))
-       {
+       if ((setSca.scaInfo.dialNumLen <= 0) || (setSca.scaInfo.dialNumLen > (SMS_MAX_SMS_SERVICE_CENTER_ADDR + 1))) {
                err("[tcore_SMS] TAPI_API_INVALID_INPUT !!!");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return  TRUE;
-       }
-       else if(setSca.index != 0)
-       {
+       } else if (setSca.index != 0) {
                err("[tcore_SMS] Index except 0 is supported");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return  TRUE;
-       }
-       else
-       {
-               inner_gv = g_variant_get_variant( arg_dialNumber );
+       } else {
+               inner_gv = g_variant_get_variant(arg_dialNumber);
                g_variant_get(inner_gv, "ay", &iter);
-               while( g_variant_iter_loop(iter, "y", &setSca.scaInfo.diallingNum[i] ) ) {
+               while (g_variant_iter_loop(iter, "y", &setSca.scaInfo.diallingNum[i])) {
                        i++;
-                       if( i >= SMS_SMSP_ADDRESS_LEN + 1 )
+                       if (i >= SMS_SMSP_ADDRESS_LEN + 1)
                                break;
                }
 
@@ -353,7 +348,7 @@ on_sms_set_sca(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
                ret = tcore_communicator_dispatch_request(ctx->comm, ur);
                if (ret != TCORE_RETURN_SUCCESS) {
-                       FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+                       FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                        tcore_user_request_unref(ur);
                }
        }
@@ -368,7 +363,7 @@ on_sms_get_cb_config(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
                return TRUE;
@@ -379,7 +374,7 @@ on_sms_get_cb_config(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -395,11 +390,11 @@ on_sms_set_cb_config(TelephonySms *sms, GDBusMethodInvocation *invocation,
        GVariant *arg_mdgId,
        gpointer user_data)
 {
-    struct treq_sms_set_cb_config setCbConfig = {0,};
+       struct treq_sms_set_cb_config setCbConfig = {0,};
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        GVariant *value = NULL;
        GVariant *inner_gv = 0;
@@ -416,30 +411,25 @@ on_sms_set_cb_config(TelephonySms *sms, GDBusMethodInvocation *invocation,
        setCbConfig.msgIdMaxCount = arg_msgIdMaxCount;
        setCbConfig.msgIdRangeCount = arg_msgIdRangeCount;
 
-       inner_gv = g_variant_get_variant( arg_mdgId );
+       inner_gv = g_variant_get_variant(arg_mdgId);
        g_variant_get(inner_gv, "aa{sv}", &iter);
 
        while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
-                       if (!g_strcmp0(key, "FromMsgId")) {
+                       if (!g_strcmp0(key, "FromMsgId"))
                                setCbConfig.msgIDs[i].net3gpp.fromMsgId = g_variant_get_uint16(value);
-                       }
-                       if (!g_strcmp0(key, "ToMsgId")) {
+                       if (!g_strcmp0(key, "ToMsgId"))
                                setCbConfig.msgIDs[i].net3gpp.toMsgId = g_variant_get_uint16(value);
-                       }
-                       if (!g_strcmp0(key, "CBCategory")) {
+                       if (!g_strcmp0(key, "CBCategory"))
                                setCbConfig.msgIDs[i].net3gpp2.cbCategory = g_variant_get_uint16(value);
-                       }
-                       if (!g_strcmp0(key, "CBLanguage")) {
+                       if (!g_strcmp0(key, "CBLanguage"))
                                setCbConfig.msgIDs[i].net3gpp2.cbLanguage = g_variant_get_uint16(value);
-                       }
-                       if (!g_strcmp0(key, "Selected")) {
+                       if (!g_strcmp0(key, "Selected"))
                                setCbConfig.msgIDs[i].net3gpp2.selected = g_variant_get_byte(value);
-                       }
                }
                i++;
                g_variant_iter_free(iter_row);
-               if ( i >= SMS_GSM_SMS_CBMI_LIST_SIZE_MAX )
+               if (i >= SMS_GSM_SMS_CBMI_LIST_SIZE_MAX)
                        break;
        }
        g_variant_iter_free(iter);
@@ -450,7 +440,7 @@ on_sms_set_cb_config(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -466,7 +456,7 @@ on_sms_set_mem_status(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
                return TRUE;
@@ -479,7 +469,7 @@ on_sms_set_mem_status(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -494,7 +484,7 @@ on_sms_get_pref_bearer(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
                return TRUE;
@@ -505,7 +495,7 @@ on_sms_get_pref_bearer(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -521,7 +511,7 @@ on_sms_set_pref_bearer(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
                return TRUE;
@@ -534,7 +524,7 @@ on_sms_set_pref_bearer(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -554,7 +544,7 @@ on_sms_set_delivery_report(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        guchar *decoded_sca = NULL;
        guchar *decoded_tpdu = NULL;
@@ -569,43 +559,41 @@ on_sms_set_delivery_report(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        if (SMS_NETTYPE_3GPP == format) {
                deliveryReport.dataInfo.format = SMS_NETTYPE_3GPP;
-       } else if (SMS_NETTYPE_3GPP2 == format){
+       } else if (SMS_NETTYPE_3GPP2 == format) {
                deliveryReport.dataInfo.format = SMS_NETTYPE_3GPP2;
        } else {
                err("Invalid Format Received:[%d]", format);
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
                return TRUE;
        }
 
        decoded_sca = g_base64_decode(arg_sca, &decoded_sca_len);
        if (NULL == decoded_sca) {
-               dbg("g_base64_decode: Failed to decode sca");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               warn("g_base64_decode: Failed to decode sca");
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return TRUE;
        }
 
-       info("[DBUS_INFO]Decoded sca length[%d]", decoded_sca_len);
-
        if (decoded_sca_len > SMS_SMSP_ADDRESS_LEN) {
                err("Invalid Sca length");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                goto EXIT;
        }
        memcpy(deliveryReport.dataInfo.sca, decoded_sca, decoded_sca_len);
 
        decoded_tpdu = g_base64_decode(arg_tpdu_data, &decoded_tpdu_len);
        if (NULL == decoded_tpdu) {
-               dbg("g_base64_decode: Failed to decode tpdu");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               warn("g_base64_decode: Failed to decode tpdu");
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                goto EXIT;
        }
 
-       info("[DBUS_INFO]Decoded tpdu length[%d]", decoded_tpdu_len);
+       info("[%s] Decoded SCA len:(%d) TPDU len:(%d)", GET_CP_NAME(invocation), decoded_sca_len, decoded_tpdu_len);
 
        if (decoded_tpdu_len > SMS_SMDATA_SIZE_MAX+1) {
                err("Invalid tpdu length");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                goto EXIT;
        }
        memcpy(deliveryReport.dataInfo.tpduData, decoded_tpdu, decoded_tpdu_len);
@@ -619,7 +607,7 @@ on_sms_set_delivery_report(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -641,7 +629,7 @@ on_sms_set_msg_status(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
                return TRUE;
@@ -655,7 +643,7 @@ on_sms_set_msg_status(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -671,7 +659,7 @@ on_sms_get_sms_params(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
                return TRUE;
@@ -684,7 +672,7 @@ on_sms_get_sms_params(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -715,7 +703,7 @@ on_sms_set_sms_params(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        int i = 0;
        GVariantIter *iter = 0;
@@ -730,11 +718,11 @@ on_sms_set_sms_params(TelephonySms *sms, GDBusMethodInvocation *invocation,
        setParams.params.recordLen = arg_recordLen;
        setParams.params.alphaIdLen = arg_alphaIdLen;
 
-       inner_gv = g_variant_get_variant( arg_alphaId );
+       inner_gv = g_variant_get_variant(arg_alphaId);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &setParams.params.szAlphaId[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &setParams.params.szAlphaId[i])) {
                i++;
-               if( i >= SMS_SMSP_ALPHA_ID_LEN_MAX + 1 )
+               if (i >= SMS_SMSP_ALPHA_ID_LEN_MAX + 1)
                        break;
        }
 
@@ -745,11 +733,11 @@ on_sms_set_sms_params(TelephonySms *sms, GDBusMethodInvocation *invocation,
        setParams.params.tpDestAddr.numPlanId = arg_destAddr_Npi;
 
        i = 0;
-       inner_gv = g_variant_get_variant( arg_destAddr_DiallingNum );
+       inner_gv = g_variant_get_variant(arg_destAddr_DiallingNum);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &setParams.params.tpDestAddr.diallingNum[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &setParams.params.tpDestAddr.diallingNum[i])) {
                i++;
-               if( i >= SMS_SMSP_ADDRESS_LEN + 1 )
+               if (i >= SMS_SMSP_ADDRESS_LEN + 1)
                        break;
        }
 
@@ -758,11 +746,11 @@ on_sms_set_sms_params(TelephonySms *sms, GDBusMethodInvocation *invocation,
        setParams.params.tpSvcCntrAddr.numPlanId = arg_svcCntrAddr_Npi;
 
        i = 0;
-       inner_gv = g_variant_get_variant( arg_svcCntrAddr_DialNum );
+       inner_gv = g_variant_get_variant(arg_svcCntrAddr_DialNum);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &setParams.params.tpSvcCntrAddr.diallingNum[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &setParams.params.tpSvcCntrAddr.diallingNum[i])) {
                i++;
-               if( i >= SMS_SMSP_ADDRESS_LEN + 1 )
+               if (i >= SMS_SMSP_ADDRESS_LEN + 1)
                        break;
        }
 
@@ -779,7 +767,7 @@ on_sms_set_sms_params(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -793,7 +781,7 @@ on_sms_get_sms_param_cnt(TelephonySms *sms, GDBusMethodInvocation *invocation,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_SUCCESS;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
                return TRUE;
@@ -804,7 +792,7 @@ on_sms_get_sms_param_cnt(TelephonySms *sms, GDBusMethodInvocation *invocation,
 
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
        if (ret != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                tcore_user_request_unref(ur);
        }
 
@@ -820,7 +808,7 @@ on_sms_get_sms_ready_status(TelephonySms *sms, GDBusMethodInvocation *invocation
        CoreObject *co_sms = NULL;
        TcorePlugin *plugin = NULL;
        gboolean ready_status = FALSE;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
                return TRUE;
@@ -828,8 +816,8 @@ on_sms_get_sms_ready_status(TelephonySms *sms, GDBusMethodInvocation *invocation
        plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
        co_list = tcore_plugin_get_core_objects_bytype(plugin, CORE_OBJECT_TYPE_SMS);
        if (!co_list) {
-               dbg("error- co_list is NULL");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               err("error- co_list is NULL");
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return TRUE;
        }
 
@@ -837,13 +825,13 @@ on_sms_get_sms_ready_status(TelephonySms *sms, GDBusMethodInvocation *invocation
        g_slist_free(co_list);
 
        if (!co_sms) {
-               dbg("error- co_sms is NULL");
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+               err("error- co_sms is NULL");
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                return TRUE;
        }
 
        ready_status = tcore_sms_get_ready_status(co_sms);
-       dbg("ready_status = %d", ready_status);
+       dbg("[%s] ready_status = %d", GET_CP_NAME(invocation), ready_status);
        telephony_sms_complete_get_sms_ready_status(sms, invocation, ready_status);
 
        return TRUE;
@@ -858,432 +846,369 @@ gboolean dbus_plugin_setup_sms_interface(TelephonyObjectSkeleton *object, struct
        g_object_unref(sms);
 
        g_signal_connect(sms,
-                       "handle-send-msg",
-                       G_CALLBACK (on_sms_send_msg),
-                       ctx);
+               "handle-send-msg",
+               G_CALLBACK(on_sms_send_msg), ctx);
 
        g_signal_connect(sms,
-                       "handle-read-msg",
-                       G_CALLBACK (on_sms_read_msg),
-                       ctx);
+               "handle-read-msg",
+               G_CALLBACK(on_sms_read_msg), ctx);
 
        g_signal_connect(sms,
-                       "handle-save-msg",
-                       G_CALLBACK (on_sms_save_msg),
-                       ctx);
+               "handle-save-msg",
+               G_CALLBACK(on_sms_save_msg), ctx);
 
        g_signal_connect(sms,
-                       "handle-delete-msg",
-                       G_CALLBACK (on_sms_delete_msg),
-                       ctx);
+               "handle-delete-msg",
+               G_CALLBACK(on_sms_delete_msg), ctx);
 
        g_signal_connect(sms,
-                       "handle-get-msg-count",
-                       G_CALLBACK (on_sms_get_msg_count),
-                       ctx);
+               "handle-get-msg-count",
+               G_CALLBACK(on_sms_get_msg_count), ctx);
 
        g_signal_connect(sms,
-                       "handle-get-sca",
-                       G_CALLBACK (on_sms_get_sca),
-                       ctx);
+               "handle-get-sca",
+               G_CALLBACK(on_sms_get_sca), ctx);
 
        g_signal_connect(sms,
-                       "handle-set-sca",
-                       G_CALLBACK (on_sms_set_sca),
-                       ctx);
+               "handle-set-sca",
+               G_CALLBACK(on_sms_set_sca), ctx);
 
        g_signal_connect(sms,
-                       "handle-get-cb-config",
-                       G_CALLBACK (on_sms_get_cb_config),
-                       ctx);
+               "handle-get-cb-config",
+               G_CALLBACK(on_sms_get_cb_config), ctx);
 
        g_signal_connect(sms,
-                       "handle-set-cb-config",
-                       G_CALLBACK (on_sms_set_cb_config),
-                       ctx);
+               "handle-set-cb-config",
+               G_CALLBACK(on_sms_set_cb_config), ctx);
 
        g_signal_connect(sms,
-                       "handle-set-mem-status",
-                       G_CALLBACK (on_sms_set_mem_status),
-                       ctx);
+               "handle-set-mem-status",
+               G_CALLBACK(on_sms_set_mem_status), ctx);
 
        g_signal_connect(sms,
                "handle-get-pref-bearer",
-               G_CALLBACK (on_sms_get_pref_bearer),
-               ctx);
+               G_CALLBACK(on_sms_get_pref_bearer), ctx);
 
        g_signal_connect(sms,
-                       "handle-set-pref-bearer",
-                       G_CALLBACK (on_sms_set_pref_bearer),
-                       ctx);
+               "handle-set-pref-bearer",
+               G_CALLBACK(on_sms_set_pref_bearer), ctx);
 
        g_signal_connect(sms,
-                       "handle-set-delivery-report",
-                       G_CALLBACK (on_sms_set_delivery_report),
-                       ctx);
+               "handle-set-delivery-report",
+               G_CALLBACK(on_sms_set_delivery_report), ctx);
 
        g_signal_connect(sms,
-                       "handle-set-msg-status",
-                       G_CALLBACK (on_sms_set_msg_status),
-                       ctx);
+               "handle-set-msg-status",
+               G_CALLBACK(on_sms_set_msg_status), ctx);
 
        g_signal_connect(sms,
-                       "handle-get-sms-params",
-                       G_CALLBACK (on_sms_get_sms_params),
-                       ctx);
+               "handle-get-sms-params",
+               G_CALLBACK(on_sms_get_sms_params), ctx);
 
        g_signal_connect(sms,
-                       "handle-set-sms-params",
-                       G_CALLBACK (on_sms_set_sms_params),
-                       ctx);
+               "handle-set-sms-params",
+               G_CALLBACK(on_sms_set_sms_params), ctx);
 
        g_signal_connect(sms,
-                       "handle-get-sms-param-cnt",
-                       G_CALLBACK (on_sms_get_sms_param_cnt),
-                       ctx);
+               "handle-get-sms-param-cnt",
+               G_CALLBACK(on_sms_get_sms_param_cnt), ctx);
 
        g_signal_connect(sms,
-                       "handle-get-sms-ready-status",
-                       G_CALLBACK (on_sms_get_sms_ready_status),
-                       ctx);
+               "handle-get-sms-ready-status",
+               G_CALLBACK(on_sms_get_sms_ready_status), ctx);
 
        return TRUE;
 }
 
 gboolean dbus_plugin_sms_response(struct custom_data *ctx, UserRequest *ur, struct dbus_request_info *dbus_info, enum tcore_response_command command, unsigned int data_len, const void *data)
 {
-       GSList *co_list;
-       CoreObject *co_sms;
-       char *modem_name = NULL;
-       TcorePlugin *p = NULL;
-       int i;
-
-       modem_name = tcore_user_request_get_modem_name(ur);
-       if (!modem_name)
-               return FALSE;
-
-       p = tcore_server_find_plugin(ctx->server, modem_name);
-       free(modem_name);
-       if (!p)
-               return FALSE;
-
-       co_list = tcore_plugin_get_core_objects_bytype(p, CORE_OBJECT_TYPE_SMS);
-       if (!co_list) {
-               return FALSE;
-       }
-
-       co_sms = (CoreObject *)co_list->data;
-       g_slist_free(co_list);
-
-       if (!co_sms) {
-               return FALSE;
-       }
+       char *cpname = dbus_info ? GET_CP_NAME(dbus_info->invocation) : "";
 
        switch (command) {
-               case TRESP_SMS_SEND_UMTS_MSG: {
-                       const struct tresp_sms_send_msg *resp = data;
-
-                       dbg("receive TRESP_SMS_SEND_UMTS_MSG (result:[0x%x])", resp->result);
-                       telephony_sms_complete_send_msg(dbus_info->interface_object, dbus_info->invocation, resp->result);
-
-                       }
-                       break;
-
-               case TRESP_SMS_SEND_CDMA_MSG: {
-                       const struct tresp_sms_send_msg *resp = data;
-
-                       dbg("receive TRESP_SMS_SEND_CDMA_MSG (result:[0x%x])", resp->result);
-                       telephony_sms_complete_send_msg(dbus_info->interface_object, dbus_info->invocation, resp->result);
-                       }
-                       break;
-
-               case TRESP_SMS_READ_MSG: {
-                       const struct tresp_sms_read_msg *resp = data;
-                       GVariant *sca = 0, *packet_sca = 0;
-                       GVariant *tpdu = 0, *packet_tpdu = 0;
-                       GVariantBuilder b;
-
-                       unsigned int i;
-
-                       dbg("receive TRESP_SMS_READ_MSG (result:[0x%x])", resp->result);
-                       g_variant_builder_init (&b, G_VARIANT_TYPE("ay"));
-
-                       for( i=0; i<SMS_SMSP_ADDRESS_LEN; i++) {
-                               g_variant_builder_add(&b, "y", resp->dataInfo.smsData.sca[i] );
-                       }
-                       sca = g_variant_builder_end(&b);
+       case TRESP_SMS_SEND_UMTS_MSG: {
+               const struct tresp_sms_send_msg *resp = data;
 
-                       g_variant_builder_init (&b, G_VARIANT_TYPE("ay"));
-
-                       for( i=0; i<SMS_SMDATA_SIZE_MAX + 1; i++) {
-                               g_variant_builder_add(&b, "y", resp->dataInfo.smsData.tpduData[i] );
-                       }
-                       tpdu = g_variant_builder_end(&b);
-
-                       packet_sca = g_variant_new("v", sca);
-                       packet_tpdu = g_variant_new("v", tpdu);
-
-                       telephony_sms_complete_read_msg(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result,
-                               resp->dataInfo.simIndex,
-                               resp->dataInfo.msgStatus,
-                               resp->dataInfo.smsData.format,
-                               packet_sca,
-                               resp->dataInfo.smsData.msgLength,
-                               packet_tpdu);
-                       }
-                       break;
-
-               case TRESP_SMS_SAVE_MSG: {
-                       const struct tresp_sms_save_msg *resp = data;
-
-                       dbg("receive TRESP_SMS_SAVE_MSG (result:[0x%x])", resp->result);
-                       telephony_sms_complete_save_msg (dbus_info->interface_object, dbus_info->invocation,
-                               resp->result,
-                               resp->index);
-                       }
-                       break;
-
-               case TRESP_SMS_DELETE_MSG: {
-                       const struct tresp_sms_delete_msg *resp = data;
-
-                       dbg("receive TRESP_SMS_DELETE_MSG (result:[0x%x])", resp->result);
-                       telephony_sms_complete_delete_msg(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result, resp->index);
-
-                       }
-                       break;
-
-               case TRESP_SMS_GET_STORED_MSG_COUNT: {
-                       const struct tresp_sms_get_storedMsgCnt *resp = data;
-                       GVariant *list;
-                       GVariantBuilder b;
-                       unsigned int i;
-
-                       dbg("receive TRESP_SMS_GET_STORED_MSG_COUNT (result:[0x%x])", resp->result);
-                       g_variant_builder_init (&b, G_VARIANT_TYPE("ai"));
-
-                       for (i=0; i<resp->storedMsgCnt.totalCount; i++) {
-                               g_variant_builder_add(&b, "i", resp->storedMsgCnt.indexList[i]);
-                       }
-                       list = g_variant_builder_end(&b);
-
-                       telephony_sms_complete_get_msg_count(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result,
-                               resp->storedMsgCnt.totalCount,
-                               resp->storedMsgCnt.usedCount,
-                               list);
-                       }
-                       break;
-
-               case TRESP_SMS_GET_SCA: {
-                       const struct tresp_sms_get_sca *resp = data;
-                       GVariant *sca = 0, *packet_sca = 0;
-                       GVariantBuilder b;
-                       unsigned int i;
-
-                       dbg("receive TRESP_SMS_GET_SCA (result:[0x%x])", resp->result);
-                       g_variant_builder_init (&b, G_VARIANT_TYPE("ay"));
-
-                       for( i=0; i<SMS_SMSP_ADDRESS_LEN + 1; i++) {
-                               g_variant_builder_add(&b, "y", resp->scaAddress.diallingNum[i] );
-                       }
-                       sca = g_variant_builder_end(&b);
-
-                       packet_sca = g_variant_new("v", sca);
-
-                       telephony_sms_complete_get_sca(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result,
-                               resp->scaAddress.typeOfNum,
-                               resp->scaAddress.numPlanId,
-                               resp->scaAddress.dialNumLen,
-                               packet_sca);
-                       }
-                       break;
-
-               case TRESP_SMS_SET_SCA: {
-                       const struct tresp_sms_set_sca *resp = data;
-
-                       dbg("receive TRESP_SMS_SET_SCA (result:[0x%x])", resp->result);
-                       telephony_sms_complete_set_sca(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result);
-
-                       }
-                       break;
-
-               case TRESP_SMS_GET_CB_CONFIG: {
-                       const struct tresp_sms_get_cb_config *resp = data;
-                       GVariant *result = NULL;
-                       GVariantBuilder b;
+               dbg("[%s] SEND_UMTS_MSG (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_send_msg(dbus_info->interface_object, dbus_info->invocation, resp->result);
+               }
+               break;
 
-                       dbg("receive TRESP_SMS_GET_CB_CONFIG (result:[0x%x])", resp->result);
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+       case TRESP_SMS_SEND_CDMA_MSG: {
+               const struct tresp_sms_send_msg *resp = data;
 
-                       for (i = 0; i < resp->cbConfig.msgIdRangeCount; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+               dbg("[%s] SEND_CDMA_MSG (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_send_msg(dbus_info->interface_object, dbus_info->invocation, resp->result);
+               }
+               break;
+
+       case TRESP_SMS_READ_MSG: {
+               const struct tresp_sms_read_msg *resp = data;
+               GVariant *sca = 0, *packet_sca = 0;
+               GVariant *tpdu = 0, *packet_tpdu = 0;
+               GVariantBuilder b;
+               unsigned int i;
+
+               dbg("[%s] READ_MSG (result:[0x%x])", cpname, resp->result);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+
+               for (i = 0; i < SMS_SMSP_ADDRESS_LEN; i++)
+                       g_variant_builder_add(&b, "y", resp->dataInfo.smsData.sca[i]);
+               sca = g_variant_builder_end(&b);
+
+               g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+
+               for (i = 0; i < SMS_SMDATA_SIZE_MAX + 1; i++)
+                       g_variant_builder_add(&b, "y", resp->dataInfo.smsData.tpduData[i]);
+               tpdu = g_variant_builder_end(&b);
+
+               packet_sca = g_variant_new("v", sca);
+               packet_tpdu = g_variant_new("v", tpdu);
+
+               telephony_sms_complete_read_msg(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result,
+                       resp->dataInfo.simIndex,
+                       resp->dataInfo.msgStatus,
+                       resp->dataInfo.smsData.format,
+                       packet_sca,
+                       resp->dataInfo.smsData.msgLength,
+                       packet_tpdu);
+               }
+               break;
 
-                               if( resp->cbConfig.net3gppType == SMS_NETTYPE_3GPP ) {
-                                       g_variant_builder_add(&b, "{sv}", "FromMsgId", g_variant_new_uint16(resp->cbConfig.msgIDs[i].net3gpp.fromMsgId));
-                                       g_variant_builder_add(&b, "{sv}", "ToMsgId", g_variant_new_uint16(resp->cbConfig.msgIDs[i].net3gpp.toMsgId));
-                               } else if( resp->cbConfig.net3gppType == SMS_NETTYPE_3GPP2) {
-                                       g_variant_builder_add(&b, "{sv}", "CBCategory", g_variant_new_uint16(resp->cbConfig.msgIDs[i].net3gpp2.cbCategory));
-                                       g_variant_builder_add(&b, "{sv}", "CBLanguage", g_variant_new_uint16(resp->cbConfig.msgIDs[i].net3gpp2.cbLanguage));
-                               } else {
-                                       dbg("Unknown 3gpp type");
-                                       return FALSE;
-                               }
+       case TRESP_SMS_SAVE_MSG: {
+               const struct tresp_sms_save_msg *resp = data;
 
-                               g_variant_builder_add(&b, "{sv}", "Selected", g_variant_new_byte(resp->cbConfig.msgIDs[i].net3gpp.selected));
+               dbg("[%s] SAVE_MSG (index:[%d] result:[0x%x])", cpname, resp->index, resp->result);
+               telephony_sms_complete_save_msg(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result, resp->index);
+               }
+               break;
 
-                               g_variant_builder_close(&b);
-                       }
+       case TRESP_SMS_DELETE_MSG: {
+               const struct tresp_sms_delete_msg *resp = data;
 
-                       result = g_variant_builder_end(&b);
+               dbg("[%s] DELETE_MSG (index:[%d] result:[0x%x])", cpname, resp->index, resp->result);
+               telephony_sms_complete_delete_msg(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result, resp->index);
+               }
+               break;
+
+       case TRESP_SMS_GET_STORED_MSG_COUNT: {
+               const struct tresp_sms_get_storedMsgCnt *resp = data;
+               GVariant *list;
+               GVariantBuilder b;
+               unsigned int i;
+
+               dbg("[%s] GET_STORED_MSG_COUNT (result:[0x%x])", cpname, resp->result);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("ai"));
+
+               for (i = 0; i < resp->storedMsgCnt.totalCount; i++)
+                       g_variant_builder_add(&b, "i", resp->storedMsgCnt.indexList[i]);
+               list = g_variant_builder_end(&b);
+
+               telephony_sms_complete_get_msg_count(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result,
+                       resp->storedMsgCnt.totalCount,
+                       resp->storedMsgCnt.usedCount,
+                       list);
+               }
+               break;
 
-                       telephony_sms_complete_get_cb_config(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result,
-                               resp->cbConfig.net3gppType,
-                               resp->cbConfig.cbEnabled,
-                               resp->cbConfig.msgIdMaxCount,
-                               resp->cbConfig.msgIdRangeCount,
-                               result);
-                       }
-                       break;
+       case TRESP_SMS_GET_SCA: {
+               const struct tresp_sms_get_sca *resp = data;
+               GVariant *sca = 0, *packet_sca = 0;
+               GVariantBuilder b;
+               unsigned int i;
 
-               case TRESP_SMS_SET_CB_CONFIG: {
-                       const struct tresp_sms_set_cb_config *resp = data;
+               dbg("[%s] GET_SCA (result:[0x%x])", cpname, resp->result);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
 
-                       dbg("receive TRESP_SMS_SET_CB_CONFIG (result:[0x%x])", resp->result);
-                       telephony_sms_complete_set_cb_config(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result);
+               for (i = 0; i < SMS_SMSP_ADDRESS_LEN + 1; i++)
+                       g_variant_builder_add(&b, "y", resp->scaAddress.diallingNum[i]);
+               sca = g_variant_builder_end(&b);
 
-                       }
-                       break;
+               packet_sca = g_variant_new("v", sca);
 
-               case TRESP_SMS_SET_MEM_STATUS: {
-                       const struct tresp_sms_set_mem_status *resp = data;
+               telephony_sms_complete_get_sca(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result,
+                       resp->scaAddress.typeOfNum,
+                       resp->scaAddress.numPlanId,
+                       resp->scaAddress.dialNumLen,
+                       packet_sca);
+               }
+               break;
 
-                       dbg("receive TRESP_SMS_SET_MEM_STATUS (result:[0x%x])", resp->result);
-                       telephony_sms_complete_set_mem_status(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result);
+       case TRESP_SMS_SET_SCA: {
+               const struct tresp_sms_set_sca *resp = data;
 
+               dbg("[%s] SET_SCA (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_set_sca(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result);
+               }
+               break;
+
+       case TRESP_SMS_GET_CB_CONFIG: {
+               const struct tresp_sms_get_cb_config *resp = data;
+               GVariant *result = NULL;
+               GVariantBuilder b;
+               int i;
+
+               dbg("[%s] GET_CB_CONFIG (result:[0x%x])", cpname, resp->result);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+
+               for (i = 0; i < resp->cbConfig.msgIdRangeCount; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+
+                       if (resp->cbConfig.net3gppType == SMS_NETTYPE_3GPP) {
+                               g_variant_builder_add(&b, "{sv}", "FromMsgId", g_variant_new_uint16(resp->cbConfig.msgIDs[i].net3gpp.fromMsgId));
+                               g_variant_builder_add(&b, "{sv}", "ToMsgId", g_variant_new_uint16(resp->cbConfig.msgIDs[i].net3gpp.toMsgId));
+                       } else if (resp->cbConfig.net3gppType == SMS_NETTYPE_3GPP2) {
+                               g_variant_builder_add(&b, "{sv}", "CBCategory", g_variant_new_uint16(resp->cbConfig.msgIDs[i].net3gpp2.cbCategory));
+                               g_variant_builder_add(&b, "{sv}", "CBLanguage", g_variant_new_uint16(resp->cbConfig.msgIDs[i].net3gpp2.cbLanguage));
+                       } else {
+                               dbg("Unknown 3gpp type");
+                               return FALSE;
                        }
-                       break;
-               case TRESP_SMS_GET_PREF_BEARER: {
-                       const struct tresp_sms_get_pref_bearer *resp = data;
 
-                       dbg("receive TRESP_SMS_GET_PREF_BEARER (result:[0x%x] svc:[0x%2x])", resp->result, resp->svc);
-                       telephony_sms_complete_get_pref_bearer(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result, resp->svc);
+                       g_variant_builder_add(&b, "{sv}", "Selected", g_variant_new_byte(resp->cbConfig.msgIDs[i].net3gpp.selected));
+                       g_variant_builder_close(&b);
+               }
 
-                       }
-                       break;
+               result = g_variant_builder_end(&b);
 
-               case TRESP_SMS_SET_PREF_BEARER: {
-                       const struct tresp_sms_set_pref_bearer *resp = data;
+               telephony_sms_complete_get_cb_config(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result,
+                       resp->cbConfig.net3gppType,
+                       resp->cbConfig.cbEnabled,
+                       resp->cbConfig.msgIdMaxCount,
+                       resp->cbConfig.msgIdRangeCount,
+                       result);
+               }
+               break;
 
-                       dbg("receive TRESP_SMS_SET_PREF_BEARER (result:[0x%x])", resp->result);
-                       telephony_sms_complete_set_pref_bearer(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result);
+       case TRESP_SMS_SET_CB_CONFIG: {
+               const struct tresp_sms_set_cb_config *resp = data;
 
-                       }
-                       break;
+               dbg("[%s] SET_CB_CONFIG (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_set_cb_config(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result);
+               }
+               break;
 
-               case TRESP_SMS_SET_DELIVERY_REPORT: {
-                       const struct tresp_sms_set_delivery_report *resp = data;
+       case TRESP_SMS_SET_MEM_STATUS: {
+               const struct tresp_sms_set_mem_status *resp = data;
 
-                       dbg("receive TRESP_SMS_SET_DELIVERY_REPORT (result:[0x%x])", resp->result);
-                       telephony_sms_complete_set_delivery_report(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result);
+               dbg("[%s] SET_MEM_STATUS (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_set_mem_status(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result);
+               }
+               break;
 
-                       }
-                       break;
+       case TRESP_SMS_GET_PREF_BEARER: {
+               const struct tresp_sms_get_pref_bearer *resp = data;
 
-               case TRESP_SMS_SET_MSG_STATUS: {
-                       const struct tresp_sms_set_mem_status *resp = data;
+               dbg("[%s] GET_PREF_BEARER (result:[0x%x] svc:[0x%2x])", cpname, resp->result, resp->svc);
+               telephony_sms_complete_get_pref_bearer(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result, resp->svc);
+               }
+               break;
 
-                       dbg("receive TRESP_SMS_SET_MSG_STATUS (result:[0x%x])", resp->result);
-                       telephony_sms_complete_set_msg_status(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result);
+       case TRESP_SMS_SET_PREF_BEARER: {
+               const struct tresp_sms_set_pref_bearer *resp = data;
 
-                       }
-                       break;
+               dbg("[%s] SET_PREF_BEARER (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_set_pref_bearer(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result);
+               }
+               break;
 
-               case TRESP_SMS_GET_PARAMS: {
-                       const struct tresp_sms_get_params *resp = data;
-                       GVariant *alphaId = 0, *packet_alphaId = 0;
-                       GVariant *destDialNum = 0, *packet_destDialNum = 0;
-                       GVariant *scaDialNum = 0, *packet_scaDialNum = 0;
-                       GVariantBuilder b;
-                       unsigned int i;
-
-                       dbg("receive TRESP_SMS_GET_PARAMS (result:[0x%x])", resp->result);
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
-                       for( i=0; i<SMS_SMSP_ALPHA_ID_LEN_MAX + 1; i++) {
-                               g_variant_builder_add(&b, "y", resp->paramsInfo.szAlphaId[i] );
-                       }
-                       alphaId = g_variant_builder_end(&b);
+       case TRESP_SMS_SET_DELIVERY_REPORT: {
+               const struct tresp_sms_set_delivery_report *resp = data;
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
-                       for( i=0; i<SMS_SMSP_ADDRESS_LEN + 1; i++) {
-                               g_variant_builder_add(&b, "y", resp->paramsInfo.tpDestAddr.diallingNum[i] );
-                       }
-                       destDialNum = g_variant_builder_end(&b);
+               dbg("[%s] SET_DELIVERY_REPORT (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_set_delivery_report(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result);
+               }
+               break;
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
-                       for( i=0; i<SMS_SMSP_ADDRESS_LEN + 1; i++) {
-                               g_variant_builder_add(&b, "y", resp->paramsInfo.tpSvcCntrAddr.diallingNum[i] );
-                       }
-                       scaDialNum = g_variant_builder_end(&b);
-
-                       packet_alphaId = g_variant_new("v", alphaId);
-                       packet_destDialNum = g_variant_new("v", destDialNum);
-                       packet_scaDialNum = g_variant_new("v", scaDialNum);
-
-                       telephony_sms_complete_get_sms_params(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result,
-                               resp->paramsInfo.recordIndex,
-                               resp->paramsInfo.recordLen,
-                               resp->paramsInfo.alphaIdLen,
-                               packet_alphaId,
-                               resp->paramsInfo.paramIndicator,
-                               resp->paramsInfo.tpDestAddr.dialNumLen,
-                               resp->paramsInfo.tpDestAddr.typeOfNum,
-                               resp->paramsInfo.tpDestAddr.numPlanId,
-                               packet_destDialNum,
-                               resp->paramsInfo.tpSvcCntrAddr.dialNumLen,
-                               resp->paramsInfo.tpSvcCntrAddr.typeOfNum,
-                               resp->paramsInfo.tpSvcCntrAddr.numPlanId,
-                               packet_scaDialNum,
-                               resp->paramsInfo.tpProtocolId,
-                               resp->paramsInfo.tpDataCodingScheme,
-                               resp->paramsInfo.tpValidityPeriod);
-                       }
-                       break;
+       case TRESP_SMS_SET_MSG_STATUS: {
+               const struct tresp_sms_set_mem_status *resp = data;
 
-               case TRESP_SMS_SET_PARAMS:{
-                       const struct tresp_sms_set_params *resp = data;
+               dbg("[%s] SET_MSG_STATUS (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_set_msg_status(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result);
+               }
+               break;
+
+       case TRESP_SMS_GET_PARAMS: {
+               const struct tresp_sms_get_params *resp = data;
+               GVariant *alphaId = 0, *packet_alphaId = 0;
+               GVariant *destDialNum = 0, *packet_destDialNum = 0;
+               GVariant *scaDialNum = 0, *packet_scaDialNum = 0;
+               GVariantBuilder b;
+               unsigned int i;
+
+               dbg("[%s] GET_PARAMS (result:[0x%x])", cpname, resp->result);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < SMS_SMSP_ALPHA_ID_LEN_MAX + 1; i++)
+                       g_variant_builder_add(&b, "y", resp->paramsInfo.szAlphaId[i]);
+               alphaId = g_variant_builder_end(&b);
+
+               g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < SMS_SMSP_ADDRESS_LEN + 1; i++)
+                       g_variant_builder_add(&b, "y", resp->paramsInfo.tpDestAddr.diallingNum[i]);
+               destDialNum = g_variant_builder_end(&b);
+
+               g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+               for (i = 0; i < SMS_SMSP_ADDRESS_LEN + 1; i++)
+                       g_variant_builder_add(&b, "y", resp->paramsInfo.tpSvcCntrAddr.diallingNum[i]);
+               scaDialNum = g_variant_builder_end(&b);
+
+               packet_alphaId = g_variant_new("v", alphaId);
+               packet_destDialNum = g_variant_new("v", destDialNum);
+               packet_scaDialNum = g_variant_new("v", scaDialNum);
+
+               telephony_sms_complete_get_sms_params(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result,
+                       resp->paramsInfo.recordIndex,
+                       resp->paramsInfo.recordLen,
+                       resp->paramsInfo.alphaIdLen,
+                       packet_alphaId,
+                       resp->paramsInfo.paramIndicator,
+                       resp->paramsInfo.tpDestAddr.dialNumLen,
+                       resp->paramsInfo.tpDestAddr.typeOfNum,
+                       resp->paramsInfo.tpDestAddr.numPlanId,
+                       packet_destDialNum,
+                       resp->paramsInfo.tpSvcCntrAddr.dialNumLen,
+                       resp->paramsInfo.tpSvcCntrAddr.typeOfNum,
+                       resp->paramsInfo.tpSvcCntrAddr.numPlanId,
+                       packet_scaDialNum,
+                       resp->paramsInfo.tpProtocolId,
+                       resp->paramsInfo.tpDataCodingScheme,
+                       resp->paramsInfo.tpValidityPeriod);
+               }
+               break;
 
-                       dbg("receive TRESP_SMS_SET_PARAMS (result:[0x%x])", resp->result);
-                       telephony_sms_complete_set_sms_params(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result);
+       case TRESP_SMS_SET_PARAMS:{
+               const struct tresp_sms_set_params *resp = data;
 
-                       }
-                       break;
-
-               case TRESP_SMS_GET_PARAMCNT: {
-                       const struct tresp_sms_get_paramcnt *resp = data;
+               dbg("[%s] SET_PARAMS (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_set_sms_params(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result);
+               }
+               break;
 
-                       dbg("receive TRESP_SMS_GET_PARAMCNT (result:[0x%x])", resp->result);
-                       telephony_sms_complete_get_sms_param_cnt(dbus_info->interface_object, dbus_info->invocation,
-                               resp->result,
-                               resp->recordCount);
+       case TRESP_SMS_GET_PARAMCNT: {
+               const struct tresp_sms_get_paramcnt *resp = data;
 
-                       }
-                       break;
+               dbg("[%s] GET_PARAMCNT (result:[0x%x])", cpname, resp->result);
+               telephony_sms_complete_get_sms_param_cnt(dbus_info->interface_object, dbus_info->invocation,
+                       resp->result, resp->recordCount);
+               }
+               break;
 
-               default:
-                       break;
+       default:
+               break;
        }
 
        return TRUE;
@@ -1295,112 +1220,111 @@ gboolean dbus_plugin_sms_notification(struct custom_data *ctx, CoreObject *sourc
        const char *cp_name;
 
        if (!object) {
-               dbg("object is NULL");
+               warn("object is NULL");
                return FALSE;
        }
 
        cp_name = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
 
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-                               command, cp_name);
-
        sms = telephony_object_peek_sms(TELEPHONY_OBJECT(object));
+       if (sms == NULL) {
+               err("sms object is NULL!!!");
+               return FALSE;
+       }
 
        switch (command) {
-               case TNOTI_SMS_INCOM_MSG: {
-                       const struct tnoti_sms_incoming_msg *noti = data;
-
-                       gchar *sca = NULL;
-                       gchar *tpdu = NULL;
+       case TNOTI_SMS_INCOM_MSG: {
+               const struct tnoti_sms_incoming_msg *noti = data;
+               gchar *sca = NULL;
+               gchar *tpdu = NULL;
 
-                       info("[DBUSINFO][%s] SMS_INCOM_MSG (len[%d])", cp_name, data_len);
+               info("[%s] SMS_INCOM_MSG (len[%d])", cp_name, data_len);
 
-                       sca = g_base64_encode((const guchar*)(noti->msgInfo.sca),SMS_SMSP_ADDRESS_LEN);
-                       tpdu = g_base64_encode((const guchar*)(noti->msgInfo.tpduData),SMS_SMDATA_SIZE_MAX + 1);
+               sca = g_base64_encode((const guchar *)(noti->msgInfo.sca), SMS_SMSP_ADDRESS_LEN);
+               tpdu = g_base64_encode((const guchar *)(noti->msgInfo.tpduData), SMS_SMDATA_SIZE_MAX + 1);
 
-                       telephony_sms_emit_incomming_msg(sms,
-                               noti->msgInfo.format,
-                               sca,
-                               noti->msgInfo.msgLength,
-                               tpdu);
+               telephony_sms_emit_incomming_msg(sms,
+                       noti->msgInfo.format,
+                       sca,
+                       noti->msgInfo.msgLength,
+                       tpdu);
 
-                       g_free(sca);
-                       g_free(tpdu);
-                       }
-                       break;
+               g_free(sca);
+               g_free(tpdu);
+               }
+               break;
 
-               case TNOTI_SMS_CB_INCOM_MSG: {
-                       const struct tnoti_sms_cellBroadcast_msg *noti = data;
-                       gchar *tpdu = NULL;
+       case TNOTI_SMS_CB_INCOM_MSG: {
+               const struct tnoti_sms_cellBroadcast_msg *noti = data;
+               gchar *tpdu = NULL;
 
-                       info("[DBUSINFO][%s] SMS_CB_INCOM_MSG (len[%d])", cp_name, data_len);
+               info("[%s] SMS_CB_INCOM_MSG (len[%d])", cp_name, data_len);
 
-                       tpdu = g_base64_encode((const guchar*)(noti->cbMsg.msgData), SMS_CB_SIZE_MAX+1);
+               tpdu = g_base64_encode((const guchar*)(noti->cbMsg.msgData), SMS_CB_SIZE_MAX+1);
 
-                       telephony_sms_emit_incomming_cb_msg(sms,
-                               noti->cbMsg.cbMsgType,
-                               noti->cbMsg.length,
-                               tpdu);
-                       g_free(tpdu);
-                       }
-                       break;
+               telephony_sms_emit_incomming_cb_msg(sms,
+                       noti->cbMsg.cbMsgType,
+                       noti->cbMsg.length,
+                       tpdu);
+               g_free(tpdu);
+               }
+               break;
 
-               case TNOTI_SMS_ETWS_INCOM_MSG: {
-                       const struct tnoti_sms_etws_msg *noti = data;
-                       GVariant *msgData = 0, *packet_msgData = 0;
-                       GVariantBuilder b;
-                       unsigned int i;
+       case TNOTI_SMS_ETWS_INCOM_MSG: {
+               const struct tnoti_sms_etws_msg *noti = data;
+               GVariant *msgData = 0, *packet_msgData = 0;
+               GVariantBuilder b;
+               unsigned int i;
 
-                       info("[DBUSINFO][%s] ETWS_INCOM_MSG (len[%d])", cp_name, data_len);
+               info("[%s] ETWS_INCOM_MSG (len[%d])", cp_name, data_len);
 
-                       g_variant_builder_init (&b, G_VARIANT_TYPE("ay"));
+               g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
 
-                       for( i=0; i<SMS_ETWS_SIZE_MAX + 1; i++) {
-                               g_variant_builder_add(&b, "y", noti->etwsMsg.msgData[i] );
-                       }
-                       msgData = g_variant_builder_end(&b);
-                       packet_msgData = g_variant_new("v", msgData);
+               for (i = 0; i < SMS_ETWS_SIZE_MAX + 1; i++)
+                       g_variant_builder_add(&b, "y", noti->etwsMsg.msgData[i]);
+               msgData = g_variant_builder_end(&b);
+               packet_msgData = g_variant_new("v", msgData);
 
-                       telephony_sms_emit_incomming_etws_msg(sms,
-                               noti->etwsMsg.etwsMsgType,
-                               noti->etwsMsg.length,
-                               packet_msgData);
-                       }
-                       break;
+               telephony_sms_emit_incomming_etws_msg(sms,
+                       noti->etwsMsg.etwsMsgType,
+                       noti->etwsMsg.length,
+                       packet_msgData);
+               }
+               break;
 
-               case TNOTI_SMS_INCOM_EX_MSG: {
-                       info("[DBUSINFO][%s] SMS_INCOM_EX_MSG (len[%d])", cp_name, data_len);
-                       }
-                       break;
+       case TNOTI_SMS_INCOM_EX_MSG: {
+               info("[%s] SMS_INCOM_EX_MSG (len[%d])", cp_name, data_len);
+               }
+               break;
 
-               case TNOTI_SMS_CB_INCOM_EX_MSG: {
-                       info("[DBUSINFO][%s] CB_INCOM_EX_MSG (len[%d])", cp_name, data_len);
-                       }
-                       break;
+       case TNOTI_SMS_CB_INCOM_EX_MSG: {
+               info("[%s] CB_INCOM_EX_MSG (len[%d])", cp_name, data_len);
+               }
+               break;
 
-               case TNOTI_SMS_MEMORY_STATUS: {
-                       const struct tnoti_sms_memory_status *noti = data;
-                       info("[DBUSINFO][%s] SMS_MEMORY_STATUS (%d)", cp_name, noti->status);
-                       telephony_sms_emit_memory_status(sms, noti->status);
-                       }
-                       break;
+       case TNOTI_SMS_MEMORY_STATUS: {
+               const struct tnoti_sms_memory_status *noti = data;
+               info("[%s] SMS_MEMORY_STATUS (%d)", cp_name, noti->status);
+               telephony_sms_emit_memory_status(sms, noti->status);
+               }
+               break;
 
-               case TNOTI_SMS_DEVICE_READY: {
-                       const struct tnoti_sms_ready_status *noti = data;
-                       info("[DBUSINFO][%s] SMS_DEVICE_READY (%d)", cp_name, noti->status);
+       case TNOTI_SMS_DEVICE_READY: {
+               const struct tnoti_sms_ready_status *noti = data;
+               info("[%s] SMS_DEVICE_READY (%d)", cp_name, noti->status);
 #ifdef ENABLE_KPI_LOGS
-                       if (noti->status != SMS_READY_STATUS_NONE)
-                               TIME_CHECK("[%s] SMS Service Ready", cp_name);
+               if (noti->status != SMS_READY_STATUS_NONE)
+                       TIME_CHECK("[%s] SMS Service Ready", cp_name);
 #endif
-                       telephony_sms_emit_sms_ready(sms, noti->status);
+               telephony_sms_emit_sms_ready(sms, noti->status);
 
-                       }
-                       break;
+               }
+               break;
 
-               default:
-                       dbg("unknown notification");
-                       return FALSE;
-                       break;
+       default:
+               dbg("unknown notification");
+               return FALSE;
+               break;
        }
 
        return TRUE;
old mode 100755 (executable)
new mode 100644 (file)
index 12f354a..e448713
--- a/src/ss.c
+++ b/src/ss.c
@@ -28,7 +28,7 @@
 #include <gio/gio.h>
 
 #include <appsvc.h>
-#include <bundle.h>
+#include <bundle_internal.h>
 
 #include <tcore.h>
 #include <server.h>
@@ -139,7 +139,7 @@ static void _launch_ciss(const struct tnoti_ss_ussd *ussd, enum dbus_tapi_sim_sl
 }
 
 static gboolean
-on_ss_activate_barring (TelephonySs *ss,
+on_ss_activate_barring(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gint barring_mode,
@@ -151,7 +151,7 @@ on_ss_activate_barring (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SS, "x"))
                return TRUE;
@@ -174,8 +174,8 @@ on_ss_activate_barring (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_barring), &req);
        tcore_user_request_set_command(ur, TREQ_SS_BARRING_ACTIVATE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -184,7 +184,7 @@ on_ss_activate_barring (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_deactivate_barring (TelephonySs *ss,
+on_ss_deactivate_barring(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gint barring_mode,
@@ -196,7 +196,7 @@ on_ss_deactivate_barring (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SS, "x"))
                return TRUE;
@@ -218,8 +218,8 @@ on_ss_deactivate_barring (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_barring), &req);
        tcore_user_request_set_command(ur, TREQ_SS_BARRING_DEACTIVATE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -228,7 +228,7 @@ on_ss_deactivate_barring (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_change_barring_password (TelephonySs *ss,
+on_ss_change_barring_password(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                const gchar *barring_password,
                const gchar *barring_password_new,
@@ -240,7 +240,7 @@ on_ss_change_barring_password (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SS, "x"))
                return TRUE;
@@ -263,8 +263,8 @@ on_ss_change_barring_password (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_barring_change_password), &req);
        tcore_user_request_set_command(ur, TREQ_SS_BARRING_CHANGE_PASSWORD);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -273,7 +273,7 @@ on_ss_change_barring_password (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_get_barring_status (TelephonySs *ss,
+on_ss_get_barring_status(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gint barring_mode,
@@ -283,7 +283,7 @@ on_ss_get_barring_status (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SS, "r"))
                return TRUE;
@@ -300,8 +300,8 @@ on_ss_get_barring_status (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_barring), &req);
        tcore_user_request_set_command(ur, TREQ_SS_BARRING_GET_STATUS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -310,7 +310,7 @@ on_ss_get_barring_status (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_register_forwarding (TelephonySs *ss,
+on_ss_register_forwarding(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gint forward_mode,
@@ -324,11 +324,10 @@ on_ss_register_forwarding (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
                return TRUE;
-       }
 
        memset(&req, 0, sizeof(struct treq_ss_forwarding));
 
@@ -347,8 +346,8 @@ on_ss_register_forwarding (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_forwarding), &req);
        tcore_user_request_set_command(ur, TREQ_SS_FORWARDING_REGISTER);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -357,7 +356,7 @@ on_ss_register_forwarding (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_deregister_forwarding (TelephonySs *ss,
+on_ss_deregister_forwarding(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gint forward_mode,
@@ -371,11 +370,10 @@ on_ss_deregister_forwarding (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
                return TRUE;
-       }
 
        memset(&req, 0, sizeof(struct treq_ss_forwarding));
 
@@ -394,8 +392,8 @@ on_ss_deregister_forwarding (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_forwarding), &req);
        tcore_user_request_set_command(ur, TREQ_SS_FORWARDING_DEREGISTER);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -404,7 +402,7 @@ on_ss_deregister_forwarding (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_activate_forwarding (TelephonySs *ss,
+on_ss_activate_forwarding(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gint forward_mode,
@@ -418,11 +416,10 @@ on_ss_activate_forwarding (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
                return TRUE;
-       }
 
        memset(&req, 0, sizeof(struct treq_ss_forwarding));
 
@@ -441,8 +438,8 @@ on_ss_activate_forwarding (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_forwarding), &req);
        tcore_user_request_set_command(ur, TREQ_SS_FORWARDING_ACTIVATE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -451,7 +448,7 @@ on_ss_activate_forwarding (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_deactivate_forwarding (TelephonySs *ss,
+on_ss_deactivate_forwarding(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gint forward_mode,
@@ -465,11 +462,10 @@ on_ss_deactivate_forwarding (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
                return TRUE;
-       }
 
        memset(&req, 0, sizeof(struct treq_ss_forwarding));
 
@@ -488,8 +484,8 @@ on_ss_deactivate_forwarding (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_forwarding), &req);
        tcore_user_request_set_command(ur, TREQ_SS_FORWARDING_DEACTIVATE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -498,7 +494,7 @@ on_ss_deactivate_forwarding (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_get_forwarding_status (TelephonySs *ss,
+on_ss_get_forwarding_status(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gint forward_mode,
@@ -508,11 +504,10 @@ on_ss_get_forwarding_status (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "r")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "r"))
                return TRUE;
-       }
 
        memset(&req, 0, sizeof(struct treq_ss_forwarding));
 
@@ -527,8 +522,8 @@ on_ss_get_forwarding_status (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_forwarding), &req);
        tcore_user_request_set_command(ur, TREQ_SS_FORWARDING_GET_STATUS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -537,7 +532,7 @@ on_ss_get_forwarding_status (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_activate_waiting (TelephonySs *ss,
+on_ss_activate_waiting(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gpointer user_data)
@@ -546,11 +541,10 @@ on_ss_activate_waiting (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
                return TRUE;
-       }
 
        memset(&req, 0, sizeof(struct treq_ss_waiting));
 
@@ -563,8 +557,8 @@ on_ss_activate_waiting (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_waiting), &req);
        tcore_user_request_set_command(ur, TREQ_SS_WAITING_ACTIVATE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -573,7 +567,7 @@ on_ss_activate_waiting (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_deactivate_waiting (TelephonySs *ss,
+on_ss_deactivate_waiting(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gpointer user_data)
@@ -582,11 +576,10 @@ on_ss_deactivate_waiting (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
                return TRUE;
-       }
        memset(&req, 0, sizeof(struct treq_ss_waiting));
 
        req.class = ss_class;
@@ -598,8 +591,8 @@ on_ss_deactivate_waiting (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_waiting), &req);
        tcore_user_request_set_command(ur, TREQ_SS_WAITING_DEACTIVATE);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -608,7 +601,7 @@ on_ss_deactivate_waiting (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_get_waiting_status (TelephonySs *ss,
+on_ss_get_waiting_status(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ss_class,
                gpointer user_data)
@@ -617,11 +610,10 @@ on_ss_get_waiting_status (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "r")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "r"))
                return TRUE;
-       }
 
        memset(&req, 0, sizeof(struct treq_ss_waiting));
 
@@ -634,8 +626,8 @@ on_ss_get_waiting_status (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_waiting), &req);
        tcore_user_request_set_command(ur, TREQ_SS_WAITING_GET_STATUS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -644,7 +636,7 @@ on_ss_get_waiting_status (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_set_cli_status (TelephonySs *ss,
+on_ss_set_cli_status(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint cli_type,
                gint cli_status,
@@ -654,11 +646,10 @@ on_ss_set_cli_status (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
                return TRUE;
-       }
 
        memset(&req, 0, sizeof(struct treq_ss_set_cli));
 
@@ -672,8 +663,8 @@ on_ss_set_cli_status (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_set_cli), &req);
        tcore_user_request_set_command(ur, TREQ_SS_CLI_SET_STATUS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -683,7 +674,7 @@ on_ss_set_cli_status (TelephonySs *ss,
 
 
 static gboolean
-on_ss_get_cli_status (TelephonySs *ss,
+on_ss_get_cli_status(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint cli_type,
                gpointer user_data)
@@ -692,11 +683,10 @@ on_ss_get_cli_status (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "r")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "r"))
                return TRUE;
-       }
 
        memset(&req, 0, sizeof(struct treq_ss_cli));
 
@@ -709,8 +699,8 @@ on_ss_get_cli_status (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_cli), &req);
        tcore_user_request_set_command(ur, TREQ_SS_CLI_GET_STATUS);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -719,7 +709,7 @@ on_ss_get_cli_status (TelephonySs *ss,
 }
 
 static gboolean
-on_ss_send_ussd (TelephonySs *ss,
+on_ss_send_ussd(TelephonySs *ss,
                GDBusMethodInvocation *invocation,
                gint ussd_type,
                gint ussd_dcs,
@@ -731,11 +721,10 @@ on_ss_send_ussd (TelephonySs *ss,
        struct custom_data *ctx = user_data;
        UserRequest *ur = NULL;
        int ret = 0;
-       cynara *p_cynara = (ctx)?ctx->p_cynara:NULL;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SS, "x")) {
+       if (!check_access_control(p_cynara, invocation, AC_SS, "x"))
                return TRUE;
-       }
        memset(&req, 0, sizeof(struct treq_ss_ussd));
 
        req.type = ussd_type;
@@ -751,8 +740,8 @@ on_ss_send_ussd (TelephonySs *ss,
        tcore_user_request_set_data(ur, sizeof(struct treq_ss_ussd), &req);
        tcore_user_request_set_command(ur, TREQ_SS_SEND_USSD);
        ret = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (ret != TCORE_RETURN_SUCCESS ) {
-               FAIL_RESPONSE (invocation, DEFAULT_MSG_REQ_FAILED);
+       if (ret != TCORE_RETURN_SUCCESS) {
+               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
                dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", ret);
                tcore_user_request_unref(ur);
        }
@@ -768,401 +757,362 @@ gboolean dbus_plugin_setup_ss_interface(TelephonyObjectSkeleton *object, struct
        telephony_object_skeleton_set_ss(object, ss);
        g_object_unref(ss);
 
-       g_signal_connect (ss,
-                       "handle-activate-barring",
-                       G_CALLBACK (on_ss_activate_barring),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-deactivate-barring",
-                       G_CALLBACK (on_ss_deactivate_barring),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-change-barring-password",
-                       G_CALLBACK (on_ss_change_barring_password),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-get-barring-status",
-                       G_CALLBACK (on_ss_get_barring_status),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-register-forwarding",
-                       G_CALLBACK (on_ss_register_forwarding),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-deregister-forwarding",
-                       G_CALLBACK (on_ss_deregister_forwarding),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-activate-forwarding",
-                       G_CALLBACK (on_ss_activate_forwarding),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-deactivate-forwarding",
-                       G_CALLBACK (on_ss_deactivate_forwarding),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-get-forwarding-status",
-                       G_CALLBACK (on_ss_get_forwarding_status),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-activate-waiting",
-                       G_CALLBACK (on_ss_activate_waiting),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-deactivate-waiting",
-                       G_CALLBACK (on_ss_deactivate_waiting),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-get-waiting-status",
-                       G_CALLBACK (on_ss_get_waiting_status),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-set-clistatus",
-                       G_CALLBACK (on_ss_set_cli_status),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-get-clistatus",
-                       G_CALLBACK (on_ss_get_cli_status),
-                       ctx);
-
-       g_signal_connect (ss,
-                       "handle-send-ussd",
-                       G_CALLBACK (on_ss_send_ussd),
-                       ctx);
-
-       return TRUE;
-}
-
-gboolean dbus_plugin_ss_response(struct custom_data *ctx, UserRequest *ur, struct dbus_request_info *dbus_info, enum tcore_response_command command, unsigned int data_len, const void *data)
-{
-       GVariant *result = 0;
-       GVariantBuilder b;
-       int i = 0;
-
-       if ( !data ) {
-               err("response data : 0");
-               return FALSE;
-       }
-
-       switch (command) {
-               case TRESP_SS_BARRING_ACTIVATE: {
-
-                       const struct tresp_ss_barring *resp = data;
-
-                       dbg("receive TRESP_SS_BARRING_ACTIVATE (err[%d])", resp->err);
-
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "barring_mode", g_variant_new_int32( resp->record[i].mode ));
-                               g_variant_builder_close(&b);
-                       }
-
-                       result = g_variant_builder_end(&b);
+       g_signal_connect(ss,
+               "handle-activate-barring",
+               G_CALLBACK(on_ss_activate_barring), ctx);
 
-                       telephony_ss_complete_activate_barring(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       g_signal_connect(ss,
+               "handle-deactivate-barring",
+               G_CALLBACK(on_ss_deactivate_barring), ctx);
 
-               } break;
+       g_signal_connect(ss,
+               "handle-change-barring-password",
+               G_CALLBACK(on_ss_change_barring_password), ctx);
 
-               case TRESP_SS_BARRING_DEACTIVATE: {
+       g_signal_connect(ss,
+               "handle-get-barring-status",
+               G_CALLBACK(on_ss_get_barring_status), ctx);
 
-                       const struct tresp_ss_barring *resp = data;
+       g_signal_connect(ss,
+               "handle-register-forwarding",
+               G_CALLBACK(on_ss_register_forwarding), ctx);
 
-                       dbg("receive TRESP_SS_BARRING_DEACTIVATE (err[%d])", resp->err);
+       g_signal_connect(ss,
+               "handle-deregister-forwarding",
+               G_CALLBACK(on_ss_deregister_forwarding), ctx);
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+       g_signal_connect(ss,
+               "handle-activate-forwarding",
+               G_CALLBACK(on_ss_activate_forwarding), ctx);
 
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "barring_mode", g_variant_new_int32( resp->record[i].mode ));
-                               g_variant_builder_close(&b);
-                       }
+       g_signal_connect(ss,
+               "handle-deactivate-forwarding",
+               G_CALLBACK(on_ss_deactivate_forwarding), ctx);
 
-                       result = g_variant_builder_end(&b);
+       g_signal_connect(ss,
+               "handle-get-forwarding-status",
+               G_CALLBACK(on_ss_get_forwarding_status), ctx);
 
-                       telephony_ss_complete_deactivate_barring(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       g_signal_connect(ss,
+               "handle-activate-waiting",
+               G_CALLBACK(on_ss_activate_waiting), ctx);
 
-               } break;
+       g_signal_connect(ss,
+               "handle-deactivate-waiting",
+               G_CALLBACK(on_ss_deactivate_waiting), ctx);
 
-               case TRESP_SS_BARRING_CHANGE_PASSWORD: {
+       g_signal_connect(ss,
+               "handle-get-waiting-status",
+               G_CALLBACK(on_ss_get_waiting_status), ctx);
 
-                       const struct tresp_ss_general *resp = data;
+       g_signal_connect(ss,
+               "handle-set-clistatus",
+               G_CALLBACK(on_ss_set_cli_status), ctx);
 
-                       dbg("receive TRESP_SS_BARRING_CHANGE_PASSWORD (err[%d])", resp->err);
+       g_signal_connect(ss,
+               "handle-get-clistatus",
+               G_CALLBACK(on_ss_get_cli_status), ctx);
 
-                       telephony_ss_complete_change_barring_password(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       g_signal_connect(ss,
+               "handle-send-ussd",
+               G_CALLBACK(on_ss_send_ussd), ctx);
 
-               } break;
-
-               case TRESP_SS_BARRING_GET_STATUS: {
-
-                       const struct tresp_ss_barring *resp = data;
-
-                       dbg("receive TRESP_SS_BARRING_GET_STATUS (err[%d])", resp->err);
-
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "barring_mode", g_variant_new_int32( resp->record[i].mode ));
-                               g_variant_builder_close(&b);
-                       }
-
-                       result = g_variant_builder_end(&b);
+       return TRUE;
+}
 
-                       telephony_ss_complete_get_barring_status(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+gboolean dbus_plugin_ss_response(struct custom_data *ctx, UserRequest *ur, struct dbus_request_info *dbus_info, enum tcore_response_command command, unsigned int data_len, const void *data)
+{
+       GVariant *result = 0;
+       GVariantBuilder b;
+       int i = 0;
 
-               } break;
+       if (!data) {
+               err("response data : 0");
+               return FALSE;
+       }
 
-               case TRESP_SS_FORWARDING_ACTIVATE: {
-                       const struct tresp_ss_forwarding *resp = data;
+       switch (command) {
+       case TRESP_SS_BARRING_ACTIVATE: {
+               const struct tresp_ss_barring *resp = data;
 
-                       dbg("receive TRESP_SS_FORWARDING_ACTIVATE (err[%d])", resp->err);
+               dbg("receive TRESP_SS_BARRING_ACTIVATE (err[%d])", resp->err);
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32( resp->record[i].mode ));
-                               g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32( resp->record[i].number_present ));
-                               g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32( resp->record[i].time ));
-                               g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32( resp->record[i].ton ));
-                               g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32( resp->record[i].npi ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string( resp->record[i].number ));
-                               g_variant_builder_close(&b);
-                       }
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "barring_mode", g_variant_new_int32(resp->record[i].mode));
+                       g_variant_builder_close(&b);
+               }
 
-                       result = g_variant_builder_end(&b);
+               result = g_variant_builder_end(&b);
 
-                       telephony_ss_complete_activate_forwarding(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+               telephony_ss_complete_activate_barring(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-               } break;
+       case TRESP_SS_BARRING_DEACTIVATE: {
+               const struct tresp_ss_barring *resp = data;
 
-               case TRESP_SS_FORWARDING_DEACTIVATE: {
+               dbg("receive TRESP_SS_BARRING_DEACTIVATE (err[%d])", resp->err);
 
-                       const struct tresp_ss_forwarding *resp = data;
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       dbg("receive TRESP_SS_FORWARDING_DEACTIVATE (err[%d])", resp->err);
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "barring_mode", g_variant_new_int32(resp->record[i].mode));
+                       g_variant_builder_close(&b);
+               }
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+               result = g_variant_builder_end(&b);
 
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32( resp->record[i].mode ));
-                               g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32( resp->record[i].number_present ));
-                               g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32( resp->record[i].time ));
-                               g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32( resp->record[i].ton ));
-                               g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32( resp->record[i].npi ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string( resp->record[i].number ));
-                               g_variant_builder_close(&b);
-                       }
+               telephony_ss_complete_deactivate_barring(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-                       result = g_variant_builder_end(&b);
+       case TRESP_SS_BARRING_CHANGE_PASSWORD: {
+               const struct tresp_ss_general *resp = data;
 
-                       telephony_ss_complete_deactivate_forwarding(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+               dbg("receive TRESP_SS_BARRING_CHANGE_PASSWORD (err[%d])", resp->err);
 
-               } break;
+               telephony_ss_complete_change_barring_password(dbus_info->interface_object, dbus_info->invocation, resp->err);
+       } break;
 
-               case TRESP_SS_FORWARDING_REGISTER: {
+       case TRESP_SS_BARRING_GET_STATUS: {
+               const struct tresp_ss_barring *resp = data;
 
-                       const struct tresp_ss_forwarding *resp = data;
+               dbg("receive TRESP_SS_BARRING_GET_STATUS (err[%d])", resp->err);
 
-                       dbg("receive TRESP_SS_FORWARDING_REGISTER (err[%d])", resp->err);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "barring_mode", g_variant_new_int32(resp->record[i].mode));
+                       g_variant_builder_close(&b);
+               }
 
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32( resp->record[i].mode ));
-                               g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32( resp->record[i].number_present ));
-                               g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32( resp->record[i].time ));
-                               g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32( resp->record[i].ton ));
-                               g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32( resp->record[i].npi ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string( resp->record[i].number ));
-                               g_variant_builder_close(&b);
-                       }
+               result = g_variant_builder_end(&b);
 
-                       result = g_variant_builder_end(&b);
+               telephony_ss_complete_get_barring_status(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-                       telephony_ss_complete_register_forwarding(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       case TRESP_SS_FORWARDING_ACTIVATE: {
+               const struct tresp_ss_forwarding *resp = data;
 
-           } break;
+               dbg("receive TRESP_SS_FORWARDING_ACTIVATE (err[%d])", resp->err);
 
-               case TRESP_SS_FORWARDING_DEREGISTER: {
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       const struct tresp_ss_forwarding *resp = data;
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32(resp->record[i].mode));
+                       g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32(resp->record[i].number_present));
+                       g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32(resp->record[i].time));
+                       g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32(resp->record[i].ton));
+                       g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32(resp->record[i].npi));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string(resp->record[i].number));
+                       g_variant_builder_close(&b);
+               }
 
-                       dbg("receive TRESP_SS_FORWARDING_DEREGISTER (err[%d])", resp->err);
+               result = g_variant_builder_end(&b);
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+               telephony_ss_complete_activate_forwarding(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32( resp->record[i].mode ));
-                               g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32( resp->record[i].number_present ));
-                               g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32( resp->record[i].time ));
-                               g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32( resp->record[i].ton ));
-                               g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32( resp->record[i].npi ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string( resp->record[i].number ));
-                               g_variant_builder_close(&b);
-                       }
+       case TRESP_SS_FORWARDING_DEACTIVATE: {
+               const struct tresp_ss_forwarding *resp = data;
 
-                       result = g_variant_builder_end(&b);
+               dbg("receive TRESP_SS_FORWARDING_DEACTIVATE (err[%d])", resp->err);
 
-                       telephony_ss_complete_deregister_forwarding(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-               } break;
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32(resp->record[i].mode));
+                       g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32(resp->record[i].number_present));
+                       g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32(resp->record[i].time));
+                       g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32(resp->record[i].ton));
+                       g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32(resp->record[i].npi));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string(resp->record[i].number));
+                       g_variant_builder_close(&b);
+               }
 
-               case TRESP_SS_FORWARDING_GET_STATUS: {
+               result = g_variant_builder_end(&b);
 
-                       const struct tresp_ss_forwarding *resp = data;
+               telephony_ss_complete_deactivate_forwarding(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-                       dbg("receive TRESP_SS_FORWARDING_GET_STATUS (err[%d])", resp->err);
+       case TRESP_SS_FORWARDING_REGISTER: {
+               const struct tresp_ss_forwarding *resp = data;
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+               dbg("receive TRESP_SS_FORWARDING_REGISTER (err[%d])", resp->err);
 
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32( resp->record[i].mode ));
-                               g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32( resp->record[i].number_present ));
-                               g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32( resp->record[i].time ));
-                               g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32( resp->record[i].ton ));
-                               g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32( resp->record[i].npi ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string( resp->record[i].number ));
-                               g_variant_builder_close(&b);
-                       }
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       result = g_variant_builder_end(&b);
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32(resp->record[i].mode));
+                       g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32(resp->record[i].number_present));
+                       g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32(resp->record[i].time));
+                       g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32(resp->record[i].ton));
+                       g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32(resp->record[i].npi));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string(resp->record[i].number));
+                       g_variant_builder_close(&b);
+               }
 
-                       telephony_ss_complete_get_forwarding_status(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+               result = g_variant_builder_end(&b);
 
-               } break;
+               telephony_ss_complete_register_forwarding(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-               case TRESP_SS_WAITING_ACTIVATE: {
+       case TRESP_SS_FORWARDING_DEREGISTER: {
+               const struct tresp_ss_forwarding *resp = data;
 
-                       const struct tresp_ss_waiting *resp = data;
+               dbg("receive TRESP_SS_FORWARDING_DEREGISTER (err[%d])", resp->err);
 
-                       dbg("receive TRESP_SS_WAITING_ACTIVATE (err[%d])", resp->err);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32(resp->record[i].mode));
+                       g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32(resp->record[i].number_present));
+                       g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32(resp->record[i].time));
+                       g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32(resp->record[i].ton));
+                       g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32(resp->record[i].npi));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string(resp->record[i].number));
+                       g_variant_builder_close(&b);
+               }
 
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_close(&b);
-                       }
+               result = g_variant_builder_end(&b);
 
-                       result = g_variant_builder_end(&b);
+               telephony_ss_complete_deregister_forwarding(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-                       telephony_ss_complete_activate_waiting(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       case TRESP_SS_FORWARDING_GET_STATUS: {
+               const struct tresp_ss_forwarding *resp = data;
 
-               } break;
+               dbg("receive TRESP_SS_FORWARDING_GET_STATUS (err[%d])", resp->err);
 
-               case TRESP_SS_WAITING_DEACTIVATE: {
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       const struct tresp_ss_waiting *resp = data;
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32(resp->record[i].mode));
+                       g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32(resp->record[i].number_present));
+                       g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32(resp->record[i].time));
+                       g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32(resp->record[i].ton));
+                       g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32(resp->record[i].npi));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string(resp->record[i].number));
+                       g_variant_builder_close(&b);
+               }
 
-                       dbg("receive TRESP_SS_WAITING_DEACTIVATE (err[%d])", resp->err);
+               result = g_variant_builder_end(&b);
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+               telephony_ss_complete_get_forwarding_status(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_close(&b);
-                       }
+       case TRESP_SS_WAITING_ACTIVATE: {
+               const struct tresp_ss_waiting *resp = data;
 
-                       result = g_variant_builder_end(&b);
+               dbg("receive TRESP_SS_WAITING_ACTIVATE (err[%d])", resp->err);
 
-                       telephony_ss_complete_deactivate_waiting(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-               } break;
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_close(&b);
+               }
 
-               case TRESP_SS_WAITING_GET_STATUS: {
+               result = g_variant_builder_end(&b);
 
-                       const struct tresp_ss_waiting *resp = data;
+               telephony_ss_complete_activate_waiting(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-                       dbg("receive TRESP_SS_WAITING_GET_STATUS (err[%d])", resp->err);
+       case TRESP_SS_WAITING_DEACTIVATE: {
+               const struct tresp_ss_waiting *resp = data;
 
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+               dbg("receive TRESP_SS_WAITING_DEACTIVATE (err[%d])", resp->err);
 
-                       for (i=0; i<resp->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( resp->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( resp->record[i].status ));
-                               g_variant_builder_close(&b);
-                       }
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       result = g_variant_builder_end(&b);
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_close(&b);
+               }
 
-                       telephony_ss_complete_get_waiting_status(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+               result = g_variant_builder_end(&b);
 
-               } break;
+               telephony_ss_complete_deactivate_waiting(dbus_info->interface_object, dbus_info->invocation, result, resp->err);
+       } break;
 
-               case TRESP_SS_CLI_SET_STATUS: {
+       case TRESP_SS_WAITING_GET_STATUS: {
+               const struct tresp_ss_waiting *resp = data;
 
-                       const struct tresp_ss_set_cli *resp = data;
+               dbg("receive TRESP_SS_WAITING_GET_STATUS (err[%d])", resp->err);
 
-                       dbg("receive TRESP_SS_CLI_SET_STATUS (err[%d])", resp->err);
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
-                       telephony_ss_complete_set_clistatus(dbus_info->interface_object, dbus_info->invocation, resp->err);
+               for (i = 0; i < resp->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(resp->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(resp->record[i].status));
+                       g_variant_builder_close(&b);
+               }
 
-               } break;
+               result = g_variant_builder_end(&b);
 
-               case TRESP_SS_CLI_GET_STATUS: {
+               telephony_ss_complete_get_waiting_status(dbus_info->interface_object,
+                       dbus_info->invocation, result, resp->err);
+       } break;
 
-                       const struct tresp_ss_cli *resp = data;
+       case TRESP_SS_CLI_SET_STATUS: {
+               const struct tresp_ss_set_cli *resp = data;
 
-                       dbg("receive TRESP_SS_CLI_GET_STATUS (err[%d])", resp->err);
+               dbg("receive TRESP_SS_CLI_SET_STATUS (err[%d])", resp->err);
 
-                       telephony_ss_complete_get_clistatus(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->type, resp->status);
+               telephony_ss_complete_set_clistatus(dbus_info->interface_object,
+                       dbus_info->invocation, resp->err);
+       } break;
 
-               } break;
+       case TRESP_SS_CLI_GET_STATUS: {
+               const struct tresp_ss_cli *resp = data;
 
-               case TRESP_SS_SEND_USSD: {
+               dbg("receive TRESP_SS_CLI_GET_STATUS (err[%d])", resp->err);
 
-                       const struct tresp_ss_ussd *resp = data;
+               telephony_ss_complete_get_clistatus(dbus_info->interface_object,
+                       dbus_info->invocation, resp->err, resp->type, resp->status);
+       } break;
 
-                       dbg("receive TRESP_SS_SEND_USSD (err[%d])", resp->err);
-                       dbg("USSD : %s (len : %d, type : 0x%x, status : 0x%x, dcs : 0x%x)", resp->str, resp->len, resp->type, resp->status, resp->dcs);
-                       telephony_ss_complete_send_ussd(dbus_info->interface_object, dbus_info->invocation, resp->err, resp->type, resp->status, resp->dcs, resp->len, (char*)resp->str);
+       case TRESP_SS_SEND_USSD: {
+               const struct tresp_ss_ussd *resp = data;
 
-               } break;
+               dbg("receive TRESP_SS_SEND_USSD (err[%d])", resp->err);
+               dbg("USSD : %s (len : %d, type : 0x%x, status : 0x%x, dcs : 0x%x)", resp->str, resp->len, resp->type, resp->status, resp->dcs);
+               telephony_ss_complete_send_ussd(dbus_info->interface_object,
+                       dbus_info->invocation, resp->err, resp->type,
+                       resp->status, resp->dcs, resp->len, (char*)resp->str);
+       } break;
 
-               default:
-                       dbg("not handled command[%d]", command);
+       default:
+               dbg("not handled command[%d]", command);
                break;
        }
 
@@ -1175,7 +1125,7 @@ gboolean dbus_plugin_ss_notification(struct custom_data *ctx, CoreObject *source
        GVariant *result = 0;
        GVariantBuilder b;
        int i = 0;
-       char *cp_name= NULL;
+       char *cp_name = NULL;
 
        if (!object) {
                dbg("object is NULL");
@@ -1188,123 +1138,120 @@ gboolean dbus_plugin_ss_notification(struct custom_data *ctx, CoreObject *source
        }
 
        cp_name =  (char*)tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
-       dbg("Notification!!! Command: [0x%x] CP Name: [%s]",
-                               command, cp_name);
-
        ss = telephony_object_peek_ss(TELEPHONY_OBJECT(object));
+       if (ss == NULL) {
+               err("ss object is NULL!!!");
+               return FALSE;
+       }
 
        switch (command) {
-               case TNOTI_SS_USSD: {
-                       const struct tnoti_ss_ussd *ussd = data;
-                       enum dbus_tapi_sim_slot_id slot_id;
-
-                       slot_id = get_sim_slot_id_by_cp_name(cp_name);
-                       dbg("slot_id: [%d]", slot_id);
-
-                       telephony_ss_emit_notify_ussd(ss,
-                                       ussd->status,
-                                       ussd->dcs,
-                                       ussd->len,
-                                       (char*)ussd->str);
-                       _launch_ciss(ussd, slot_id);
-               } break;
-
-               case TNOTI_SS_FORWARDING_STATUS: {
-                       const struct tnoti_ss_forwarding_status *fwrd = data;
-
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-
-                       for (i=0; i<fwrd->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( fwrd->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( fwrd->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32( fwrd->record[i].mode ));
-                               g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32( fwrd->record[i].number_present ));
-                               g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32( fwrd->record[i].time ));
-                               g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32( fwrd->record[i].ton ));
-                               g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32( fwrd->record[i].npi ));
-                               g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string( fwrd->record[i].number ));
-                               g_variant_builder_close(&b);
-                       }
-
-                       result = g_variant_builder_end(&b);
-                       telephony_ss_emit_notify_forwarding(ss, result);
-
-               } break;
-
-               case TNOTI_SS_BARRING_STATUS: {
-
-                       const struct tnoti_ss_barring_status *barr = data;
-
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-
-                       for (i=0; i<barr->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( barr->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( barr->record[i].status ));
-                               g_variant_builder_add(&b, "{sv}", "barring_mode", g_variant_new_int32( barr->record[i].mode ));
-                               g_variant_builder_close(&b);
-                       }
-
-                       result = g_variant_builder_end(&b);
-                       telephony_ss_emit_notify_barring(ss, result);
-
-               } break;
-
-               case TNOTI_SS_WAITING_STATUS: {
-                       const struct tnoti_ss_waiting_status *wait = data;
-
-                       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
-
-                       for (i=0; i<wait->record_num; i++) {
-                               g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-                               g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32( wait->record[i].class ));
-                               g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32( wait->record[i].status ));
-                               g_variant_builder_close(&b);
-                       }
-
-                       result = g_variant_builder_end(&b);
-                       telephony_ss_emit_notify_waiting(ss, result);
-
-               } break;
-
-               case TNOTI_SS_RELEASE_COMPLETE: {
-                       int i = 0;
-                       GVariantBuilder builder;
-                       GVariant *msg_data = 0, *packet = NULL;
-                       const struct tnoti_ss_release_complete *msg = data;
-                       if (msg) {
-                               g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-                               for (i = 0; i < msg->data_len; i++) {
-                                       g_variant_builder_add(&builder, "y", msg->data[i]);
-                               }
-                               msg_data = g_variant_builder_end(&builder);
-                               packet = g_variant_new("v", msg_data);
-
-                               dbg("type_format(%s)", g_variant_get_type_string(packet));
-                               telephony_ss_emit_release_complete(ss, msg->data_len, packet );
-                       } else {
-                               dbg("No data is passed in USSD release notification");
-                               g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-                               g_variant_builder_add(&builder, "y", '\0');
-                               msg_data = g_variant_builder_end(&builder);
-                               packet = g_variant_new("v", msg_data);
-                               dbg("type_format(%s)", g_variant_get_type_string(packet));
-                               telephony_ss_emit_release_complete(ss, 1, packet);
-                       }
-               } break;
-               case TNOTI_SS_INFO: {
-                       const struct tnoti_ss_information *ss_info = data;
-                       telephony_ss_emit_notify_ss_info(ss,
-                                       ss_info->err,
-                                       ss_info->ss_type);
-                       _launch_ciss_information(ss_info);
-                       /* Launch CISS application
-                       _launch_ciss(ss_info);
-                       */
-               } break;
-               default:
-                       dbg("not handled command[%d]", command);
+       case TNOTI_SS_USSD: {
+               const struct tnoti_ss_ussd *ussd = data;
+               enum dbus_tapi_sim_slot_id slot_id;
+
+               slot_id = get_sim_slot_id_by_cp_name(cp_name);
+               dbg("slot_id: [%d]", slot_id);
+
+               telephony_ss_emit_notify_ussd(ss,
+                               ussd->status,
+                               ussd->dcs,
+                               ussd->len,
+                               (char*)ussd->str);
+               _launch_ciss(ussd, slot_id);
+       } break;
+
+       case TNOTI_SS_FORWARDING_STATUS: {
+               const struct tnoti_ss_forwarding_status *fwrd = data;
+
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+
+               for (i = 0; i < fwrd->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(fwrd->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(fwrd->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_mode", g_variant_new_int32(fwrd->record[i].mode));
+                       g_variant_builder_add(&b, "{sv}", "number_present", g_variant_new_int32(fwrd->record[i].number_present));
+                       g_variant_builder_add(&b, "{sv}", "no_reply_time", g_variant_new_int32(fwrd->record[i].time));
+                       g_variant_builder_add(&b, "{sv}", "type_of_number", g_variant_new_int32(fwrd->record[i].ton));
+                       g_variant_builder_add(&b, "{sv}", "numbering_plan_identity", g_variant_new_int32(fwrd->record[i].npi));
+                       g_variant_builder_add(&b, "{sv}", "forwarding_number", g_variant_new_string(fwrd->record[i].number));
+                       g_variant_builder_close(&b);
+               }
+
+               result = g_variant_builder_end(&b);
+               telephony_ss_emit_notify_forwarding(ss, result);
+       } break;
+
+       case TNOTI_SS_BARRING_STATUS: {
+               const struct tnoti_ss_barring_status *barr = data;
+
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+
+               for (i = 0; i < barr->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(barr->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(barr->record[i].status));
+                       g_variant_builder_add(&b, "{sv}", "barring_mode", g_variant_new_int32(barr->record[i].mode));
+                       g_variant_builder_close(&b);
+               }
+
+               result = g_variant_builder_end(&b);
+               telephony_ss_emit_notify_barring(ss, result);
+       } break;
+
+       case TNOTI_SS_WAITING_STATUS: {
+               const struct tnoti_ss_waiting_status *wait = data;
+
+               g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
+
+               for (i = 0; i < wait->record_num; i++) {
+                       g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
+                       g_variant_builder_add(&b, "{sv}", "ss_class", g_variant_new_int32(wait->record[i].class));
+                       g_variant_builder_add(&b, "{sv}", "ss_status", g_variant_new_int32(wait->record[i].status));
+                       g_variant_builder_close(&b);
+               }
+
+               result = g_variant_builder_end(&b);
+               telephony_ss_emit_notify_waiting(ss, result);
+       } break;
+
+       case TNOTI_SS_RELEASE_COMPLETE: {
+               int i = 0;
+               GVariantBuilder builder;
+               GVariant *msg_data = 0, *packet = NULL;
+               const struct tnoti_ss_release_complete *msg = data;
+               if (msg) {
+                       g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+                       for (i = 0; i < msg->data_len; i++)
+                               g_variant_builder_add(&builder, "y", msg->data[i]);
+                       msg_data = g_variant_builder_end(&builder);
+                       packet = g_variant_new("v", msg_data);
+
+                       dbg("type_format(%s)", g_variant_get_type_string(packet));
+                       telephony_ss_emit_release_complete(ss, msg->data_len, packet);
+               } else {
+                       dbg("No data is passed in USSD release notification");
+                       g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+                       g_variant_builder_add(&builder, "y", '\0');
+                       msg_data = g_variant_builder_end(&builder);
+                       packet = g_variant_new("v", msg_data);
+                       dbg("type_format(%s)", g_variant_get_type_string(packet));
+                       telephony_ss_emit_release_complete(ss, 1, packet);
+               }
+       } break;
+
+       case TNOTI_SS_INFO: {
+               const struct tnoti_ss_information *ss_info = data;
+               telephony_ss_emit_notify_ss_info(ss,
+                               ss_info->err,
+                               ss_info->ss_type);
+               _launch_ciss_information(ss_info);
+               /* Launch CISS application
+               _launch_ciss(ss_info);
+               */
+       } break;
+       default:
+               dbg("not handled command[%d]", command);
                break;
        }