T108: 解决Bug84723
Change-Id: I8d02db28c95c6b40810652fad6a142cd309a5262
diff --git a/mbtk/liblynq_lib/src/lynq_data_call.c b/mbtk/liblynq_lib/src/lynq_data_call.c
index 48a94d0..6213176 100644
--- a/mbtk/liblynq_lib/src/lynq_data_call.c
+++ b/mbtk/liblynq_lib/src/lynq_data_call.c
@@ -76,16 +76,16 @@
if(ipv4.valid)
{
if(inet_ntop(AF_INET, &(ipv4.PrimaryDNS), dns, 32) == NULL) {
- LOGD("PrimaryDNS error.");
+ LOGE("[qser_data] PrimaryDNS error.");
} else {
- LOGD("PrimaryDNS : %s", dns);
+ LOGE("[qser_data] PrimaryDNS : %s", dns);
}
offset += sprintf(buf + offset, "nameserver %s\n", dns);
memset(dns, 0x0, 128);
if(inet_ntop(AF_INET, &(ipv4.SecondaryDNS), dns, 32) == NULL) {
- LOGD("SecondaryDNS error.");
+ LOGE("[qser_data] SecondaryDNS error.");
} else {
- LOGD("SecondaryDNS : %s", dns);
+ LOGE("[qser_data] SecondaryDNS : %s", dns);
}
offset += sprintf(buf + offset, "nameserver %s\n", dns);
}
@@ -94,17 +94,17 @@
memset(dns, 0x0, 128);
if(ipv6_2_str(&(ipv6.PrimaryDNS), dns))
{
- LOGD("PrimaryDNS error.");
+ LOGE("[qser_data] PrimaryDNS error.");
} else {
- LOGD("PrimaryDNS : %s", dns);
+ LOGE("[qser_data] PrimaryDNS : %s", dns);
}
offset += sprintf(buf + offset, "nameserver %s\n", dns);
memset(dns, 0x0, 128);
if(ipv6_2_str(&(ipv6.SecondaryDNS), dns))
{
- LOGD("SecondaryDNS error.");
+ LOGE("[qser_data] SecondaryDNS error.");
} else {
- LOGD("SecondaryDNS : %s", dns);
+ LOGE("[qser_data] SecondaryDNS : %s", dns);
}
offset += sprintf(buf + offset, "nameserver %s\n", dns);
}
@@ -114,14 +114,14 @@
fd = open("/tmp/resolv.conf", O_WRONLY | O_TRUNC);
if(fd < 0)
{
- LOGD("mbtk_route_config : open fail.");
+ LOGE("[qser_data] mbtk_route_config : open fail.");
return QSER_RESULT_FAIL;
}
ret = write(fd, buf, offset);
if(ret < 0)
{
- LOGD("mbtk_route_config : write fail.");
+ LOGE("[qser_data] mbtk_route_config : write fail.");
}
close(fd);
@@ -150,13 +150,13 @@
{
if(profile_idx < QSER_PROFILE_IDX_MIN || profile_idx > QSER_PROFILE_IDX_MAX)
{
- LOGE("IDX range error.");
+ LOGE("[qser_data] IDX range error.");
return QSER_RESULT_FAIL;
}
if(qser_apn_info_state[profile_idx] != TRUE)
{
- LOGE("profile_idx is not exist.");
+ LOGE("[qser_data] profile_idx is not exist.");
return QSER_RESULT_FAIL;
}
@@ -167,7 +167,7 @@
{
if(new_apn == NULL || old_apn == NULL)
{
- LOGE("qser_apn_info_param_convert apn param is NULL.");
+ LOGE("[qser_data] qser_apn_info_param_convert apn param is NULL.");
return QSER_RESULT_FAIL;
}
@@ -192,7 +192,7 @@
//get apn name
if(strlen(old_apn->apn)+1 > QSER_APN_NAME_SIZE)
{
- LOGE("apn_nmea length verylong.");
+ LOGE("[qser_data] apn_nmea length verylong.");
return QSER_RESULT_FAIL;
}
else
@@ -210,7 +210,7 @@
//get apn user
if(strlen(old_apn->user)+1 > QSER_APN_USERNAME_SIZE)
{
- LOGE("apn_user length verylong.");
+ LOGE("[qser_data] apn_user length verylong.");
return QSER_RESULT_FAIL;
}
else
@@ -228,7 +228,7 @@
//get apn password
if(strlen(old_apn->pass)+1 > QSER_APN_PASSWORD_SIZE)
{
- LOGE("apn_password length verylong.");
+ LOGE("[qser_data] apn_password length verylong.");
return QSER_RESULT_FAIL;
}
else
@@ -267,7 +267,7 @@
}
else
{
- LOGE("auth input error!");
+ LOGE("[qser_data] auth input error!");
return QSER_RESULT_FAIL;
}
}
@@ -288,23 +288,23 @@
{
if(apn == NULL)
{
- LOGE("qser_check_apn_type apn is NULL!");
+ LOGE("[qser_data] qser_check_apn_type apn is NULL!");
return QSER_RESULT_FAIL;
}
//check default idx = 0
int apn_name_length = strlen(apn->apn_name);
- //LOGE("qser_apn_info[0].apn_name: %s!", qser_apn_info[0].apn_name);
+ //LOGE("[qser_data] qser_apn_info[0].apn_name: %s!", qser_apn_info[0].apn_name);
char *p = strstr(qser_apn_info[0].apn_name, "mnc");
if(p == NULL)
{
- LOGE("qser_check_apn_type not find!");
+ LOGE("[qser_data] qser_check_apn_type not find!");
//return QSER_RESULT_FAIL;
}
else
{
int default_apn_name_length = p - (qser_apn_info[0].apn_name) -1;
- LOGE("qser_check_apn_type default_apn_name_length = [%d]!", default_apn_name_length);
+ LOGE("[qser_data] qser_check_apn_type default_apn_name_length = [%d]!", default_apn_name_length);
if(default_apn_name_length == apn_name_length)
{
int i = 0;
@@ -319,7 +319,7 @@
}
else
{
- //LOGE("not char!");
+ //LOGE("[qser_data] not char!");
if(qser_apn_info[0].apn_name[i] != apn->apn_name[i])
{
break;
@@ -331,7 +331,7 @@
if(i == default_apn_name_length)
{
- LOGE("apn_name is same!idx = [0]");
+ LOGE("[qser_data] apn_name is same!idx = [0]");
return QSER_RESULT_FAIL;
}
}
@@ -348,20 +348,20 @@
{
if(strcmp(qser_apn_info[pdp_type_tmp].apn_type, apn->apn_type) == 0)
{
- LOGE("apn_type is same!idx = [%d]", pdp_type_tmp);
+ LOGE("[qser_data] apn_type is same!idx = [%d]", pdp_type_tmp);
return QSER_RESULT_FAIL;
}
if (strcmp(qser_apn_info[pdp_type_tmp].apn_name, apn->apn_name) == 0)
{
if(qser_apn_info[pdp_type_tmp].pdp_type == QSER_APN_PDP_TYPE_IPV4V6 || apn->pdp_type == QSER_APN_PDP_TYPE_IPV4V6)
{
- LOGE("apn_name is same and pdp_type is IPV4V6!idx = [%d]", pdp_type_tmp);
+ LOGE("[qser_data] apn_name is same and pdp_type is IPV4V6!idx = [%d]", pdp_type_tmp);
return QSER_RESULT_FAIL;
}
if(qser_apn_info[pdp_type_tmp].pdp_type == apn->pdp_type)
{
- LOGE("pdp_type is same and pdp_type is same!idx = [%d]", pdp_type_tmp);
+ LOGE("[qser_data] pdp_type is same and pdp_type is same!idx = [%d]", pdp_type_tmp);
return QSER_RESULT_FAIL;
}
}
@@ -423,21 +423,21 @@
}
else
{
- LOGE("cb fail,idx is %d.", idx);
+ LOGE("[qser_data] cb fail,idx is %d.", idx);
}
}
else if(*net_data > 200)
{
- LOGE("cid[%d] is open.", *net_data - 201);
+ LOGE("[qser_data] cid[%d] is open.", *net_data - 201);
}
else if(*net_data == 1)
{
- LOGE("pdp is open.");
+ LOGE("[qser_data] pdp is open.");
}
else
{
- LOGE("unkonwn param [%d].", *net_data);
+ LOGE("[qser_data] unkonwn param [%d].", *net_data);
}
}
@@ -452,7 +452,7 @@
}
else
{
- LOGE("arg is NULL.");
+ LOGE("[qser_data] arg is NULL.");
}
qser_data_call_state_s state = {0};
@@ -463,7 +463,7 @@
int ret = qser_data_call_start(&qser_data_backup, &err);
if(ret != QSER_RESULT_SUCCESS)
{
- LOGE("qser_data_call_start() fail.");
+ LOGE("[qser_data] qser_data_call_start() fail.");
state.err = err;
if(qser_net_status_cb != NULL)
{
@@ -475,7 +475,7 @@
ret = qser_data_call_info_get(qser_data_backup.profile_idx, qser_data_backup.ip_family, &info, &err);
if(ret != QSER_RESULT_SUCCESS)
{
- LOGE("qser_data_call_info_get() fail.");
+ LOGE("[qser_data] qser_data_call_info_get() fail.");
state.err = err;
if(qser_net_status_cb != NULL)
{
@@ -501,7 +501,6 @@
int qser_data_call_init(qser_data_call_evt_cb_t evt_cb)
{
//UNUSED(evt_cb);
- mbtk_log_init("radio", "QSER_DATA_CALL");
if(!inited && qser_info_handle == NULL)
{
qser_info_handle = mbtk_info_handle_get();
@@ -513,7 +512,7 @@
}
else
{
- LOGE("mbtk_info_handle_get() fail.");
+ LOGE("[qser_data] mbtk_info_handle_get() fail.");
return QSER_RESULT_FAIL;
}
}
@@ -529,7 +528,7 @@
qser_net_status_cb = evt_cb;
property_get("persist.qser.datacall.apn", qser_apn_add_save_state, "00000000");
- LOGE("qser_apn_add_save_state = %s", qser_apn_add_save_state);
+ LOGE("[qser_data] qser_apn_add_save_state = %s", qser_apn_add_save_state);
property_get("persist.qser.apn.auth", qser_apn_auth_state, "00000000");
mbtk_apn_info_t apns[10] = {0};
int apn_num = 10;
@@ -537,7 +536,7 @@
int ret = mbtk_apn_get(qser_info_handle, &apn_num, apns);
if(ret != 0)
{
- LOGE("mbtk_apn_get fail. [ret = %d]",ret);
+ LOGE("[qser_data] mbtk_apn_get fail. [ret = %d]",ret);
return QSER_RESULT_FAIL;
}
else
@@ -549,7 +548,7 @@
{
if(qser_apn_add_save_state[apns[i].cid - 1] == '0')
{
- //LOGE("idx no open.");
+ //LOGE("[qser_data] idx no open.");
#if defined(MBTK_ALL_CID_SUPPORT) && !defined(MBTK_SG_SUPPORT)
if(apns[i].cid - 1 == 0)
{
@@ -568,7 +567,7 @@
if(qser_apn_info_param_convert(apns[i].cid - 1, &qser_apn_info[apns[i].cid - 1], &apns[i]) != 0)
{
- LOGE("qser_apn_info_param_convert fail");
+ LOGE("[qser_data] qser_apn_info_param_convert fail");
return QSER_RESULT_FAIL;
}
else
@@ -586,7 +585,7 @@
{
qser_idx_pdp_state[idx] = false;
}
- LOGE("mbtk_info_handle_get() success.");
+ LOGE("[qser_data] mbtk_info_handle_get() success.");
return QSER_RESULT_SUCCESS;
}
@@ -594,13 +593,13 @@
{
if(qser_info_handle)
{
- LOGE("qser_info_handle_num = %d", qser_info_handle_num);
+ LOGE("[qser_data] qser_info_handle_num = %d", qser_info_handle_num);
if(qser_info_handle_num == 1)
{ // 最后一个引用，可释放。
int ret = mbtk_info_handle_free(&qser_info_handle);
if(ret)
{
- LOGE("mbtk_info_handle_free() fail.");
+ LOGE("[qser_data] mbtk_info_handle_free() fail.");
}
else
{
@@ -618,7 +617,7 @@
}
else
{
- LOGE("handle not inited.");
+ LOGE("[qser_data] handle not inited.");
}
}
@@ -628,7 +627,7 @@
//UNUSED(err);
if(data_call == NULL || err == NULL)
{
- LOGE("data_call or err is NULL.");
+ LOGE("[qser_data] data_call or err is NULL.");
if(err != NULL)
{
*err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
@@ -638,7 +637,7 @@
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_data] handle is NULL.");
*err = QSER_DATA_CALL_ERROR_NO_INIT;
return QSER_RESULT_FAIL;
}
@@ -646,7 +645,7 @@
#if defined(MBTK_ALL_CID_SUPPORT)
if( ( (data_call->profile_idx == qser_apn_default_idx) || (data_call->profile_idx == 0) ) && (qser_default_pdp_idx >= 0) )
{
- LOGE("default pdp exist.");
+ LOGE("[qser_data] default pdp exist.");
*err = QSER_DATA_CALL_ERROR_UNKNOWN;
return QSER_RESULT_FAIL;
}
@@ -657,12 +656,12 @@
#if defined(MBTK_ALL_CID_SUPPORT) && !defined(MBTK_SG_SUPPORT)
if( data_call->profile_idx == 0 )
{
- LOGE("profile_idx = 0.");
+ LOGE("[qser_data] profile_idx = 0.");
}
else
#endif
{
- LOGE("profile_idx is invalid.");
+ LOGE("[qser_data] profile_idx is invalid.");
*err = QSER_DATA_CALL_ERROR_IDX_NO_EXIST;
return QSER_RESULT_FAIL;
}
@@ -672,7 +671,7 @@
ret = mbtk_data_call_start(qser_info_handle, data_call->profile_idx + 1, 0, FALSE, 0);
if(ret != 0)
{
- LOGE("mbtk_data_call_start fail.[ret = %d]", ret);
+ LOGE("[qser_data] mbtk_data_call_start fail.[ret = %d]", ret);
if(ret == MBTK_INFO_ERR_CID_EXIST)
{
*err = QSER_DATA_CALL_ERROR_PDP_ACTIVATE;
@@ -716,7 +715,7 @@
UNUSED(err);
if(data_call == NULL || err == NULL)
{
- LOGE("data_call or err is NULL.");
+ LOGE("[qser_data] data_call or err is NULL.");
if(err != NULL)
{
*err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
@@ -726,7 +725,7 @@
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_data] handle is NULL.");
*err = QSER_DATA_CALL_ERROR_NO_INIT;
return QSER_RESULT_FAIL;
}
@@ -734,7 +733,7 @@
#if defined(MBTK_ALL_CID_SUPPORT)
if( ( (data_call->profile_idx == qser_apn_default_idx) || (data_call->profile_idx == 0) ) && (qser_default_pdp_idx >= 0) )
{
- LOGE("default pdp exist.");
+ LOGE("[qser_data] default pdp exist.");
*err = QSER_DATA_CALL_ERROR_UNKNOWN;
return QSER_RESULT_FAIL;
}
@@ -745,12 +744,12 @@
#if defined(MBTK_ALL_CID_SUPPORT) && !defined(MBTK_SG_SUPPORT)
if((data_call->profile_idx == 0) && (qser_default_pdp_idx < 0))
{
- LOGE("profile_idx = 0 and not open default idx.");
+ LOGE("[qser_data] profile_idx = 0 and not open default idx.");
}
else
#endif
{
- LOGE("profile_idx is invalid.");
+ LOGE("[qser_data] profile_idx is invalid.");
*err = QSER_DATA_CALL_ERROR_IDX_NO_EXIST;
return QSER_RESULT_FAIL;
}
@@ -762,7 +761,7 @@
pthread_attr_init(&thread_attr);
if(pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_DETACHED))
{
- LOGE("pthread_attr_setdetachstate() fail.");
+ LOGE("[qser_data] pthread_attr_setdetachstate() fail.");
*err = QSER_DATA_CALL_ERROR_UNKNOWN;
return QSER_RESULT_FAIL;
}
@@ -770,7 +769,7 @@
//memcpy(&qser_data_backup, data_call, sizeof(qser_data_call_s));
if(pthread_create(&data_call_thread_id, &thread_attr, data_call_async_thread, (void *) data_call))
{
- LOGE("pthread_create() fail.");
+ LOGE("[qser_data] pthread_create() fail.");
*err = QSER_DATA_CALL_ERROR_UNKNOWN;
return QSER_RESULT_FAIL;
}
@@ -786,13 +785,13 @@
//UNUSED(err);
if(err == NULL)
{
- LOGE("err is NULL.");
+ LOGE("[qser_data] err is NULL.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_data] handle is NULL.");
*err = QSER_DATA_CALL_ERROR_NO_INIT;
return QSER_RESULT_FAIL;
}
@@ -802,12 +801,12 @@
#if defined(MBTK_ALL_CID_SUPPORT) && !defined(MBTK_SG_SUPPORT)
if(profile_idx == 0)
{
- LOGE("profile_idx = 0.");
+ LOGE("[qser_data] profile_idx = 0.");
}
else
#endif
{
- LOGE("profile_idx is invalid.");
+ LOGE("[qser_data] profile_idx is invalid.");
*err = QSER_DATA_CALL_ERROR_IDX_NO_EXIST;
return QSER_RESULT_FAIL;
}
@@ -817,7 +816,7 @@
ret = mbtk_data_call_stop(qser_info_handle, profile_idx + 1, 15);
if(ret != 0)
{
- LOGE("mbtk_data_call_stop fail.[ret = %d]", ret);
+ LOGE("[qser_data] mbtk_data_call_stop fail.[ret = %d]", ret);
if(ret == MBTK_INFO_ERR_CID_NO_EXIST)
{
*err = QSER_DATA_CALL_ERROR_PDP_NO_ACTIVATE;
@@ -854,7 +853,7 @@
if(info == NULL || err == NULL)
{
- LOGE("info or err is NULL.");
+ LOGE("[qser_data] info or err is NULL.");
if(err != NULL)
{
*err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
@@ -864,7 +863,7 @@
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_data] handle is NULL.");
*err = QSER_DATA_CALL_ERROR_NO_INIT;
return QSER_RESULT_FAIL;
}
@@ -874,12 +873,12 @@
#if defined(MBTK_ALL_CID_SUPPORT) && !defined(MBTK_SG_SUPPORT)
if(profile_idx == 0)
{
- LOGE("profile_idx = 0.");
+ LOGE("[qser_data] profile_idx = 0.");
}
else
#endif
{
- LOGE("profile_idx is invalid.");
+ LOGE("[qser_data] profile_idx is invalid.");
*err = QSER_DATA_CALL_ERROR_IDX_NO_EXIST;
return QSER_RESULT_FAIL;
}
@@ -896,7 +895,7 @@
ret = mbtk_data_call_state_get(qser_info_handle, profile_idx + 1, &ipv4, &ipv6);
if(ret != 0)
{
- LOGE("mbtk_data_call_state_get fail.[ret = %d]", ret);
+ LOGE("[qser_data] mbtk_data_call_state_get fail.[ret = %d]", ret);
if(ret == MBTK_INFO_ERR_CID_NO_EXIST)
{
*err = QSER_DATA_CALL_ERROR_PDP_NO_ACTIVATE;
@@ -920,21 +919,21 @@
info->v4.addr.sec_dns.s_addr = ipv4.SecondaryDNS;
#ifdef QSER_TEST
- //LOGE("IP: %x pri_DNS: %x sec_DNS: %x.", ipv4.IPAddr, ipv4.PrimaryDNS, ipv4.SecondaryDNS);
+ //LOGE("[qser_data] IP: %x pri_DNS: %x sec_DNS: %x.", ipv4.IPAddr, ipv4.PrimaryDNS, ipv4.SecondaryDNS);
if(inet_ntop(AF_INET, &(info->v4.addr.ip), v4_buff, 32) == NULL) {
- LOGE("IP error.");
+ LOGE("[qser_data] IP error.");
} else {
- LOGE("IP : %s", v4_buff);
+ LOGE("[qser_data] IP : %s", v4_buff);
}
if(inet_ntop(AF_INET, &(info->v4.addr.pri_dns), v4_buff, 32) == NULL) {
- LOGE("PrimaryDNS error.");
+ LOGE("[qser_data] PrimaryDNS error.");
} else {
- LOGE("PrimaryDNS : %s", v4_buff);
+ LOGE("[qser_data] PrimaryDNS : %s", v4_buff);
}
if(inet_ntop(AF_INET, &(info->v4.addr.sec_dns), v4_buff, 32) == NULL) {
- LOGE("SecondaryDNS error.");
+ LOGE("[qser_data] SecondaryDNS error.");
} else {
- LOGE("SecondaryDNS : %s", v4_buff);
+ LOGE("[qser_data] SecondaryDNS : %s", v4_buff);
}
#endif
}
@@ -950,21 +949,21 @@
#ifdef QSER_TEST
if(ipv6_2_str(&(info->v6.addr.ip), v6_buff))
{
- LOGE("IP error.");
+ LOGE("[qser_data] IP error.");
} else {
- LOGE("IP : %s", v6_buff);
+ LOGE("[qser_data] IP : %s", v6_buff);
}
if(ipv6_2_str(&(info->v6.addr.pri_dns), v6_buff))
{
- LOGE("PrimaryDNS error.");
+ LOGE("[qser_data] PrimaryDNS error.");
} else {
- LOGE("PrimaryDNS : %s", v6_buff);
+ LOGE("[qser_data] PrimaryDNS : %s", v6_buff);
}
if(ipv6_2_str(&(info->v6.addr.sec_dns), v6_buff))
{
- LOGE("SecondaryDNS error.");
+ LOGE("[qser_data] SecondaryDNS error.");
} else {
- LOGE("SecondaryDNS : %s", v6_buff);
+ LOGE("[qser_data] SecondaryDNS : %s", v6_buff);
}
#endif
}
@@ -990,25 +989,25 @@
//UNUSED(apn);
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_data] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(apn == NULL)
{
- LOGE("apn param is NULL.");
+ LOGE("[qser_data] apn param is NULL.");
return QSER_RESULT_FAIL;
}
if(qser_check_profile_idx(apn->profile_idx) < 0)
{
- LOGE("profile_idx is invalid.");
+ LOGE("[qser_data] profile_idx is invalid.");
return QSER_RESULT_FAIL;
}
if(strlen(apn->apn_name) == 0)
{
- LOGE("apn_name is NULL.");
+ LOGE("[qser_data] apn_name is NULL.");
return QSER_RESULT_FAIL;
}
@@ -1017,7 +1016,7 @@
{
if(qser_apn_default_idx > -1)
{
- LOGE("iot_default is exist.");
+ LOGE("[qser_data] iot_default is exist.");
return QSER_RESULT_FAIL;
}
}
@@ -1026,7 +1025,7 @@
/*add name and type verify*/
if (qser_check_apn_name_type(apn) < 0)
{
- LOGE("check param error.");
+ LOGE("[qser_data] check param error.");
return QSER_RESULT_FAIL;
}
@@ -1053,7 +1052,7 @@
}
else
{
- LOGE("pdp_type error.");
+ LOGE("[qser_data] pdp_type error.");
return QSER_RESULT_FAIL;
}
@@ -1077,23 +1076,23 @@
#endif
else
{
- LOGE("auth input error!");
+ LOGE("[qser_data] auth input error!");
return QSER_RESULT_FAIL;
}
if(strlen(apn->username) > 0 && strlen(apn->password) > 0)
{
- LOGE("setapn: %d, %d, %s, %s, %s, %s, %s.",apn->profile_idx, pdp_type, apn->apn_name, apn->username, apn->password, mbtk_auth, apn->apn_type);
+ LOGE("[qser_data] setapn: %d, %d, %s, %s, %s, %s, %s.",apn->profile_idx, pdp_type, apn->apn_name, apn->username, apn->password, mbtk_auth, apn->apn_type);
}
else
{
- LOGE("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);
+ LOGE("[qser_data] 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)
{
- LOGE("mbtk_apn_set fail!");
+ LOGE("[qser_data] mbtk_apn_set fail!");
return QSER_RESULT_FAIL;
}
@@ -1132,13 +1131,13 @@
//UNUSED(apn);
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_data] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(apn == NULL)
{
- LOGE("apn param is NULL.");
+ LOGE("[qser_data] apn param is NULL.");
return QSER_RESULT_FAIL;
}
@@ -1148,7 +1147,7 @@
if(profile_idx != 0)
#endif
{
- LOGE("profile_idx is invalid.");
+ LOGE("[qser_data] profile_idx is invalid.");
return QSER_RESULT_FAIL;
}
}
@@ -1159,7 +1158,7 @@
int ret = mbtk_apn_get(qser_info_handle, &apn_num, apns);
if(ret != 0)
{
- LOGE("mbtk_apn_get fail. [ret = %d]",ret);
+ LOGE("[qser_data] mbtk_apn_get fail. [ret = %d]",ret);
return QSER_RESULT_FAIL;
}
else
@@ -1169,20 +1168,20 @@
{
if(apns[i].cid == profile_idx + 1)
{
- LOGE("find IDX.");
+ LOGE("[qser_data] find IDX.");
break;
}
}
if(i == apn_num)
{
- LOGE("not find IDX.[apn_num = %d]", apn_num);
+ LOGE("[qser_data] not find IDX.[apn_num = %d]", apn_num);
return QSER_RESULT_FAIL;
}
if(qser_apn_info_param_convert(profile_idx, apn, &apns[i]) != 0)
{
- LOGE("qser_apn_info_param_convert fail");
+ LOGE("[qser_data] qser_apn_info_param_convert fail");
return QSER_RESULT_FAIL;
}
}
@@ -1195,13 +1194,13 @@
//UNUSED(profile_idx);
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_data] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(apn == NULL)
{
- LOGE("apn param is NULL.");
+ LOGE("[qser_data] apn param is NULL.");
return QSER_RESULT_FAIL;
}
@@ -1210,14 +1209,14 @@
{
if(qser_apn_default_idx > -1)
{
- LOGE("iot_default is exist.");
+ LOGE("[qser_data] iot_default is exist.");
return QSER_RESULT_FAIL;
}
}
/*add name and type verify*/
if (qser_check_apn_name_type(apn) < 0)
{
- LOGE("check param error.");
+ LOGE("[qser_data] check param error.");
return QSER_RESULT_FAIL;
}
#endif
@@ -1226,7 +1225,7 @@
char idx = qser_get_apn_profile_idx();
if(idx > QSER_PROFILE_IDX_MAX)
{
- LOGE("idx is full.");
+ LOGE("[qser_data] idx is full.");
return QSER_RESULT_FAIL;
}
else
@@ -1243,7 +1242,7 @@
ret = qser_apn_set(&set_apn);
if(ret != 0)
{
- LOGE("qser_apn_set fail.");
+ LOGE("[qser_data] qser_apn_set fail.");
qser_apn_info_state[idx] = FALSE;
return QSER_RESULT_FAIL;
}
@@ -1259,19 +1258,19 @@
//UNUSED(profile_idx);
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_data] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(qser_idx_pdp_state[profile_idx] == true)
{
- LOGE("profile_idx[%d] open pdp.", profile_idx);
+ LOGE("[qser_data] profile_idx[%d] open pdp.", profile_idx);
return QSER_RESULT_FAIL;
}
if(qser_check_profile_idx(profile_idx) < 0)
{
- LOGE("profile_idx is invalid.");
+ LOGE("[qser_data] profile_idx is invalid.");
return QSER_RESULT_FAIL;
}
@@ -1279,7 +1278,7 @@
if(ret < 0)
{
- LOGE("mbtk_apn_del fail!");
+ LOGE("[qser_data] mbtk_apn_del fail!");
return QSER_RESULT_FAIL;
}
@@ -1303,24 +1302,24 @@
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_data] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(apn_list == NULL)
{
- LOGE("apn_list param is NULL.");
+ LOGE("[qser_data] apn_list param is NULL.");
return QSER_RESULT_FAIL;
}
property_get("persist.qser.datacall.apn", qser_apn_add_save_state, "00000000");
- LOGE("qser_apn_add_save_state = %s", qser_apn_add_save_state);
+ LOGE("[qser_data] 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);
if(ret != 0)
{
- LOGE("mbtk_apn_get fail. [ret = %d]",ret);
+ LOGE("[qser_data] mbtk_apn_get fail. [ret = %d]",ret);
return QSER_RESULT_FAIL;
}
else
@@ -1337,13 +1336,13 @@
if((apns[i].cid - 1) != 0)
#endif
{
- LOGE("idx no open.");
+ LOGE("[qser_data] idx no open.");
continue;
}
}
if(qser_apn_info_param_convert(apns[i].cid - 1, &apn_list->apn[apn_list->cnt], &apns[i]) != 0)
{
- LOGE("qser_apn_info_param_convert fail");
+ LOGE("[qser_data] qser_apn_info_param_convert fail");
return QSER_RESULT_FAIL;
}
apn_list->cnt++;
@@ -1351,7 +1350,7 @@
}
else if(apn_num > QSER_APN_MAX_LIST)
{
- LOGE("apn_num overlong");
+ LOGE("[qser_data] apn_num overlong");
return QSER_RESULT_FAIL;
}
else