[Bugfix][task-view-1173]Optimize log printing of data module
Only Configure：No
Affected branch：master
Affected module：Data
Is it affected on: only ZXIC
Self-test: Yes
Doc Update:No
Change-Id: I73eb7c2a85a11b7fe27bfb3cdc6f9d22439284c6
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp
index 2d0643a..1647369 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp
@@ -579,7 +579,7 @@
{
//xf.li@20230610 add for T106 data start
#ifdef MOBILETEK_TARGET_PLATFORM_T106
- LYINFLOG("[Typethree test info]apn=%s ;apntype=%s ;cid=%d ;ifname=%s ;hasTimeout = %d ; hasUsed = %d", \
+ LYDBGLOG("[Typethree test info]apn=%s ;apntype=%s ;cid=%d ;ifname=%s ;hasTimeout = %d ; hasUsed = %d", \
lynq_apn_table[ret].apn,lynq_apn_table[ret].apnType,lynq_apn_table[ret].cid,lynq_apn_table[ret].ifaceName, \
lynq_apn_table[ret].hasTimeout,lynq_apn_table[ret].hasUsed);
#else
@@ -623,7 +623,7 @@
int j = 0;
char *urc_msg = NULL;
- LYINFLOG("DATA in urc_msg_process_add_for_t106\n");
+ LYDBGLOG("DATA in urc_msg_process_add_for_t106\n");
int size = p->dataSize();
p->readInt32(&resp_type);
p->readInt32(&urcid);
@@ -784,7 +784,7 @@
//xf.li@20230607 add for T106 data end
void printf_apn_table_debug(const char *fun,int line)
{
- LYINFLOG("[%s][%d]apn_table msg",fun,line);
+ LYDBGLOG("[%s][%d]apn_table msg",fun,line);
printf_apn_table();
}
void urc_msg_process(Parcel *p)
@@ -2233,42 +2233,42 @@
p->readInt32(&dataCallList[i].cid);
p->readInt32(&dataCallList[i].active);
temp_char = strdupReadString_p(p);
- LYINFLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
+ LYDBGLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
if(temp_char)
{
memcpy(dataCallList[i].type,temp_char,strlen(temp_char)+1);
free(temp_char);
}
temp_char = strdupReadString_p(p);
- LYINFLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
+ LYDBGLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
if(temp_char)
{
memcpy(dataCallList[i].ifname,temp_char,strlen(temp_char)+1);
free(temp_char);
}
temp_char = strdupReadString_p(p);
- LYINFLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
+ LYDBGLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
if(temp_char)
{
memcpy(dataCallList[i].addresses,temp_char,strlen(temp_char)+1);
free(temp_char);
}
temp_char = strdupReadString_p(p);
- LYINFLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
+ LYDBGLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
if(temp_char)
{
memcpy(dataCallList[i].dnses,temp_char,strlen(temp_char)+1);
free(temp_char);
}
temp_char = strdupReadString_p(p);
- LYINFLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
+ LYDBGLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
if(temp_char)
{
memcpy(dataCallList[i].gateways,temp_char,strlen(temp_char)+1);
free(temp_char);
}
temp_char = strdupReadString_p(p);
- LYINFLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
+ LYDBGLOG("[%s][%d]%s",__FUNCTION__,__LINE__,temp_char);
if(temp_char)
{
memcpy(dataCallList[i].pcscf,temp_char,strlen(temp_char)+1);
@@ -2328,9 +2328,11 @@
memcpy(dataCallList->gateways,interDataCallList[i].gateways,sizeof(interDataCallList[i].gateways));
memcpy(dataCallList->pcscf,interDataCallList[i].pcscf,sizeof(interDataCallList[i].pcscf));
//LYINFLOG("ifname:%s,addr:%s",dataCallList->ifname,dataCallList->addresses);
- LYINFLOG("[lynq_get_data_call_list]: status=%d, suggestedRetryTime=%d, cid=%d, active=%d, type=%s, ifname=%s, addresses=%s, dnses=%s, gateways=%s, pcscf=%s, mtu=%d\n",
+ LYINFLOG("[lynq_get_data_call_list]: status=%d, suggestedRetryTime=%d, cid=%d, active=%d, type=%s, ifname=%s, addresses=%s\n",
dataCallList->status, dataCallList->suggestedRetryTime, dataCallList->cid, dataCallList->active,
- dataCallList->type, dataCallList->ifname, dataCallList->addresses, dataCallList->dnses, dataCallList->gateways, dataCallList->pcscf,
+ dataCallList->type, dataCallList->ifname, dataCallList->addresses);
+ LYINFLOG("[lynq_get_data_call_list]: dnses=%s, gateways=%s, pcscf=%s, mtu=%d\n",
+ dataCallList->addresses, dataCallList->dnses, dataCallList->gateways, dataCallList->pcscf,
dataCallList->mtu);
}
@@ -2342,7 +2344,7 @@
{
if (data_waiting_status == 1)
{
- LYINFLOG("some thread is waiting");
+ LYERRLOG("some thread is waiting");
return -3;
}
LYINFLOG("is empty :%d",s_data_urc_wait_list.empty());
@@ -2353,7 +2355,7 @@
waitPdnChange();
if(g_lynq_data_init_flag == 0)
{
- LYINFLOG("has deinit, need exit");
+ LYERRLOG("has deinit, need exit");
return -1;
}
}
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_list_buffer.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_list_buffer.cpp
index 6a1356d..e1bf260 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_list_buffer.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_list_buffer.cpp
@@ -60,7 +60,7 @@
void data_timer_handler(sigval_t sig)
{
- LYINFLOG("[%s] entry\n",__FUNCTION__);
+ LYDBGLOG("[%s] entry\n",__FUNCTION__);
s_list_buffer_valid = false;
}
@@ -117,7 +117,7 @@
void set_list_buffer_valid(int valid)
{
- LYINFLOG("[%s] entry\n",__FUNCTION__);
+ LYDBGLOG("[%s] entry\n",__FUNCTION__);
s_list_buffer_valid = valid;
if(s_list_buffer_valid==false)
@@ -136,7 +136,7 @@
int ret;
int i;
- LYINFLOG("[%s] entry\n",__FUNCTION__);
+ LYDBGLOG("[%s] entry\n",__FUNCTION__);
number_buffer = number;
memcpy(dataCallList_buffer, dataCallList, sizeof(lynq_data_call_response_v11_t)*LYNQ_APN_CHANNEL_MAX);
set_list_buffer_valid(true);
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.cpp
index 8cf5e45..db6c256 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data_urc.cpp
@@ -166,9 +166,9 @@
pthread_mutex_lock(&s_lynq_urc_mutex);
//xf.li@20230610 add for T106 data start
#ifdef MOBILETEK_TARGET_PLATFORM_T106
- LYINFLOG("DATA urc_msg_process_add_in_urccpp end\n");
+ LYDBGLOG("DATA urc_msg_process_add_in_urccpp end\n");
urc_msg_process_add_for_t106(urc_p);
- LYINFLOG("DATA urc_msg_process_add_in_datacpp end\n");
+ LYDBGLOG("DATA urc_msg_process_add_in_datacpp end\n");
#else
urc_msg_process(urc_p);
#endif
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
index 094547f..e27a205 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
@@ -85,7 +85,7 @@
tmp_char = strsep(&addresses, addresses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 addresses = %s", tmp_char);
+ LYDBGLOG("ipv4 addresses = %s", tmp_char);
inet_aton(tmp_char,&(data_res->v4.ip));
}
@@ -93,13 +93,13 @@
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 pri_dns = %s", tmp_char);
+ LYDBGLOG("ipv4 pri_dns = %s", tmp_char);
inet_aton(tmp_char,&(data_res->v4.pri_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 sec_dns = %s", tmp_char);
+ LYDBGLOG("ipv4 sec_dns = %s", tmp_char);
inet_aton(tmp_char, &(data_res->v4.sec_dns));
}
//get gateway
@@ -129,20 +129,20 @@
tmp_char = strsep(&addresses, addresses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 addresses = %s", tmp_char);
+ LYDBGLOG("ipv6 addresses = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.ip));
}
//get dnses
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 pri_dns = %s", tmp_char);
+ LYDBGLOG("ipv6 pri_dns = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.pri_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 sec_dns = %s", tmp_char);
+ LYDBGLOG("ipv6 sec_dns = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.sec_dns));
}
inet_pton(AF_INET6,libdata->gateways,&(data_res->v6.gateway));
@@ -175,53 +175,53 @@
tmp_char = strsep(&addresses, addresses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 addresses = %s", tmp_char);
+ LYDBGLOG("ipv4 addresses = %s", tmp_char);
inet_aton(tmp_char,&(data_res->v4.ip));
}
tmp_char = strsep(&addresses, addresses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 addresses = %s", tmp_char);
+ LYDBGLOG("ipv6 addresses = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.ip));
}
//get dnses
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 pri_dns = %s", tmp_char);
+ LYDBGLOG("ipv4 pri_dns = %s", tmp_char);
inet_aton(tmp_char,&(data_res->v4.pri_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 sec_dns = %s", tmp_char);
+ LYDBGLOG("ipv4 sec_dns = %s", tmp_char);
inet_aton(tmp_char, &(data_res->v4.sec_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 pri_dns = %s", tmp_char);
+ LYDBGLOG("ipv6 pri_dns = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.pri_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 sec_dns = %s", tmp_char);
+ LYDBGLOG("ipv6 sec_dns = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.sec_dns));
}
//get gateway
inet_aton(libdata->gateways,&(data_res->v4.gateway));
inet_pton(AF_INET6,libdata->gateways,&(data_res->v6.gateway));
- LYINFLOG("v4.ip=%s", inet_ntoa(data_res->v4.ip));
- LYINFLOG("v4.pri_dns=%s", inet_ntoa(data_res->v4.pri_dns));
- LYINFLOG("v4.sec_dns=%s", inet_ntoa(data_res->v4.sec_dns));
+ LYDBGLOG("v4.ip=%s", inet_ntoa(data_res->v4.ip));
+ LYDBGLOG("v4.pri_dns=%s", inet_ntoa(data_res->v4.pri_dns));
+ LYDBGLOG("v4.sec_dns=%s", inet_ntoa(data_res->v4.sec_dns));
inet_ntop(AF_INET6, &(data_res->v6.ip), buf_ip, sizeof(buf_ip));
inet_ntop(AF_INET6, &(data_res->v6.gateway), buf_gateway, sizeof(buf_gateway));
inet_ntop(AF_INET6, &(data_res->v6.pri_dns), buf_pri_dns, sizeof(buf_pri_dns));
inet_ntop(AF_INET6, &(data_res->v6.sec_dns), buf_sec_dns, sizeof(buf_sec_dns));
- LYINFLOG("v6.ip=%s, v6.gateway=%s, v6.pri_dns=%s, v6.sec_dns=%s\n"
+ LYDBGLOG("v6.ip=%s, v6.gateway=%s, v6.pri_dns=%s, v6.sec_dns=%s\n"
, buf_ip, buf_gateway, buf_pri_dns, buf_sec_dns);
return ;
}
@@ -241,29 +241,29 @@
tmp_char = strsep(&addresses, addresses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 addresses = %s", tmp_char);
+ LYDBGLOG("ipv4 addresses = %s", tmp_char);
inet_aton(tmp_char,&(data_res->v4.addr.ip));
}
//get dnses
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 pri_dns = %s", tmp_char);
+ LYDBGLOG("ipv4 pri_dns = %s", tmp_char);
inet_aton(tmp_char,&(data_res->v4.addr.pri_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 sec_dns = %s", tmp_char);
+ LYDBGLOG("ipv4 sec_dns = %s", tmp_char);
inet_aton(tmp_char, &(data_res->v4.addr.sec_dns));
}
//get gateway
- LYINFLOG("ipv4 gateways = %s", libdata->gateways);
+ LYDBGLOG("ipv4 gateways = %s", libdata->gateways);
inet_aton(libdata->gateways,&(data_res->v4.addr.gateway));
- LYINFLOG("v4.ip=%s", inet_ntoa(data_res->v4.addr.ip));
- LYINFLOG("v4.pri_dns=%s", inet_ntoa(data_res->v4.addr.pri_dns));
- LYINFLOG("v4.sec_dns=%s", inet_ntoa(data_res->v4.addr.sec_dns));
+ LYDBGLOG("v4.ip=%s", inet_ntoa(data_res->v4.addr.ip));
+ LYDBGLOG("v4.pri_dns=%s", inet_ntoa(data_res->v4.addr.pri_dns));
+ LYDBGLOG("v4.sec_dns=%s", inet_ntoa(data_res->v4.addr.sec_dns));
#else
inet_aton(libdata->addresses,&(data_res->v4.addr.ip));
inet_aton(libdata->gateways,&(data_res->v4.addr.gateway));
@@ -294,20 +294,20 @@
tmp_char = strsep(&addresses, addresses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 addresses = %s", tmp_char);
+ LYDBGLOG("ipv6 addresses = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.addr.ip));
}
//get dnses
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 pri_dns = %s", tmp_char);
+ LYDBGLOG("ipv6 pri_dns = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.addr.pri_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 sec_dns = %s", tmp_char);
+ LYDBGLOG("ipv6 sec_dns = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.addr.sec_dns));
}
inet_pton(AF_INET6,libdata->gateways,&(data_res->v6.addr.gateway));
@@ -344,54 +344,54 @@
tmp_char = strsep(&addresses, addresses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 addresses = %s", tmp_char);
+ LYDBGLOG("ipv4 addresses = %s", tmp_char);
inet_aton(tmp_char,&(data_res->v4.addr.ip));
}
tmp_char = strsep(&addresses, addresses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 addresses = %s", tmp_char);
+ LYDBGLOG("ipv6 addresses = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.addr.ip));
}
//get dnses
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 pri_dns = %s", tmp_char);
+ LYDBGLOG("ipv4 pri_dns = %s", tmp_char);
inet_aton(tmp_char,&(data_res->v4.addr.pri_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv4 sec_dns = %s", tmp_char);
+ LYDBGLOG("ipv4 sec_dns = %s", tmp_char);
inet_aton(tmp_char, &(data_res->v4.addr.sec_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 pri_dns = %s", tmp_char);
+ LYDBGLOG("ipv6 pri_dns = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.addr.pri_dns));
}
tmp_char = strsep(&dnses, dnses_separator);
if(tmp_char != NULL)
{
- LYINFLOG("ipv6 sec_dns = %s", tmp_char);
+ LYDBGLOG("ipv6 sec_dns = %s", tmp_char);
inet_pton(AF_INET6, tmp_char, &(data_res->v6.addr.sec_dns));
}
//get gateway
inet_aton(libdata->gateways,&(data_res->v4.addr.gateway));
inet_pton(AF_INET6,libdata->gateways,&(data_res->v6.addr.gateway));
- LYINFLOG("v4.ip=%s", inet_ntoa(data_res->v4.addr.ip));
- LYINFLOG("ipv4 gateways = %s", inet_ntoa(data_res->v4.addr.gateway));
- LYINFLOG("v4.pri_dns=%s", inet_ntoa(data_res->v4.addr.pri_dns));
- LYINFLOG("v4.sec_dns=%s", inet_ntoa(data_res->v4.addr.sec_dns));
+ LYDBGLOG("v4.ip=%s", inet_ntoa(data_res->v4.addr.ip));
+ LYDBGLOG("ipv4 gateways = %s", inet_ntoa(data_res->v4.addr.gateway));
+ LYDBGLOG("v4.pri_dns=%s", inet_ntoa(data_res->v4.addr.pri_dns));
+ LYDBGLOG("v4.sec_dns=%s", inet_ntoa(data_res->v4.addr.sec_dns));
inet_ntop(AF_INET6, &(data_res->v6.addr.ip), buf_ip, sizeof(buf_ip));
inet_ntop(AF_INET6, &(data_res->v6.addr.gateway), buf_gateway, sizeof(buf_gateway));
inet_ntop(AF_INET6, &(data_res->v6.addr.pri_dns), buf_pri_dns, sizeof(buf_pri_dns));
inet_ntop(AF_INET6, &(data_res->v6.addr.sec_dns), buf_sec_dns, sizeof(buf_sec_dns));
- LYINFLOG("v6.ip=%s, v6.gateway=%s, v6.pri_dns=%s, v6.sec_dns=%s\n"
+ LYDBGLOG("v6.ip=%s, v6.gateway=%s, v6.pri_dns=%s, v6.sec_dns=%s\n"
, buf_ip, buf_gateway, buf_pri_dns, buf_sec_dns);
data_res->v4.stats.pkts_tx = 0;
data_res->v4.stats.pkts_rx = 0;
@@ -448,7 +448,7 @@
}
int *temp = (int *)data;
for(int i=0; i<argc; i++){
- LYINFLOG("[%s]%s = %s", __FUNCTION__,azColName[i], argv[i] ? argv[i] : "NULL");
+ LYDBGLOG("[%s]%s = %s", __FUNCTION__,azColName[i], argv[i] ? argv[i] : "NULL");
}
*temp = atoi(argv[0]);
return 0;
@@ -470,7 +470,7 @@
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
sprintf(sql,"SELECT ID from LYNQAPN WHERE HANDLE=%d", handle);
LYINFLOG("sql: %s\n", sql);
@@ -494,10 +494,10 @@
int i;
apn_indexs[atoi(argv[0])] = atoi(argv[0]);
- LYINFLOG("apn_indexs[%d] is %d", atoi(argv[0]), apn_indexs[atoi(argv[0])]);
+ LYDBGLOG("apn_indexs[%d] is %d", atoi(argv[0]), apn_indexs[atoi(argv[0])]);
for(i=0; i<argc; i++){
- LYINFLOG("%s = %s", azColName[i], argv[i] ? argv[i] : "NULL");
+ LYDBGLOG("%s = %s", azColName[i], argv[i] ? argv[i] : "NULL");
}
return 0;
}
@@ -540,7 +540,7 @@
{
if(index == apn_indexs[cnt])
{
- LYINFLOG("index = apn_index\n");
+ LYDBGLOG("index = apn_index\n");
sqlite3_close(apnDb);
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 1;
@@ -572,7 +572,7 @@
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
//sql = "SELECT * from LYNQAPN";
sprintf(sql,"UPDATE LYNQAPN SET HANDLE=%d WHERE ID=%d", handle, (int)profile_idx);
@@ -600,7 +600,7 @@
}
int *temp = (int *)data;
for(int i=0; i<argc; i++){
- LYINFLOG("[%s]%s = %s", __FUNCTION__,azColName[i], argv[i] ? argv[i] : "NULL");
+ LYDBGLOG("[%s]%s = %s", __FUNCTION__,azColName[i], argv[i] ? argv[i] : "NULL");
}
*temp = atoi(argv[0]);
LYINFLOG("The handle is %d\n", *temp);
@@ -626,7 +626,7 @@
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
sprintf(sql,"SELECT HANDLE from LYNQAPN WHERE ID=%d", (int)profile_idx);
LYINFLOG("sql: %s\n", sql);
@@ -702,7 +702,7 @@
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 1;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
sql = "CREATE TABLE LYNQAPN( \
ID INT NOT NULL, \
@@ -723,7 +723,7 @@
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 1;
}
- LYINFLOG("Table LYNQAPN created successfully\n");
+ LYDBGLOG("Table LYNQAPN created successfully\n");
sqlite3_close(apnDb);
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 0;
@@ -736,7 +736,7 @@
}
int *temp = (int *)data;
for(int i=0; i<argc; i++){
- LYINFLOG("[%s]%s = %s", __FUNCTION__,azColName[i], argv[i] ? argv[i] : "NULL");
+ LYDBGLOG("[%s]%s = %s", __FUNCTION__,azColName[i], argv[i] ? argv[i] : "NULL");
}
*temp = atoi(argv[0]);
LYINFLOG("\nThe number is %d\n", *temp);
@@ -758,7 +758,7 @@
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 1;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
sql = "SELECT COUNT(*) FROM sqlite_master where type ='table' and name = 'LYNQAPN'";
/* Execute SQL statement */
@@ -771,7 +771,7 @@
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 1;
}
- LYINFLOG("Table LYNQAPN check successfully\n");
+ LYDBGLOG("Table LYNQAPN check successfully\n");
sqlite3_close(apnDb);
pthread_mutex_unlock(&s_qser_data_database_mutex);
if(num <= 0)
@@ -790,6 +790,7 @@
static int init_apn_db()
{
int db_ret=0;
+ int ret = 0;
int check_ret=0;
int table_ret=0;
@@ -801,10 +802,14 @@
table_ret = create_apn_table(APN_DB_PATH);
if(table_ret!=0)
{
- LYERRLOG("create apn table fail!!!");
+ LYERRLOG("ret = %d, create apn table fail!!!", table_ret);
return RESULT_ERROR;
}
- apn_db_add(0, &default_apn);
+ ret = apn_db_add(0, &default_apn);
+ if(ret != 0)
+ {
+ LYERRLOG("ret = %d, apn add fail!!!", ret);
+ }
}
else if(db_ret==APN_DB_READED)
{
@@ -815,10 +820,14 @@
table_ret = create_apn_table(APN_DB_PATH);
if(table_ret!=0)
{
- LYERRLOG("create apn table fail!!!");
+ LYERRLOG("ret = %d, create apn table fail!!!", table_ret);
return 1;
}
- apn_db_add(0, &default_apn);
+ ret = apn_db_add(0, &default_apn);
+ if(ret != 0)
+ {
+ LYERRLOG("ret = %d, apn add fail!!!", ret);
+ }
}
else if(check_ret == APN_TABLE_CREATE)
{
@@ -853,7 +862,7 @@
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
sprintf(sql,"UPDATE LYNQAPN SET HANDLE=%d", default_handle);
LYINFLOG("sql: %s\n", sql);
@@ -867,7 +876,7 @@
pthread_mutex_unlock(&s_qser_data_database_mutex);
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("clean apn table successfully\n");
+ LYDBGLOG("clean apn table successfully\n");
sqlite3_close(apnDb);
pthread_mutex_unlock(&s_qser_data_database_mutex);
return RESULT_OK;
@@ -883,7 +892,7 @@
memset(apn_indexs,0,sizeof(apn_indexs));
next_index = 0;
- LYINFLOG("index = %p",apn_indexs);
+ LYDBGLOG("index = %p",apn_indexs);
/* Open database */
pthread_mutex_lock(&s_qser_data_database_mutex);
rc = sqlite3_open(APN_DB_PATH, &apnDb);
@@ -895,7 +904,7 @@
}
else
{
- LYINFLOG("Opened database successfully\n");
+ LYDBGLOG("Opened database successfully\n");
}
/* Create SQL statement */
@@ -912,14 +921,14 @@
}
else
{
- LYINFLOG("Operation done successfully\n");
+ LYDBGLOG("Operation done successfully\n");
}
//indexs = temp_index;
- LYINFLOG("index = %p",apn_indexs);
+ LYDBGLOG("index = %p",apn_indexs);
for(count;count<=QSER_APN_MAX_LIST;count++)
{
//if(apn_indexs[count-1]!=count)
- LYINFLOG("apn_indexs[count] = %d, count = %d\n", apn_indexs[count], count);
+ LYDBGLOG("apn_indexs[count] = %d, count = %d\n", apn_indexs[count], count);
if(apn_indexs[count]!=count)
{
//apn_usable=true;
@@ -928,7 +937,7 @@
}
sqlite3_close(apnDb);
pthread_mutex_unlock(&s_qser_data_database_mutex);
- LYINFLOG("count is %d\n", count);
+ LYDBGLOG("count is %d\n", count);
return count;
}
@@ -946,7 +955,7 @@
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 1;
}
- LYINFLOG("[%s] Opened database successfully",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully",__FUNCTION__);
/* Create SQL statement */
/* Execute SQL statement */
LYINFLOG("the profile id is %d\n", profile_id);
@@ -961,7 +970,7 @@
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 1;
}
- LYINFLOG("write apn to apn db successfully");
+ LYDBGLOG("write apn to apn db successfully");
sqlite3_close(apnDb);
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 0;
@@ -987,7 +996,7 @@
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
sprintf(sql,"DELETE from LYNQAPN WHERE ID=%d",(int)profile_idx);
LYINFLOG("sql: %s\n", sql);
@@ -1026,7 +1035,7 @@
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
char *sql = sqlite3_mprintf("UPDATE LYNQAPN set PDP_TYPE = %d, AUTH_PROTO = %d, APN_NAME = '%q', USERNAME = '%q', PASSWORD = '%q', APN_TYPE = '%q' WHERE ID=%d", apn->pdp_type, apn->auth_proto, apn->apn_name, apn->username, apn->password, apn->apn_type, apn->profile_idx);
LYINFLOG("sql: %s\n", sql);
@@ -1055,7 +1064,7 @@
}
qser_apn_info_s* temp = (qser_apn_info_s *)data;
for(int i=0; i<argc; i++){
- LYINFLOG("[%s]%s = %s", __FUNCTION__,azColName[i], argv[i] ? argv[i] : "NULL");
+ LYDBGLOG("[%s]%s = %s", __FUNCTION__,azColName[i], argv[i] ? argv[i] : "NULL");
}
temp->profile_idx = atoi(argv[0]);
temp->pdp_type = atoi(argv[1]);
@@ -1087,7 +1096,7 @@
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
sprintf(sql,"SELECT * from LYNQAPN WHERE ID=%d", (int)profile_idx);
LYINFLOG("sql: %s\n", sql);
@@ -1101,7 +1110,7 @@
pthread_mutex_unlock(&s_qser_data_database_mutex);
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("set apn %d successfully\n",apn->profile_idx);
+ LYDBGLOG("set apn %d successfully\n",apn->profile_idx);
sqlite3_close(apnDb);
pthread_mutex_unlock(&s_qser_data_database_mutex);
return 0;
@@ -1114,7 +1123,7 @@
qser_apn_info_list_s* temp = (qser_apn_info_list_s *)data;
for(i=0; i<argc; i++){
- LYINFLOG("%s = %s", azColName[i], argv[i] ? argv[i] : "NULL");
+ LYDBGLOG("%s = %s", azColName[i], argv[i] ? argv[i] : "NULL");
}
temp->apn[temp->cnt].profile_idx = atoi(argv[0]);
@@ -1145,7 +1154,7 @@
return LYNQ_E_APN_DB_FAIL;
}
- LYINFLOG("[%s] Opened database successfully\n",__FUNCTION__);
+ LYDBGLOG("[%s] Opened database successfully\n",__FUNCTION__);
/* Create SQL statement */
sprintf(sql,"SELECT * from LYNQAPN");
LYINFLOG("sql: %s\n", sql);
@@ -1270,7 +1279,7 @@
}
free(apn_table);
apn_table=NULL;
- LYINFLOG("data_call_handle_get end");
+ LYDBGLOG("data_call_handle_get end");
return RESULT_OK;
}
@@ -1308,7 +1317,7 @@
while (s_qser_data_cb_thread_status)
{
ret = lynq_wait_data_call_state_change(&handle);
- LYINFLOG("ret = %d, wait data call state change end!!!\n", ret);
+ LYINFLOG("[thread_wait_cb_status]: ret = %d, handle = %d, wait data call state change end!!!\n", ret, handle);
if(s_qser_data_cb_thread_status == 0)
{
return NULL;
@@ -1318,18 +1327,19 @@
continue;
}
acquire_wake_lock();
- LYINFLOG("[thread_wait_cb_status]: handle = %d", handle);
+ //LYINFLOG("[thread_wait_cb_status]: handle = %d", handle);
memset(&data_urc_info, 0, sizeof(data_urc_info));
memset(&data_cb_state, 0, sizeof(data_cb_state));
lynq_get_data_call_list(&handle,&data_urc_info);
/*compare paramter*/
//data_cb_state.profile_idx = (char)handle;
apn_db_handle_get_profile(handle, &data_cb_state.profile_idx);
- LYINFLOG("[thread_wait_cb_status]: callback profile_idx is %d\n", data_cb_state.profile_idx);
- LYINFLOG("[thread_wait_cb_status]: status=%d, suggestedRetryTime=%d, cid=%d, active=%d, type=%s, ifname=%s, addresses=%s, dnses=%s, gateways=%s, pcscf=%s, mtu=%d\n",
- data_urc_info.status, data_urc_info.suggestedRetryTime, data_urc_info.cid, data_urc_info.active,
- data_urc_info.type, data_urc_info.ifname, data_urc_info.addresses, data_urc_info.dnses, data_urc_info.gateways, data_urc_info.pcscf,
- data_urc_info.mtu);
+ LYINFLOG("[thread_wait_cb_status]: callback profile_idx is %d, status=%d, suggestedRetryTime=%d, cid=%d, active=%d, type=%s, ifname=%s, \n",
+ data_cb_state.profile_idx, data_urc_info.status, data_urc_info.suggestedRetryTime, data_urc_info.cid, data_urc_info.active, data_urc_info.type, data_urc_info.ifname);
+
+ LYINFLOG("[thread_wait_cb_status]: addresses=%s, dnses=%s, gateways=%s, pcscf=%s, mtu=%d\n",
+ data_urc_info.addresses, data_urc_info.dnses, data_urc_info.gateways, data_urc_info.pcscf, data_urc_info.mtu);
+
memcpy(data_cb_state.name,data_urc_info.ifname,strlen(data_urc_info.ifname)+1);
if ((strcmp(data_urc_info.type,"IPV4") == 0) || (strcmp(data_urc_info.type,"IP") == 0))
{
@@ -1646,7 +1656,7 @@
info->ip_family = QSER_DATA_CALL_TYPE_IPV4;
strcpy(info->v4.name,data_call_info.ifname);
datacall_ipv4_status_judge(data_call_info.active,info);
- LYINFLOG("[IPV4]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
+ LYDBGLOG("[IPV4]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
lynq_ipv4_aton_getinfo(&data_call_info,info);
}
else if (strncmp(data_call_info.type,"IPV6", strlen("IPV6") + 1) == 0)
@@ -1654,7 +1664,7 @@
info->ip_family = QSER_DATA_CALL_TYPE_IPV6;
strcpy(info->v6.name,data_call_info.ifname);
datacall_ipv6_status_judge(data_call_info.active,info);
- LYINFLOG("[IPV6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
+ LYDBGLOG("[IPV6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
lynq_ipv6_inet_pton_getinfo(&data_call_info,info);
}
else if (strncmp(data_call_info.type,"IPV4V6", strlen("IPV4V6") + 1) == 0)
@@ -1662,13 +1672,13 @@
info->ip_family = QSER_DATA_CALL_TYPE_IPV4V6;
strcpy(info->v4.name,data_call_info.ifname);
datacall_ipv4_status_judge(data_call_info.active,info);
- LYINFLOG("[IPV4V6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
+ LYDBGLOG("[IPV4V6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
#ifndef MOBILETEK_TARGET_PLATFORM_T106
lynq_ipv4_aton_getinfo(&data_call_info,info);
#endif
strcpy(info->v6.name,data_call_info.ifname);
datacall_ipv6_status_judge(data_call_info.active,info);
- LYINFLOG("[IPV4V6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
+ LYDBGLOG("[IPV4V6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
#ifndef MOBILETEK_TARGET_PLATFORM_T106
lynq_ipv6_inet_pton_getinfo(&data_call_info,info);
#endif
@@ -1938,9 +1948,10 @@
int ret = 0;
int handle = -1;
- LYINFLOG("[%s] entry\n",__FUNCTION__);
+ LYDBGLOG("[%s] entry\n",__FUNCTION__);
if(g_lynq_qser_data_init_flag == 0)
{
+ LYERRLOG("lynq qser data uninit");
return LYNQ_E_NO_INIT;
}
if (profile_idx <= 0 || profile_idx > QSER_APN_MAX_LIST)
@@ -1986,6 +1997,7 @@
{
if(g_lynq_qser_data_init_flag == 0)
{
+ LYERRLOG("lynq qser data uninit");
return LYNQ_E_NO_INIT;
}
if (NULL == apn_list)