data_call: add T108 data_call api
Change-Id: I382cbcccc416233fca7a267db67b0d0238dc56eb
diff --git a/mbtk/lynq_lib/src/lynq_data_call.c b/mbtk/lynq_lib/src/lynq_data_call.c
index d65c3b6..88f2074 100755
--- a/mbtk/lynq_lib/src/lynq_data_call.c
+++ b/mbtk/lynq_lib/src/lynq_data_call.c
@@ -2,15 +2,20 @@
#include "mbtk_type.h"
#include "mbtk_info_api.h"
+#include <pthread.h>
+#include <cutils/properties.h>
+#include <string.h>
/****************************DEFINE***************************************/
#define QSER_RESULT_SUCCESS 0
#define QSER_RESULT_FAIL -1
+#define QSER_APN_NUM 8
//default range: 0 - 7
//AT+CGACT range: 1 - 8
//1 default IDX, 8 IMS IDX
#define QSER_PROFILE_IDX_MIN 1
#define QSER_PROFILE_IDX_MAX 6
+
/****************************DEFINE***************************************/
/****************************VARIABLE***************************************/
@@ -18,10 +23,45 @@
int qser_info_handle_num = 0;
static bool inited = FALSE;
static qser_data_call_evt_cb_t qser_net_status_cb = NULL;
-static qser_apn_info_s qser_apn_info[8] = {0};
+static qser_apn_info_s qser_apn_info[QSER_APN_NUM] = {0};
+static bool qser_apn_info_state[QSER_APN_NUM] = {0};
+static char qser_apn_add_save_state[QSER_APN_NUM + 1] = {0};
+static qser_data_call_s qser_data_backup;
+int now_idx = 0;
/****************************VARIABLE***************************************/
/******************************FUNC*****************************************/
+char qser_get_apn_profile_idx(void)
+{
+ char i = 0;
+ for(i = QSER_PROFILE_IDX_MIN; i < 8; i++)
+ {
+ if(qser_apn_info_state[i] == FALSE)
+ {
+ return i;
+ }
+ }
+
+ return i;
+}
+
+int qser_check_profile_idx(unsigned char profile_idx)
+{
+ if(profile_idx < QSER_PROFILE_IDX_MIN || profile_idx > QSER_PROFILE_IDX_MAX)
+ {
+ LOGE("[qser_data_call] IDX range error.");
+ return QSER_RESULT_FAIL;
+ }
+
+ if(qser_apn_info_state[profile_idx] != TRUE)
+ {
+ LOGE("[qser_data_call] profile_idx is not exist.");
+ return QSER_RESULT_FAIL;
+ }
+
+ return QSER_RESULT_SUCCESS;
+}
+
int qser_apn_info_param_convert(int profile_idx, qser_apn_info_s *new_apn, mbtk_apn_info_t *old_apn)
{
if(new_apn == NULL || old_apn == NULL)
@@ -147,9 +187,40 @@
if(qser_net_status_cb != NULL)
{
- //
+ qser_data_call_state_s state = {0};
+ state.profile_idx = now_idx;
+ state.ip_family = qser_apn_info[now_idx].pdp_type;
+ if((*net_data > 100 && *net_data < 200) || *net_data == 1)
+ {
+ state.state = QSER_DATA_CALL_CONNECTED;
+ state.err = QSER_DATA_CALL_ERROR_NONE;
+ }
+ else if(*net_data > 200)
+ {
+ state.state = QSER_DATA_CALL_DISCONNECTED;
+ state.err = QSER_DATA_CALL_ERROR_NONE;
+ }
+ else
+ {
+ return;
+ }
+
+ qser_net_status_cb(&state);
}
}
+
+static void* data_call_async_thread(void* arg)
+{
+ qser_data_call_error_e err;
+ int ret = qser_data_call_start(&qser_data_backup, &err);
+ if(ret != QSER_RESULT_SUCCESS)
+ {
+ LOGE("[qser_data_call] qser_data_call_start() fail.");
+ }
+
+ return NULL;
+}
+
/******************************FUNC*****************************************/
/****************************API***************************************/
@@ -182,6 +253,43 @@
}
qser_net_status_cb = evt_cb;
+ property_get("persist.qser.datacall.apn", qser_apn_add_save_state, "00000000");
+ LOGE("[qser_data_call] qser_apn_add_save_state = %s", qser_apn_add_save_state);
+ mbtk_apn_info_t apns[10] = {0};
+ int apn_num = 10;
+ char qser_apn_type[32] = {0};
+ int ret = mbtk_apn_get(qser_info_handle, &apn_num, apns);
+ if(ret != 0)
+ {
+ LOGE("[qser_data_call] mbtk_apn_get fail. [ret = %d]",ret);
+ return QSER_RESULT_FAIL;
+ }
+ else
+ {
+ if(apn_num > 0 && apn_num <= QSER_APN_MAX_LIST)
+ {
+ int i = 0;
+ for(i = 0; i < apn_num; i++)
+ {
+ if(qser_apn_add_save_state[apns[i].cid - 1] == '0')
+ {
+ LOGE("[qser_data_call] idx no open.");
+ continue;
+ }
+ if(qser_apn_info_param_convert(apns[i].cid - 1, &qser_apn_info[apns[i].cid - 1], &apns[i]) != 0)
+ {
+ LOGE("[qser_data_call] qser_apn_info_param_convert fail");
+ return QSER_RESULT_FAIL;
+ }
+ else
+ {
+ qser_apn_info_state[apns[i].cid - 1] = TRUE;
+ sprintf(qser_apn_type, "persist.qser.apn.type%d", apns[i].cid - 1);
+ property_get(qser_apn_type, qser_apn_info[apns[i].cid - 1].apn_type, NULL);
+ }
+ }
+ }
+ }
LOGE("[qser_data_call] mbtk_info_handle_get() success.");
return QSER_RESULT_SUCCESS;
}
@@ -237,9 +345,9 @@
return QSER_RESULT_FAIL;
}
- if(data_call->profile_idx < QSER_PROFILE_IDX_MIN || data_call->profile_idx > QSER_PROFILE_IDX_MAX)
+ if(qser_check_profile_idx(data_call->profile_idx) < 0)
{
- LOGE("[qser_data_call] IDX range error.");
+ LOGE("[qser_data_call] profile_idx is invalid.");
*err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
return QSER_RESULT_FAIL;
}
@@ -256,6 +364,59 @@
{
*err = QSER_DATA_CALL_ERROR_NONE;
}
+
+ now_idx = data_call->profile_idx;
+ return QSER_RESULT_SUCCESS;
+}
+
+int qser_data_call_start_async(qser_data_call_s *data_call, qser_data_call_error_e *err)
+{
+ //UNUSED(data_call);
+ UNUSED(err);
+ if(data_call == NULL || err == NULL)
+ {
+ LOGE("[qser_data_call] data_call or err is NULL.");
+ if(err != NULL)
+ {
+ *err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
+ }
+ return QSER_RESULT_FAIL;
+ }
+
+ if(qser_info_handle == NULL)
+ {
+ LOGE("[qser_data_call] handle is NULL.");
+ *err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
+ return QSER_RESULT_FAIL;
+ }
+
+ if(qser_check_profile_idx(data_call->profile_idx) < 0)
+ {
+ LOGE("[qser_data_call] profile_idx is invalid.");
+ *err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
+ return QSER_RESULT_FAIL;
+ }
+
+ pthread_attr_t thread_attr;
+ pthread_t data_call_thread_id;
+ pthread_attr_init(&thread_attr);
+ if(pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_DETACHED))
+ {
+ LOGE("[qser_data_call] pthread_attr_setdetachstate() fail.");
+ *err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
+ return QSER_RESULT_FAIL;
+ }
+
+ memcpy(&qser_data_backup, data_call, sizeof(qser_data_call_s));
+ if(pthread_create(&data_call_thread_id, &thread_attr, data_call_async_thread, NULL))
+ {
+ LOGE("[qser_data_call] pthread_create() fail.");
+ *err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
+ return QSER_RESULT_FAIL;
+ }
+ pthread_attr_destroy(&thread_attr);
+ now_idx = data_call->profile_idx;
+
return QSER_RESULT_SUCCESS;
}
@@ -277,9 +438,9 @@
return QSER_RESULT_FAIL;
}
- if(profile_idx < QSER_PROFILE_IDX_MIN || profile_idx > QSER_PROFILE_IDX_MAX)
+ if(qser_check_profile_idx(profile_idx) < 0)
{
- LOGE("[qser_data_call] IDX range error.");
+ LOGE("[qser_data_call] profile_idx is invalid.");
*err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
return QSER_RESULT_FAIL;
}
@@ -296,7 +457,8 @@
{
*err = QSER_DATA_CALL_ERROR_NONE;
}
-
+
+ now_idx = 0;
return QSER_RESULT_SUCCESS;
}
@@ -325,9 +487,9 @@
return QSER_RESULT_FAIL;
}
- if(profile_idx < QSER_PROFILE_IDX_MIN || profile_idx > QSER_PROFILE_IDX_MAX)
+ if(qser_check_profile_idx(profile_idx) < 0)
{
- LOGE("[qser_data_call] IDX range error.");
+ LOGE("[qser_data_call] profile_idx is invalid.");
*err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
return QSER_RESULT_FAIL;
}
@@ -438,9 +600,9 @@
return QSER_RESULT_FAIL;
}
- if(apn->profile_idx < QSER_PROFILE_IDX_MIN || apn->profile_idx > QSER_PROFILE_IDX_MAX)
+ if(qser_check_profile_idx(apn->profile_idx) < 0)
{
- LOGE("[qser_data_call] IDX range error.");
+ LOGE("[qser_data_call] profile_idx is invalid.");
return QSER_RESULT_FAIL;
}
@@ -450,8 +612,15 @@
return QSER_RESULT_FAIL;
}
+ if(memcmp(apn->apn_type, "iot_default", strlen("iot_default")) == 0)
+ {
+ LOGE("[qser_data_call] iot_default is exist.");
+ return QSER_RESULT_FAIL;
+ }
+
int ret = -1;
char mbtk_auth[32]={0};
+ char qser_apn_type[32] = {0};
mbtk_ip_type_enum pdp_type = MBTK_IP_TYPE_IPV4V6;
if(apn->pdp_type == QSER_APN_PDP_TYPE_IPV4)
@@ -508,7 +677,7 @@
{
LOGE("[qser_data_call] setapn: %d, %d, %s, NULL, NULL, %s, %s.",apn->profile_idx, pdp_type, apn->apn_name, apn->username, apn->password, mbtk_auth, apn->apn_type);
}
-
+
ret = mbtk_apn_set(qser_info_handle, apn->profile_idx + 1, pdp_type, apn->apn_name, apn->username, apn->password, mbtk_auth);
if(ret < 0)
{
@@ -516,6 +685,8 @@
return QSER_RESULT_FAIL;
}
+ sprintf(qser_apn_type, "persist.qser.apn.type%d", apn->profile_idx);
+ property_set(qser_apn_type, apn->apn_type);
memcpy(&qser_apn_info[apn->profile_idx], apn, sizeof(qser_apn_info_s));
return QSER_RESULT_SUCCESS;
}
@@ -536,9 +707,9 @@
return QSER_RESULT_FAIL;
}
- if(profile_idx < QSER_PROFILE_IDX_MIN || profile_idx > QSER_PROFILE_IDX_MAX)
+ if(qser_check_profile_idx(profile_idx) < 0)
{
- LOGE("[qser_data_call] IDX range error.");
+ LOGE("[qser_data_call] profile_idx is invalid.");
return QSER_RESULT_FAIL;
}
@@ -580,17 +751,71 @@
int qser_apn_add(qser_apn_add_s *apn, unsigned char *profile_idx)
{
- UNUSED(apn);
- UNUSED(profile_idx);
+ //UNUSED(apn);
+ //UNUSED(profile_idx);
+ if(qser_info_handle == NULL)
+ {
+ LOGE("[qser_data_call] handle is NULL.");
+ return QSER_RESULT_FAIL;
+ }
+
+ if(apn == NULL)
+ {
+ LOGE("[qser_data_call] apn param is NULL.");
+ return QSER_RESULT_FAIL;
+ }
- return 0;
+ int ret = 0;
+ char idx = qser_get_apn_profile_idx();
+ if(idx >= 8)
+ {
+ LOGE("[qser_data_call] idx is full.");
+ return QSER_RESULT_FAIL;
+ }
+ else
+ {
+ qser_apn_info_state[idx] = TRUE;
+ qser_apn_info_s set_apn;
+ set_apn.profile_idx = idx;
+ set_apn.pdp_type = apn->pdp_type;
+ set_apn.auth_proto = apn->auth_proto;
+ memcpy(set_apn.apn_name, apn->apn_name, QSER_APN_NAME_SIZE);
+ memcpy(set_apn.username, apn->username, QSER_APN_USERNAME_SIZE);
+ memcpy(set_apn.password, apn->password, QSER_APN_PASSWORD_SIZE);
+ memcpy(set_apn.apn_type, apn->apn_type, QSER_APN_NAME_SIZE);
+ ret = qser_apn_set(&set_apn);
+ if(ret != 0)
+ {
+ LOGE("[qser_data_call] qser_apn_set fail.");
+ qser_apn_info_state[idx] = FALSE;
+ return QSER_RESULT_FAIL;
+ }
+ *profile_idx = idx;
+ qser_apn_add_save_state[idx] = '1';
+ property_set("persist.qser.datacall.apn", qser_apn_add_save_state);
+ }
+ return QSER_RESULT_SUCCESS;
}
int qser_apn_del(unsigned char profile_idx)
{
- UNUSED(profile_idx);
+ //UNUSED(profile_idx);
+ if(qser_info_handle == NULL)
+ {
+ LOGE("[qser_data_call] handle is NULL.");
+ return QSER_RESULT_FAIL;
+ }
- return 0;
+ if(qser_check_profile_idx(profile_idx) < 0)
+ {
+ LOGE("[qser_data_call] profile_idx is invalid.");
+ return QSER_RESULT_FAIL;
+ }
+
+ qser_apn_info_state[profile_idx] = FALSE;
+ qser_apn_add_save_state[profile_idx] = '0';
+ property_set("persist.qser.datacall.apn", qser_apn_add_save_state);
+ return QSER_RESULT_SUCCESS;
}
int qser_apn_get_list(qser_apn_info_list_s *apn_list)
@@ -609,6 +834,8 @@
return QSER_RESULT_FAIL;
}
+ property_get("persist.qser.datacall.apn", qser_apn_add_save_state, "00000000");
+ LOGE("[qser_data_call] qser_apn_add_save_state = %s", qser_apn_add_save_state);
mbtk_apn_info_t apns[10] = {0};
int apn_num = 10;
int ret = mbtk_apn_get(qser_info_handle, &apn_num, apns);
@@ -622,15 +849,21 @@
if(apn_num > 0 && apn_num <= QSER_APN_MAX_LIST)
{
int i = 0;
+ apn_list->cnt = 0;
for(i = 0; i < apn_num; i++)
{
+ if(qser_apn_add_save_state[apns[i].cid - 1] == '0')
+ {
+ LOGE("[qser_data_call] idx no open.");
+ continue;
+ }
if(qser_apn_info_param_convert(apns[i].cid - 1, &apn_list->apn[i], &apns[i]) != 0)
{
LOGE("[qser_data_call] qser_apn_info_param_convert fail");
return QSER_RESULT_FAIL;
}
+ apn_list->cnt++;
}
- apn_list->cnt = apn_num;
}
else if(apn_num > QSER_APN_MAX_LIST)
{