From: Junghwan Song Date: Wed, 5 Sep 2012 11:13:07 +0000 (+0900) Subject: sync with private git ver.0.6.14 X-Git-Tag: 2.0_alpha^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;p=framework%2Ftelephony%2Flibslp-tapi.git sync with private git ver.0.6.14 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index bc640c4..6d5d578 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,5 +54,3 @@ CONFIGURE_FILE(tapi.pc.in tapi.pc @ONLY) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/telephony-client) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tapi.pc DESTINATION lib/pkgconfig) INSTALL(TARGETS SLP-tapi DESTINATION lib COMPONENT Runtime) - -#ADD_SUBDIRECTORY(test_src) diff --git a/include/TelNetwork.h b/include/TelNetwork.h index 29f6cd1..c527dc1 100644 --- a/include/TelNetwork.h +++ b/include/TelNetwork.h @@ -61,7 +61,9 @@ typedef enum { TAPI_NETWORK_SELECTIONMODE_AUTOMATIC, /**< Network selection is in Automatic selection mode*/ TAPI_NETWORK_SELECTIONMODE_MANUAL, /**< Network selection is in Manual selection mode */ TAPI_NETWORK_SELECTIONMODE_GLOBAL_AUTOMAITIC, /**cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &pb_cnt, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_pb_meta_info(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -130,6 +132,8 @@ static void on_response_get_sim_pb_meta_info(GObject *source_object, GAsyncResul if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &pb_entry, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_pb_usim_meta_info(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -179,6 +183,8 @@ static void on_response_get_sim_pb_usim_meta_info(GObject *source_object, GAsync if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_read_sim_pb_record(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -266,6 +272,8 @@ static void on_response_read_sim_pb_record(GObject *source_object, GAsyncResult if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &pb_rec, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_update_sim_pb_record(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -285,6 +293,8 @@ static void on_response_update_sim_pb_record(GObject *source_object, GAsyncResul if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_delete_sim_pb_record(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -304,6 +314,8 @@ static void on_response_delete_sim_pb_record(GObject *source_object, GAsyncResul if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_get_sim_pb_init_info(TapiHandle *handle, int *init_completed, TelSimPbList_t *pb_list) diff --git a/src/tapi_sap.c b/src/tapi_sap.c index 627bf4f..324cb7a 100644 --- a/src/tapi_sap.c +++ b/src/tapi_sap.c @@ -51,6 +51,8 @@ static void on_response_sap_connect(GObject *source_object, GAsyncResult *res, g if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, (void*)&max_msg_size, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_req_sap_connect(TapiHandle *handle, int max_msg_size, tapi_response_cb callback, void *user_data) @@ -89,6 +91,8 @@ static void on_response_sap_disconnect(GObject *source_object, GAsyncResult *res if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_req_sap_disconnect(TapiHandle *handle, tapi_response_cb callback, void *user_data) @@ -125,6 +129,8 @@ static void on_response_sap_connection_status(GObject *source_object, GAsyncResu if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_req_sap_connection_status(TapiHandle *handle, tapi_response_cb callback, void *user_data) @@ -187,6 +193,8 @@ static void on_response_sap_transfer_atr(GObject *source_object, GAsyncResult *r if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, (void*)&r_atr, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_req_sap_transfer_atr(TapiHandle *handle, tapi_response_cb callback, void *user_data) @@ -251,6 +259,8 @@ static void on_response_sap_transfer_apdu(GObject *source_object, GAsyncResult * if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, (void*)&r_apdu, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_req_sap_transfer_apdu(TapiHandle *handle, TelSapApduData_t *apdu_data, tapi_response_cb callback, void *user_data) @@ -301,6 +311,8 @@ static void on_response_sap_transport_protocol(GObject *source_object, GAsyncRes if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_req_sap_transport_protocol(TapiHandle *handle, TelSimSapProtocol_t protocol, tapi_response_cb callback, void *user_data) @@ -339,6 +351,8 @@ static void on_response_sap_power_operation(GObject *source_object, GAsyncResult if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_req_sap_power_operation(TapiHandle *handle, TelSimSapPowerMode_t power_mode, tapi_response_cb callback, void *user_data) @@ -393,6 +407,8 @@ static void on_response_sap_cardreader_status(GObject *source_object, GAsyncResu if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, (void*)&reader_status, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_req_sap_cardreader_status(TapiHandle *handle, tapi_response_cb callback, void *user_data) diff --git a/src/tapi_sim.c b/src/tapi_sim.c index 48e0174..b30be48 100644 --- a/src/tapi_sim.c +++ b/src/tapi_sim.c @@ -119,6 +119,8 @@ static void on_response_get_sim_iccid(GObject *source_object, GAsyncResult *res, if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &iccid_info, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_language(GObject *source_object, GAsyncResult *res, @@ -141,6 +143,8 @@ static void on_response_get_sim_language(GObject *source_object, GAsyncResult *r if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &lang, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_set_sim_language(GObject *source_object, GAsyncResult *res, @@ -162,6 +166,8 @@ static void on_response_set_sim_language(GObject *source_object, GAsyncResult *r if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_callforwarding_info(GObject *source_object, GAsyncResult *res, @@ -186,6 +192,8 @@ static void on_response_get_sim_callforwarding_info(GObject *source_object, GAsy if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &cf, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_messagewaiting_info(GObject *source_object, GAsyncResult *res, @@ -210,6 +218,8 @@ static void on_response_get_sim_messagewaiting_info(GObject *source_object, GAsy if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &msg, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_mailbox_info(GObject *source_object, GAsyncResult *res, @@ -263,6 +273,8 @@ static void on_response_get_sim_mailbox_info(GObject *source_object, GAsyncResul if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_cphs_info(GObject *source_object, GAsyncResult *res, @@ -291,6 +303,8 @@ static void on_response_get_sim_cphs_info(GObject *source_object, GAsyncResult * if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &cphs, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_msisdn(GObject *source_object, GAsyncResult *res, @@ -354,6 +368,8 @@ static void on_response_get_sim_msisdn(GObject *source_object, GAsyncResult *res if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_oplmnwact(GObject *source_object, GAsyncResult *res, @@ -403,6 +419,8 @@ static void on_response_get_sim_oplmnwact(GObject *source_object, GAsyncResult * if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_spn(GObject *source_object, GAsyncResult *res, @@ -436,6 +454,8 @@ static void on_response_get_sim_spn(GObject *source_object, GAsyncResult *res, if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &spn_info, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_cphs_netname(GObject *source_object, GAsyncResult *res, @@ -469,6 +489,8 @@ static void on_response_get_sim_cphs_netname(GObject *source_object, GAsyncResul if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &cphs_net, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_req_sim_authentication(GObject *source_object, GAsyncResult *res, @@ -559,6 +581,8 @@ static void on_response_req_sim_authentication(GObject *source_object, GAsyncRes if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &auth_resp, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_verify_sim_pins(GObject *source_object, GAsyncResult *res, @@ -583,6 +607,8 @@ static void on_response_verify_sim_pins(GObject *source_object, GAsyncResult *re if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &sec_rt, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_verify_sim_puks(GObject *source_object, GAsyncResult *res, @@ -607,6 +633,8 @@ static void on_response_verify_sim_puks(GObject *source_object, GAsyncResult *re if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &sec_rt, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_change_sim_pins(GObject *source_object, GAsyncResult *res, @@ -631,6 +659,8 @@ static void on_response_change_sim_pins(GObject *source_object, GAsyncResult *re if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &sec_rt, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_disable_sim_facility(GObject *source_object, GAsyncResult *res, @@ -655,6 +685,8 @@ static void on_response_disable_sim_facility(GObject *source_object, GAsyncResul if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &f_rt, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_enable_sim_facility(GObject *source_object, GAsyncResult *res, @@ -679,6 +711,8 @@ static void on_response_enable_sim_facility(GObject *source_object, GAsyncResult if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &f_rt, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_facility(GObject *source_object, GAsyncResult *res, @@ -703,6 +737,8 @@ static void on_response_get_sim_facility(GObject *source_object, GAsyncResult *r if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &fi, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_get_sim_lock_info(GObject *source_object, GAsyncResult *res, @@ -728,6 +764,8 @@ static void on_response_get_sim_lock_info(GObject *source_object, GAsyncResult * if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &lock, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_req_sim_apdu(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -777,6 +815,8 @@ static void on_response_req_sim_apdu(GObject *source_object, GAsyncResult *res, if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &r_apdu, evt_cb_data->user_data); } + + free(evt_cb_data); } static void on_response_req_sim_atr(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -825,6 +865,8 @@ static void on_response_req_sim_atr(GObject *source_object, GAsyncResult *res, g if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &r_atr, evt_cb_data->user_data); } + + free(evt_cb_data); } EXPORT_API int tel_get_sim_init_info(TapiHandle *handle, TelSimCardStatus_t *sim_status, diff --git a/src/tapi_sms.c b/src/tapi_sms.c index 5922bee..acd4c85 100644 --- a/src/tapi_sms.c +++ b/src/tapi_sms.c @@ -69,6 +69,10 @@ static void on_response_default(GObject *source_object, GAsyncResult *res, gpoin if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data); } + + if(evt_cb_data) + free(evt_cb_data); + } static void on_response_read_msg(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -121,6 +125,9 @@ static void on_response_read_msg(GObject *source_object, GAsyncResult *res, gpoi if(decoded_tpdu) g_free(decoded_tpdu); + if(evt_cb_data) + free(evt_cb_data); + } static void on_response_write_msg(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -149,6 +156,10 @@ static void on_response_write_msg(GObject *source_object, GAsyncResult *res, gpo if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &index, evt_cb_data->user_data); } + + if(evt_cb_data) + free(evt_cb_data); + } static void on_response_delete_msg(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -177,6 +188,10 @@ static void on_response_delete_msg(GObject *source_object, GAsyncResult *res, gp if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &index, evt_cb_data->user_data); } + + if(evt_cb_data) + free(evt_cb_data); + } static void on_response_get_msg_count(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -218,6 +233,9 @@ static void on_response_get_msg_count(GObject *source_object, GAsyncResult *res, if(decoded_indexList) g_free(decoded_indexList); + if(evt_cb_data) + free(evt_cb_data); + } static void on_response_get_sca(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -260,6 +278,9 @@ static void on_response_get_sca(GObject *source_object, GAsyncResult *res, gpoin if(decoded_sca) g_free(decoded_sca); + if(evt_cb_data) + free(evt_cb_data); + } static void on_response_get_cb_config(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -268,12 +289,14 @@ static void on_response_get_cb_config(GObject *source_object, GAsyncResult *res, GDBusConnection *conn = NULL; struct tapi_resp_data *evt_cb_data = user_data; int result = -1; + int i; TelSmsCbConfig_t cbConfig = {0,}; GVariant *dbus_result = NULL; - const char *cbMsgIDs = NULL; - gsize length; - guchar *decoded_cbMsgIDs = NULL; + GVariant *value = NULL; + GVariantIter *iter = NULL; + GVariantIter *iter_row = NULL; + const gchar *key = NULL; conn = G_DBUS_CONNECTION (source_object); dbus_result = g_dbus_connection_call_finish(conn, res, &error); @@ -286,22 +309,43 @@ static void on_response_get_cb_config(GObject *source_object, GAsyncResult *res, dbg("on_response_get_cb_config type_format(%s)", g_variant_get_type_string(dbus_result)); - g_variant_get (dbus_result, "(iiiiis)", &result, - &cbConfig.bCBEnabled, - &cbConfig.SelectedId, - &cbConfig.MsgIdMaxCount, - &cbConfig.MsgIdCount, - &cbMsgIDs); - - decoded_cbMsgIDs = g_base64_decode(cbMsgIDs, &length); - memcpy(&(cbConfig.MsgIDs[0]), decoded_cbMsgIDs, TAPI_NETTEXT_GSM_SMS_CBMI_LIST_SIZE_MAX); + g_variant_get (dbus_result, "(iiiiiaa{sv})", &result, + &cbConfig.Net3gppType, + &cbConfig.CBEnabled, + &cbConfig.MsgIdMaxCount, + &cbConfig.MsgIdRangeCount, + &iter); + + i = 0; + 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")) { + cbConfig.MsgIDs[i].Net3gpp.FromMsgId = g_variant_get_uint16(value); + } + if (!g_strcmp0(key, "ToMsgId")) { + cbConfig.MsgIDs[i].Net3gpp.ToMsgId = g_variant_get_uint16(value); + } + if (!g_strcmp0(key, "CBCategory")) { + cbConfig.MsgIDs[i].Net3gpp2.CBCategory = g_variant_get_uint16(value); + } + if (!g_strcmp0(key, "CBLanguage")) { + cbConfig.MsgIDs[i].Net3gpp2.CBLanguage = g_variant_get_uint16(value); + } + if (!g_strcmp0(key, "Selected")) { + cbConfig.MsgIDs[i].Net3gpp.Selected = g_variant_get_byte(value); + } + } + i++; + g_variant_iter_free(iter_row); + } + g_variant_iter_free(iter); if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &cbConfig, evt_cb_data->user_data); } - if(decoded_cbMsgIDs) - g_free(decoded_cbMsgIDs); + if(evt_cb_data) + free(evt_cb_data); } @@ -373,6 +417,9 @@ static void on_response_get_sms_params(GObject *source_object, GAsyncResult *res if(decoded_scaDialNum) g_free(decoded_scaDialNum); + if(evt_cb_data) + free(evt_cb_data); + } static void on_response_get_sms_param_cnt(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -402,6 +449,10 @@ static void on_response_get_sms_param_cnt(GObject *source_object, GAsyncResult * if (evt_cb_data->cb_fn) { evt_cb_data->cb_fn(evt_cb_data->handle, result, &recordCount, evt_cb_data->user_data); } + + if(evt_cb_data) + free(evt_cb_data); + } /** @@ -433,9 +484,7 @@ EXPORT_API int tel_send_sms(struct tapi_handle *handle, dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pDataPackage ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); #if 0 if (vconf_get_int("db/telephony/emergency", &emergency_mode) != 0) { err("[FAIL]GET db/telephony/emergency"); @@ -502,14 +551,14 @@ EXPORT_API int tel_read_sms_in_sim(struct tapi_handle *handle, int index, tapi_r dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); if(index < 0) { err("Invalid Input -Read SMS %d",index); return TAPI_API_INVALID_INPUT; } + TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); + MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); param = g_variant_new("(i)", index); @@ -549,9 +598,7 @@ EXPORT_API int tel_write_sms_in_sim(struct tapi_handle *handle, const TelSmsData dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pWriteData ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -606,8 +653,6 @@ EXPORT_API int tel_delete_sms_in_sim(struct tapi_handle *handle, int index, tapi dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); if ((index < 0) || (index > TAPI_NETTEXT_MAX_INDEX)) { err("Invalid Index Input"); return TAPI_API_INVALID_INPUT; @@ -647,7 +692,6 @@ EXPORT_API int tel_get_sms_count(struct tapi_handle *handle, tapi_response_cb ca dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -685,8 +729,8 @@ EXPORT_API int tel_get_sms_sca(struct tapi_handle *handle, int index, tapi_respo dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); + if ((index < 0) || (index > TAPI_NETTEXT_MAX_INDEX)) { err("Invalid Index Input"); return TAPI_API_INVALID_INPUT; @@ -730,9 +774,8 @@ EXPORT_API int tel_set_sms_sca(struct tapi_handle *handle, const TelSmsAddressIn dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pSCA ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); + if ((index < 0) || (index > TAPI_NETTEXT_MAX_INDEX)) { err("Invalid Index Input"); return TAPI_API_INVALID_INPUT; @@ -785,7 +828,6 @@ EXPORT_API int tel_get_sms_cb_config(struct tapi_handle *handle, tapi_response_c dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -821,28 +863,27 @@ EXPORT_API int tel_set_sms_cb_config(struct tapi_handle *handle, const TelSmsCbC dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pCBConfig ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); - if ((pCBConfig->SelectedId >= 3) || (pCBConfig->MsgIdCount < 0)) { - err("Invalid Input -SelectedId(%d)",pCBConfig->SelectedId); - err("Invalid Input -MsgIdCount(%d)",pCBConfig->MsgIdCount); + + if ((pCBConfig->Net3gppType > 2) || (pCBConfig->MsgIdRangeCount < 0)) { + err("Invalid Input -3gppType(%d)",pCBConfig->Net3gppType); + err("Invalid Input -MsgIdRangeCount(%d)",pCBConfig->MsgIdRangeCount); return TAPI_API_INVALID_INPUT; } MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); - encoded_cbConfig = g_base64_encode((const guchar *)&(pCBConfig->MsgIDs[0]), TAPI_NETTEXT_GSM_SMS_CBMI_LIST_SIZE_MAX); + encoded_cbConfig = g_base64_encode((const guchar *)&(pCBConfig->MsgIDs[0]), TAPI_NETTEXT_GSM_SMS_CBMI_LIST_SIZE_MAX*5); if (encoded_cbConfig == NULL) { dbg("g_base64_encode: Failed to Enocde the CB Config"); return TAPI_API_OPERATION_FAILED; } - param = g_variant_new("(iiiis)", pCBConfig->bCBEnabled, - pCBConfig->SelectedId, + param = g_variant_new("(iiiis)", pCBConfig->Net3gppType, + pCBConfig->CBEnabled, pCBConfig->MsgIdMaxCount, - pCBConfig->MsgIdCount, + pCBConfig->MsgIdRangeCount, encoded_cbConfig); g_dbus_connection_call(handle->dbus_connection, @@ -877,8 +918,6 @@ EXPORT_API int tel_set_sms_memory_status(struct tapi_handle *handle, int memoryS dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); if ((memoryStatus < TAPI_NETTEXT_PDA_MEMORY_STATUS_AVAILABLE) || (memoryStatus > TAPI_NETTEXT_PDA_MEMORY_STATUS_FULL)) { err("Invalid Input -MemoryStatus Nettext"); return TAPI_API_INVALID_INPUT; @@ -917,7 +956,6 @@ EXPORT_API int tel_get_sms_preferred_bearer(struct tapi_handle *handle, tapi_res dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -952,8 +990,6 @@ EXPORT_API int tel_set_sms_preferred_bearer(struct tapi_handle *handle, TelSmsBe dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); if ((TAPI_NETTEXT_BEARER_PS_ONLY > BearerType) || (TAPI_NETTEXT_NO_PREFERRED_BEARER < BearerType)) { err("Invalid Input -PrefBearer Set Nettext"); return TAPI_API_INVALID_INPUT; @@ -999,9 +1035,7 @@ EXPORT_API int tel_send_sms_deliver_report(struct tapi_handle *handle, dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pDataPackage ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -1056,8 +1090,6 @@ EXPORT_API int tel_set_sms_message_status(struct tapi_handle *handle, int index, dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); if ((index < 0) || (index > TAPI_NETTEXT_MAX_INDEX) || (msgStatus > TAPI_NETTEXT_STATUS_RESERVED)) { err("Invalid Input -MsgStatus Set Nettext"); @@ -1098,8 +1130,8 @@ EXPORT_API int tel_get_sms_parameters(struct tapi_handle *handle, int index, tap dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); + if ((index < 0) || (index > TAPI_NETTEXT_MAX_INDEX)) { err("Invalid Input -SMS Param Get Nettext"); return TAPI_API_INVALID_INPUT; @@ -1142,9 +1174,7 @@ EXPORT_API int tel_set_sms_parameters(struct tapi_handle *handle, const TelSmsPa dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pSmsSetParameters ,TAPI_API_INVALID_PTR); - TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -1216,7 +1246,6 @@ EXPORT_API int tel_get_sms_parameter_count(struct tapi_handle *handle, tapi_resp dbg("Func Entrance "); - TAPI_RET_ERR_NUM_IF_FAIL(handle ,TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback ,TAPI_API_INVALID_PTR); MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);