Remove menu_call_send_burst_dtmf from 3GPP call test

 -send_burst_dtmf() should be used for 3GPP2(CDMA) case

Change-Id: I51b2a42ee2b31317cb66aae7672652637ccdcadc

diff --git a/packaging/libtapi.spec b/packaging/libtapi.spec
index 6be239b..2fd652d 100644 (file)
--- a/packaging/libtapi.spec
+++ b/packaging/libtapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 8
-%define patchlevel 22
+%define patchlevel 23
 
 Name:           libtapi
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/tapi_common.c b/src/tapi_common.c
index bebb98a..3a4a0dc 100644 (file)
--- a/src/tapi_common.c
+++ b/src/tapi_common.c
@@ -869,25 +869,25 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        /* Call number exist */
                        call_ctrl_result_ind.callCtrlCnfType = TAPI_SAT_CALL_TYPE_MO_VOICE;
                        call_ctrl_result_ind.u.callCtrlCnfCallData.address.stringLen = strlen(call_num);
-                       memcpy(&call_ctrl_result_ind.u.callCtrlCnfCallData.address.string, call_num, strlen(call_num));
+                       snprintf((char *)call_ctrl_result_ind.u.callCtrlCnfCallData.address.string, strlen(call_num) + 1, "%s", call_num);
                        call_ctrl_result_ind.u.callCtrlCnfCallData.subAddress.stringLen = strlen(sub_addr);
-                       memcpy(&call_ctrl_result_ind.u.callCtrlCnfCallData.subAddress.string, sub_addr, strlen(sub_addr));
+                       snprintf((char *)call_ctrl_result_ind.u.callCtrlCnfCallData.subAddress.string, strlen(sub_addr) + 1, "%s", sub_addr);
                        call_ctrl_result_ind.u.callCtrlCnfCallData.ccp1.stringLen = strlen(ccp1);
