commit df725f464115d974115910805167ed3ac2421df7
author rjw <rjw@exm.com> Mon Jul 04 21:17:25 2022 +0800
committer rjw <rjw@exm.com> Wed Jul 06 10:44:59 2022 +0800
tree 675aa8923d9a31b227541cf85c55a71c97302913
parent 0d4c510e2bee9d6d05077987faa511deb74d1fda

[Feature][T8TSK-30][Network]Modify the timeout of some interfaces to be too short

Change-Id: I6c20e1d4b3b1224f0e37a1e19aaccb16fbcf2fac

src/lynq/lib/liblynq-network/lynq_network.cpp

diff --git a/src/lynq/lib/liblynq-network/lynq_network.cpp b/src/lynq/lib/liblynq-network/lynq_network.cpp
index 3b092e8..23aa072 100755
--- a/src/lynq/lib/liblynq-network/lynq_network.cpp
+++ b/src/lynq/lib/liblynq-network/lynq_network.cpp
@@ -557,7 +557,6 @@
     int recv_num = 0;

     int num = 0;

     lynq_client_t client_t;

-    char res_data[LYNQ_REQUEST_PARAM_BUF] = {0};

     char *resp[LYNQ_RESP_BUF];

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_OPERATOR;

@@ -574,16 +573,14 @@
     }

 

     //get data

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

+

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -630,7 +627,6 @@
     int recv_num = 0;

     int readnum = 0;

     lynq_client_t client_t;

-    char res_data[LYNQ_REC_BUF] = {0};

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE;

     client_t.paramLen = 0;

@@ -646,16 +642,13 @@
     }

 

     //get data

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -685,7 +678,6 @@
     int send_num = 0;

     lynq_client_t client_t;

     int recv_num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     memset(&client_t,0,sizeof(client_t));

     if(!strcmp(mode,"Auto"))

     {

@@ -721,17 +713,13 @@
         return ret;

     }

 

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

-

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -749,7 +737,6 @@
         return ret;

     int send_num = 0;

     int recv_num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     char *resp[128];

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

@@ -766,16 +753,13 @@
     }

 

     //get data

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

+    ret = get_response(p,600);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -826,7 +810,6 @@
     int recv_num = 0;

     int num = 0;

     char str[LYNQ_TYPE_BUF];

-    char res_data[LYNQ_REC_BUF] = {0};

     char *resp[LYNQ_RESP_BUF];

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

@@ -860,16 +843,13 @@
     }

 

     //get data

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -936,7 +916,6 @@
     int send_num = 0;

     int recv_num = 0;

     int num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE;

@@ -952,16 +931,13 @@
     }

 

     //get data 

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -987,7 +963,6 @@
     int send_num = 0;

     lynq_client_t client_t;

     int recv_num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE;

     client_t.paramLen = 1;

@@ -1001,17 +976,14 @@
         return ret;

     }

 

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

+    Parcel p;

+    ret = get_response(p,5);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

+    if (ret != 0)

     {

-        LYERRLOG("recvfrom error");

-        return -1;

+        return ret;

     }

 

-    Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -1032,7 +1004,6 @@
     int send_num = 0;

     int recv_num = 0;

     int num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_GET_CELL_INFO_LIST;

@@ -1048,16 +1019,13 @@
     }

 

     //get data

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -1086,7 +1054,6 @@
     int ret = -1;

     int send_num = 0;

     int recv_num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE;

@@ -1102,17 +1069,14 @@
     }

     

 

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

+    Parcel p;

+    ret = get_response(p,5);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

+    if (ret != 0)

     {

-        LYERRLOG("recvfrom error");

-        return -1;

+        return ret;

     }

 

-    Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -1129,7 +1093,6 @@
     int ret = -1;

     int send_num = 0;

     int recv_num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_SET_BAND_MODE;

@@ -1144,17 +1107,14 @@
         return ret;

     }

     

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

+    Parcel p;

+    ret = get_response(p,5);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

+    if (ret != 0)

     {

-        LYERRLOG("recvfrom error");

-        return -1;

+        return ret;

     }

 

-    Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -1175,7 +1135,6 @@
     int recv_num = 0;

     int num = 0;

     int res = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE;

@@ -1191,21 +1150,17 @@
     }

 

     //get data

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

+    Parcel p;

+    ret = get_response(p,5);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

+    if (ret != 0)

     {

-        LYERRLOG("recvfrom error");

-        return -1;

+        return ret;

     }

     for(int i = 0;i<10;i++)

     {

         availBanMode[i]=0;

     }

-    Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

-

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -1236,7 +1191,6 @@
     if(data < 0)

         return ret;

     int send_num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     int recv_num = 0;

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

@@ -1252,17 +1206,13 @@
         return ret;

     }

 

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex); 

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

-

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -1282,7 +1232,6 @@
     int send_num = 0;

     int recv_num = 0;

     int num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_VOICE_RADIO_TECH;

@@ -1297,17 +1246,13 @@
         return ret;

     }

 

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

-

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -1336,8 +1281,6 @@
     int LTE_signalstrength = 0;

     int WCDMA_signalstrength = 0;

     int none = 0;

-

-    char res_data[LYNQ_REC_BUF] = {0};

     lynq_client_t client_t;

     memset(&client_t,0,sizeof(client_t));

     client_t.request = RIL_REQUEST_SIGNAL_STRENGTH;

@@ -1354,17 +1297,13 @@
     }

 

     //get data 

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if(recv_num == 0 ||recv_num <0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

-

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if(p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);

@@ -1449,7 +1388,6 @@
         return ret;

     }

     int send_num = 0;

-    char res_data[LYNQ_REC_BUF] = {0};

     int recv_num = 0;

     lynq_client_t client_t;

 

@@ -1466,17 +1404,13 @@
         return ret;

     }

 

-    recv_num = recvfrom(network_sock_fd,res_data,sizeof(res_data),0,(struct sockaddr *)&network_addr_serv,(socklen_t *)&network_len_addr_serv);

-    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

-    if (recv_num == 0 || recv_num < 0)

-    {

-        LYERRLOG("recvfrom error");

-        return -1;

-    }

-

     Parcel p;

-    p.setData((uint8_t *)res_data,sizeof(res_data));

-    p.setDataPosition(0);

+    ret = get_response(p,5);

+    pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

+    if (ret != 0)

+    {

+        return ret;

+    }

     if (p.dataAvail() > 0)

     {

         p.readInt32(&response.resp_type);