commit a59bf3161af3bc731dc5ed9edaa2d1d98c91e149
author rjw <rjw@exm.com> Tue Jul 05 11:50:31 2022 +0800
committer rjw <rjw@exm.com> Wed Jul 06 10:44:59 2022 +0800
tree e6b98d4fb0e8d6c30537bda8f9a9f65db8303a6a
parent 08528682902de374a607b59f58b15013532bee00

[Feature][T8TSK-30][Network][Data]Set timeout to 30 by default

Change-Id: I08671b0b2ebdc67ff1a6c27c5a09dfe421a841df

lib/liblynq-network/lynq_network.cpp

diff --git a/lib/liblynq-network/lynq_network.cpp b/lib/liblynq-network/lynq_network.cpp
index 23aa072..f5471d1 100755
--- a/lib/liblynq-network/lynq_network.cpp
+++ b/lib/liblynq-network/lynq_network.cpp
@@ -106,13 +106,13 @@
 */

 int get_response(Parcel &p,int time_out)

 {

-    int len = 0;
-    char recvline[LYNQ_REC_BUF];
+    int len = 0;

+    char recvline[LYNQ_REC_BUF];

     bzero(recvline,LYNQ_REC_BUF);

     LYINFLOG("get response");

     /* receive data from server */

     struct timeval timeOut;

-    timeOut.tv_sec = 5;    //defualt 5s

+    timeOut.tv_sec = 30;    //defualt 5s

     timeOut.tv_usec = 0;

     if(time_out >= 0)

     {

@@ -129,29 +129,29 @@
     {

         LYERRLOG("read error,maybe timeout: %s",strerror(errno));

         return LYNQ_E_TIME_OUT;

-    }
+    }

     if (recvline != NULL) 

     {

-        p.setData((uint8_t *)recvline,len); // p.setData((uint8_t *) buffer, buflen);
-        p.setDataPosition(0);
-    }
-    return 0;
-}
-int JumpHeader(Parcel &p,int *resp_type,int *request,int *slot_id,int *error)
+        p.setData((uint8_t *)recvline,len); // p.setData((uint8_t *) buffer, buflen);

+        p.setDataPosition(0);

+    }

+    return 0;

+}

+int JumpHeader(Parcel &p,int *resp_type,int *request,int *slot_id,int *error)

 {

     LYINFLOG("jump header");

-    if(p.dataAvail() > 0)
-    {
-        p.readInt32(resp_type);
-        p.readInt32(request);
-        p.readInt32(slot_id);
-        p.readInt32(error);
-        return 0;
-    }
-    else
-    {
-        return -1;
-    }
+    if(p.dataAvail() > 0)

+    {

+        p.readInt32(resp_type);

+        p.readInt32(request);

+        p.readInt32(slot_id);

+        p.readInt32(error);

+        return 0;

+    }

+    else

+    {

+        return -1;

+    }

 }

 

 int wait_signal_changes()

@@ -574,7 +574,7 @@
 

     //get data

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -643,7 +643,7 @@
 

     //get data

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -714,7 +714,7 @@
     }

 

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -844,7 +844,7 @@
 

     //get data

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -932,7 +932,7 @@
 

     //get data 

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -977,7 +977,7 @@
     }

 

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -1020,7 +1020,7 @@
 

     //get data

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -1070,7 +1070,7 @@
     

 

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -1108,7 +1108,7 @@
     }

     

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -1151,7 +1151,7 @@
 

     //get data

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -1207,7 +1207,7 @@
     }

 

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -1247,7 +1247,7 @@
     }

 

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -1298,7 +1298,7 @@
 

     //get data 

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {

@@ -1405,7 +1405,7 @@
     }

 

     Parcel p;

-    ret = get_response(p,5);

+    ret = get_response(p,30);

     pthread_mutex_unlock(&g_lynq_network_sendto_mutex);

     if (ret != 0)

     {