tcp/ip client is disconnected after 12 hours of inactivity. rcvloop c…

…lients does not have this limit.
grodansparadis · Aug 20, 2018 · 44b1b7f · 44b1b7f
1 parent a09762a
commit 44b1b7f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/m4/Makefile.in b/m4/Makefile.in
@@ -188,6 +188,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am

diff --git a/src/vscp/common/clientlist.h b/src/vscp/common/clientlist.h
@@ -197,8 +197,11 @@ class CClientItem
     //                       Used by TCP/IP client thread
     //////////////////////////////////////////////////////////////////////////
 
+    // UTC time since last client activity
+    long m_clientActivity;
+
     /*!
-        RCVLOOP clock
+        RCVLOOP clock (UTC time for last sent "+OK")
     */
     wxLongLong m_timeRcvLoop;
 

diff --git a/src/vscp/common/tcpipsrv.cpp b/src/vscp/common/tcpipsrv.cpp
@@ -60,6 +60,11 @@
 
 WX_DEFINE_LIST( TCPIPCLIENTS );
 
+#define TCPIPSRV_INACTIVITY_TIMOUT  (3600 * 12)
+
+
+
+
 ///////////////////////////////////////////////////
 //                 GLOBALS
 ///////////////////////////////////////////////////
@@ -409,6 +414,9 @@ void *TCPClientThread::Entry()
     m_pClientItem->m_strDeviceName += _(" ");
     m_pClientItem->m_strDeviceName += wxDateTime::Now().FormatISOTime();
 
+    // Start of activity
+    m_pClientItem->m_clientActivity = wxGetUTCTime();
+
     // Add the client to the Client List
     gpobj->m_wxClientMutex.Lock();
     gpobj->addClient( m_pClientItem );
@@ -436,6 +444,12 @@ void *TCPClientThread::Entry()
     struct pollfd fd;
     while ( !TestDestroy() && !(gpobj->m_StopTcpIpSrv ) ) {
 
+        // Check for client inactivity
+        if ( ( wxGetUTCTime() - m_pClientItem->m_clientActivity ) > TCPIPSRV_INACTIVITY_TIMOUT ) {
+            gpobj->logMsg( _("[TCP/IP srv client thread] Client closed due to inactivity.\n") );
+            break;
+        }
+
         // * * * Receiveloop * * *
         if ( m_bReceiveLoop ) {
 
@@ -449,6 +463,7 @@ void *TCPClientThread::Entry()
             // link is open
             if ( ( wxGetUTCTime()-m_pClientItem->m_timeRcvLoop ) > 2 ) {
                 m_pClientItem->m_timeRcvLoop = wxGetUTCTime();
+                m_pClientItem->m_clientActivity = wxGetUTCTime();
                 write( "+OK\r\n", 5 );
             }
 
@@ -499,6 +514,9 @@ void *TCPClientThread::Entry()
         else if ( nRead > 0 ) {
             m_strResponse += wxString::FromUTF8Unchecked( buf, nRead );
         }
+
+        // Record client activity
+        m_pClientItem->m_clientActivity = wxGetUTCTime();
 
         // get data up to "\r\n" if any
         int pos;