I7f72a057460043c5476a9c3cfd0b4ff06aa1db8a Fix network search timeout value (Inho Oh)
I60b22ff42c2f4a536c2c964d5ea5563f00f8c764 Fixed testapp build error (Inho Oh)
Iff8d7ad94c08d4dc414e51a4bd43fc51b6c972a9 Remove the null check code of response callback in macro (DongHoo Park)
I6ee7147d4cdeffafedb95914c6b0adfc7856fba9 Fix memory leak (Inho Oh)
__BEGIN_DECLS
-#include "tapi_log.h"
-
#define MAKE_RESP_CB_DATA(data,handle,cb,user_data) \
- if (!handle || !cb) { return TAPI_API_INVALID_INPUT; } \
+ if (!handle) { return TAPI_API_INVALID_INPUT; } \
data = g_new0(struct tapi_resp_data, 1); \
data->handle = handle; \
data->cb_fn = cb; \
data->user_data = user_data
-#define g_variant_iter_free0( iter ) \
- if ( iter ) \
- g_variant_iter_free( iter );\
- else \
- dbg("iter : 0");
-
struct tapi_handle {
gpointer dbus_connection;
char *path;
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
}
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
cb( &data, user_data );
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
} else {
dbg("[ error ] fail to get call status");
//dbg("item index(%d) id(%d) str(%s)",index, item_id, item_str);
index++;
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
}
setup_menu.bIsSatMainMenuHelpInfo = (b_helpinfo ? 1 : 0);
setup_menu.bIsUpdatedSatMainMenu = (b_updated ? 1 : 0);
select_item.menuItem[index].itemId, select_item.menuItem[index].textLen, select_item.menuItem[index].text);
index++;
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
}
dbg("command id (%d)", select_item.commandId);
send_sms.smsTpdu.data[index] = data;
index++;
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
g_variant_unref(inner_gv);
tmp_data_len = index - 1;
}
g_index++;
}
//while end
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
g_variant_unref(inner_gv);
}
while (g_variant_iter_next(iter, "s", &modem_path)){
list = g_slist_append(list, modem_path);
}
- g_variant_iter_free0 (iter);
+ g_variant_iter_free (iter);
if (!list) {
dbg( "No CP name");
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_version(GObject *source_object, GAsyncResult *res, gpointer user_data)
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
static void on_response_get_serial_number(GObject *source_object, GAsyncResult *res, gpointer user_data)
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, sn, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
static void on_response_get_imei(GObject *source_object, GAsyncResult *res, gpointer user_data)
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, imei, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
static void on_response_set_dun_pin_ctrl(GObject *source_object, GAsyncResult *res, gpointer user_data)
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
/**
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, -1, NULL, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
return;
}
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
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_network_selection_mode(GObject *source_object, GAsyncResult *res, gpointer user_data)
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &mode, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
static void on_response_default_set(GObject *source_object, GAsyncResult *res, gpointer user_data)
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_network_preferred_plmn(GDBusConnection *conn, GAsyncResult *res, gpointer user_data)
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);
return;
}
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);
return;
}
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
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_network_band(GObject *source_object, GAsyncResult *res, gpointer user_data)
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &band, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
static void on_response_get_network_mode(GObject *source_object, GAsyncResult *res, gpointer user_data)
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &mode, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
static void on_response_get_network_service_domain(GObject *source_object, GAsyncResult *res, gpointer user_data)
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &domain, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
static void on_response_get_network_serving(GObject *source_object, GAsyncResult *res, gpointer user_data)
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
EXPORT_API int tel_search_network(TapiHandle *handle, tapi_response_cb callback, void *user_data)
g_dbus_connection_call(handle->dbus_connection,
DBUS_TELEPHONY_SERVICE , handle->path, DBUS_TELEPHONY_NETWORK_INTERFACE,
"Search", NULL, NULL,
- G_DBUS_CALL_FLAGS_NONE, 60000, NULL,
+ G_DBUS_CALL_FLAGS_NONE, 180000, NULL,
on_response_search_network, evt_cb_data);
return TAPI_API_SUCCESS;
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
i++;
}
r_atr.atr_len = (int) i;
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
g_variant_unref(inner_gv);
g_variant_unref(param_gv);
/* for(i=0; i < (int)r_atr.atr_len; i++)
i++;
}
r_apdu.apdu_len = (int) i;
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
g_variant_unref(inner_gv);
g_variant_unref(param_gv);
/* for(i=0; i < (int)r_apdu.apdu_len; i++)
//dbg("item index(%d) id(%d) str(%s)",index, item_id, item_str);
index++;
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
}
pMainMenu->bIsSatMainMenuHelpInfo = (b_helpinfo ? 1 : 0);
pMainMenu->bIsUpdatedSatMainMenu = (b_updated ? 1 : 0);
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
/*this can be changed regarding concept*/
if (i == 3)
break;
/*this can be changed regarding concept*/
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
dbg("msisdn count[%d]", list.count);
for(i =0; i < list.count; i++){
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
i++;
}
auth_resp.authentication_key_length = i;
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
i = 0;
cp = g_variant_get_variant(cp_gv);
i++;
}
auth_resp.cipher_length = i;
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
i = 0;
it = g_variant_get_variant(it_gv);
i++;
}
auth_resp.integrity_length = i;
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
i = 0;
resp = g_variant_get_variant(resp_gv);
i++;
}
auth_resp.resp_length = i;
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
i = 0;
}
else {
i++;
}
r_apdu.apdu_resp_len = (unsigned char) i;
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
g_variant_unref(inner_gv);
g_variant_unref(param_gv);
/* for(i=0; i < (int)r_apdu.apdu_resp_len; i++)
i++;
}
r_atr.atr_resp_len = (unsigned char) i;
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
g_variant_unref(inner_gv);
g_variant_unref(param_gv);
/* for(i=0; i < (int)r_atr.atr_resp_len; i++)
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
} else {
dbg( "g_dbus_conn failed. error (%s)", gerr->message);
g_error_free(gerr);
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include "tapi_common.h"
#include "TapiUtility.h"
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, -1, NULL, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
return;
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
static void on_response_change_ss_barring_password(GObject *source_object, GAsyncResult *res, gpointer user_data)
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_ss_forward_status(GObject *source_object, GAsyncResult *res, gpointer user_data)
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
}
+ free(evt_cb_data);
}
static void on_response_get_ss_waiting_status(GObject *source_object, GAsyncResult *res, gpointer user_data)
}
}
i++;
- g_variant_iter_free0(iter_row);
+ g_variant_iter_free(iter_row);
}
- g_variant_iter_free0(iter);
+ g_variant_iter_free(iter);
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
static void on_response_send_ss_ussd_request(GObject *source_object, GAsyncResult *res, gpointer user_data)
g_variant_get (dbus_result, "(iiiis)", &result, &resp.Type, &resp.Status, &resp.Length, &tmp_str);
-
- if ( !result ) {
+ if (!result) {
memcpy( resp.szString, tmp_str, resp.Length );
g_free(tmp_str);
}
if (evt_cb_data->cb_fn) {
evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
}
+
+ free(evt_cb_data);
}
EXPORT_API int tel_set_ss_barring(TapiHandle *handle, TelSsBarringInfo_t *info, tapi_response_cb callback, void *user_data)
on_response_get_ss_barring_status, evt_cb_data );
return TAPI_API_SUCCESS;
-
}
EXPORT_API int tel_get_ss_barring_status(TapiHandle *handle, TelSsClass_t class, TelSsBarringType_t type, tapi_response_cb callback, void *user_data)
on_response_change_ss_barring_password, evt_cb_data );
return TAPI_API_SUCCESS;
-
}
/**********************************************************************************************
on_response_get_ss_forward_status, evt_cb_data );
return TAPI_API_SUCCESS;
-
}
/**********************************************************************************************
on_response_get_ss_forward_status, evt_cb_data );
return TAPI_API_SUCCESS;
-
}
/**********************************************************************************************
on_response_get_ss_cli_status, evt_cb_data );
return TAPI_API_SUCCESS;
-
}
/**********************************************************************************************
on_response_send_ss_ussd_request, evt_cb_data );
return TAPI_API_SUCCESS;
-
}
/**********************************************************************************************