Merge branch 'feature-eth-egress-node' of git.mesalab.cn:MESA_Platform/marsio into feature-eth-egress-node

1 files changed, 8 insertions, 7 deletions

diff --git a/infra/src/rpc.c b/infra/src/rpc.c
index 108b249..2ef6f97 100644
--- a/infra/src/rpc.c
+++ b/infra/src/rpc.c
@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <linux/tcp.h>
+#include <netinet/tcp.h>
 
 
 #include <systemd/sd-daemon.h>
@@ -258,16 +258,17 @@ void *rpc_client_monitor_conn_health(void *arg)
                 continue ;
             }
         }
-        getsockopt(events.data.fd, IPPROTO_TCP, TCP_INFO, &info, (socklen_t *)&len);
-        if((info.tcpi_state != 1)){
-            pthread_mutex_lock(&handler->mutex);
-            if(handler->conn){
+        pthread_mutex_lock(&handler->mutex);
+        if(handler->conn){
+            getsockopt(handler->conn->fd, IPPROTO_TCP, TCP_INFO, &info, (socklen_t *)&len);
+            if(info.tcpi_state != TCP_ESTABLISHED){
+                epoll_ctl(handler->epfd, EPOLL_CTL_DEL, handler->conn->fd, NULL);
                 rpc_common_close_conn(handler->conn);
             }
-            epoll_ctl(handler->epfd, EPOLL_CTL_DEL, events.data.fd, NULL);
-            pthread_mutex_unlock(&handler->mutex);            
         }
+        pthread_mutex_unlock(&handler->mutex);
     }
+    return NULL;
 }
 void rpc_client_set_block_sendtimeout(int sock)
 {