-                       memcpy(&call_ctrl_result_ind.u.callCtrlCnfCallData.ccp1.string, ccp1, strlen(ccp1));
-                       call_ctrl_result_ind.u.callCtrlCnfCallData.ccp1.stringLen = strlen(ccp2);
-                       memcpy(&call_ctrl_result_ind.u.callCtrlCnfCallData.ccp1.string, ccp2, strlen(ccp2));
+                       snprintf((char *)call_ctrl_result_ind.u.callCtrlCnfCallData.ccp1.string, strlen(ccp1) + 1, "%s", ccp1);
+                       call_ctrl_result_ind.u.callCtrlCnfCallData.ccp2.stringLen = strlen(ccp2);
+                       snprintf((char *)call_ctrl_result_ind.u.callCtrlCnfCallData.ccp2.string, strlen(ccp2) + 1, "%s", ccp2);
                        call_ctrl_result_ind.u.callCtrlCnfCallData.bcRepeatIndicator = bc_repeat_indicator;
                } else if (strlen(ss_string) > 1 && (g_strcmp0(ss_string, "") != 0)) {
                        /* SS string exist */
                        call_ctrl_result_ind.callCtrlCnfType = TAPI_SAT_CALL_TYPE_SS;
                        call_ctrl_result_ind.u.callCtrlCnfSsData.ssString.stringLen = strlen(ss_string);
-                       memcpy(&call_ctrl_result_ind.u.callCtrlCnfSsData.ssString.string, ss_string, strlen(ss_string));
+                       snprintf((char *)call_ctrl_result_ind.u.callCtrlCnfSsData.ssString.string, strlen(ss_string) + 1, "%s", ss_string);
                        call_ctrl_result_ind.u.callCtrlCnfSsData.subAddress.stringLen = strlen(sub_addr);
-                       memcpy(&call_ctrl_result_ind.u.callCtrlCnfSsData.subAddress.string, sub_addr, strlen(sub_addr));
+                       snprintf((char *)call_ctrl_result_ind.u.callCtrlCnfSsData.subAddress.string, strlen(sub_addr) + 1, "%s", sub_addr);
                        call_ctrl_result_ind.u.callCtrlCnfSsData.ccp1.stringLen = strlen(ccp1);
-                       memcpy(&call_ctrl_result_ind.u.callCtrlCnfSsData.ccp1.string, ccp1, strlen(ccp1));
-                       call_ctrl_result_ind.u.callCtrlCnfSsData.ccp1.stringLen = strlen(ccp2);
-                       memcpy(&call_ctrl_result_ind.u.callCtrlCnfSsData.ccp1.string, ccp2, strlen(ccp2));
+                       snprintf((char *)call_ctrl_result_ind.u.callCtrlCnfSsData.ccp1.string, strlen(ccp1) + 1, "%s", ccp1);
+                       call_ctrl_result_ind.u.callCtrlCnfSsData.ccp2.stringLen = strlen(ccp2);
+                       snprintf((char *)call_ctrl_result_ind.u.callCtrlCnfSsData.ccp2.string, strlen(ccp2) + 1, "%s", ccp2);
                        call_ctrl_result_ind.u.callCtrlCnfSsData.bcRepeatIndicator = bc_repeat_indicator;
                } else {
                        dbg("not matched call control");
@@ -923,14 +923,14 @@ EXIT:
 
                if (strlen(rp_dst_call_num) > 1 && (g_strcmp0(rp_dst_call_num, "") != 0)) {
                        /* RP DST Call number exist */
-                       mo_sm_ctrl_result_ind.tpDestAddr.bIsDigitOnly = 1;
+                       mo_sm_ctrl_result_ind.rpDestAddr.bIsDigitOnly = 1;
                        mo_sm_ctrl_result_ind.rpDestAddr.stringLen = strlen(rp_dst_call_num);
-                       memcpy(&mo_sm_ctrl_result_ind.rpDestAddr.string, rp_dst_call_num, strlen(rp_dst_call_num));
+                       snprintf(mo_sm_ctrl_result_ind.rpDestAddr.string, strlen(rp_dst_call_num) + 1, "%s", rp_dst_call_num);
                } else if (strlen(tp_dst_call_num) > 1 && (g_strcmp0(tp_dst_call_num, "") != 0)) {
                        /* TP DST Call number exist */
                        mo_sm_ctrl_result_ind.tpDestAddr.bIsDigitOnly = 1;
                        mo_sm_ctrl_result_ind.tpDestAddr.stringLen = strlen(tp_dst_call_num);
-                       memcpy(&mo_sm_ctrl_result_ind.tpDestAddr.string, tp_dst_call_num, strlen(tp_dst_call_num));
+                       snprintf(mo_sm_ctrl_result_ind.tpDestAddr.string, strlen(tp_dst_call_num) + 1, "%s", tp_dst_call_num);
                } else {
                        dbg("Any destination address are not provided, use default one.");
                }

diff --git a/test_src/call.c b/test_src/call.c
index d9faaea..c14e149 100644 (file)
--- a/test_src/call.c
+++ b/test_src/call.c
@@ -1071,7 +1071,6 @@ struct menu_data menu_call_3gpp[] = {
        { "9", "tel_transfer_call", menu_call_transfer, NULL, NULL},
        { "10", "tel_start_call_cont_dtmf_call", menu_call_start_cont_dtmf, NULL, NULL},
        { "11", "tel_stop_call_cont_dtmf_call", menu_call_stop_cont_dtmf, NULL, NULL},
-       { "12", "tel_send_call_burst_dtmf", menu_call_send_burst_dtmf, NULL, NULL},
        { "13", "tel_get_call_status", menu_call_get_status, NULL, NULL},
        { "14", "tel_get_call_status_all", menu_call_get_status_all, NULL, NULL},
        { "15", "tel_set_call_mute_status", menu_call_set_mute_status, NULL, NULL},