[IOT-1575] Update to manage connection state of tcp session

If network interface is down, the socket of the connecting/connected
state will be closed.

Change-Id: I9f9cda2e3ab5672c336ed165ec4f189ab846f054
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14531
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

diff --git a/resource/csdk/connectivity/inc/catcpadapter.h b/resource/csdk/connectivity/inc/catcpadapter.h
index f258711d38787411a3646bb9524a6366954b8772..3ab02ff32dfb78f15e613c69ac6412de690eac0f 100644 (file)
--- a/resource/csdk/connectivity/inc/catcpadapter.h
+++ b/resource/csdk/connectivity/inc/catcpadapter.h
@@ -44,6 +44,16 @@ typedef enum CAProtocol
     COAP
 } CAProtocol_t;
 
+/**
+ * TCP Connection State.
+ */
+typedef enum
+{
+    CONNECTING = 0,
+    CONNECTED,
+    DISCONNECTED
+} CATCPConnectionState_t;
+
 /**
  * TCP Session Information for IPv4 TCP transport
  */
@@ -55,6 +65,7 @@ typedef struct
     size_t len;                         /**< received data length */
     size_t totalLen;                    /**< total data length required to receive */
     CAProtocol_t protocol;              /**< application-level protocol */
+    CATCPConnectionState_t state;       /**< current tcp session state */
 } CATCPSessionInfo_t;
 
 /**

diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
index 740cb3d6e076cb373616a913a4b3439b90c6ea17..3a92ba687c89cf87569bc52c3cfc11035c9fdd7f 100644 (file)
--- a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
+++ b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
@@ -99,7 +99,7 @@ static void CAFindReadyMessage();
 static void CASelectReturned(fd_set *readFds);
 static void CAReceiveMessage(int fd);
 static void CAReceiveHandler(void *data);
-static int CATCPCreateSocket(int family, CATCPSessionInfo_t *tcpServerInfo);
+static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *tcpServerInfo);
 
 #define CHECKFD(FD) \
     if (FD > caglobals.tcp.maxfd) \
@@ -140,6 +140,7 @@ static CAResult_t CARecv(CATCPSessionInfo_t *item, size_t length, int flags)
     else if (0 == len)
     {
         OIC_LOG(INFO, TAG, "Received disconnect from peer. Close connection");
+        item->state = DISCONNECTED;
         return CA_DESTINATION_DISCONNECTED;
     }
 
@@ -244,7 +245,7 @@ static void CAFindReadyMessage()
     {
         CATCPSessionInfo_t *svritem =
                 (CATCPSessionInfo_t *) u_arraylist_get(caglobals.tcp.svrlist, i);
-        if (svritem && 0 <= svritem->fd)
+        if (svritem && 0 <= svritem->fd && CONNECTED == svritem->state)
         {
             FD_SET(svritem->fd, &readFds);
         }
@@ -345,6 +346,7 @@ static void CAAcceptConnection(CATransportFlags_t flag, CASocket_t *sock)
         svritem->fd = sockfd;
         svritem->sep.endpoint.flags = flag;
         svritem->sep.endpoint.adapter = CA_ADAPTER_TCP;
+        svritem->state = CONNECTED;
         CAConvertAddrToName((struct sockaddr_storage *)&clientaddr, clientlen,
                             svritem->sep.endpoint.addr, &svritem->sep.endpoint.port);
 
@@ -608,7 +610,7 @@ static void CAReceiveMessage(int fd)
     }
 }
 
-static void CAWakeUpForReadFdsUpdate(const char *host)
+static ssize_t CAWakeUpForReadFdsUpdate(const char *host)
 {
     if (caglobals.tcp.connectionFds[1] != -1)
     {
@@ -622,7 +624,9 @@ static void CAWakeUpForReadFdsUpdate(const char *host)
         {
             OIC_LOG_V(DEBUG, TAG, "write failed: %s", strerror(errno));
         }
+        return len;
     }
+    return -1;
 }
 
 static CAResult_t CATCPConvertNameToAddr(int family, const char *host, uint16_t port,
@@ -664,15 +668,16 @@ static CAResult_t CATCPConvertNameToAddr(int family, const char *host, uint16_t
     return CA_STATUS_OK;
 }
 
-static int CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
+static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
 {
     // #1. create tcp socket.
     int fd = socket(family, SOCK_STREAM, IPPROTO_TCP);
     if (-1 == fd)
     {
         OIC_LOG_V(ERROR, TAG, "create socket failed: %s", strerror(errno));
-        return -1;
+        return CA_SOCKET_OPERATION_FAILED;
     }
+    svritem->fd = fd;
 
     // #2. convert address from string to binary.
     struct sockaddr_storage sa = { .ss_family = family };
@@ -680,8 +685,7 @@ static int CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
                                             svritem->sep.endpoint.port, &sa);
     if (CA_STATUS_OK != res)
     {
-        close(fd);
-        return -1;
+        return CA_SOCKET_OPERATION_FAILED;
     }
 
     // #3. set socket length.
@@ -704,13 +708,18 @@ static int CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
     if (connect(fd, (struct sockaddr *)&sa, socklen) < 0)
     {
         OIC_LOG_V(ERROR, TAG, "failed to connect socket, %s", strerror(errno));
-        close(fd);
-        return -1;
+        return CA_SOCKET_OPERATION_FAILED;
     }
 
     OIC_LOG(DEBUG, TAG, "connect socket success");
-    CAWakeUpForReadFdsUpdate(svritem->sep.endpoint.addr);
-    return fd;
+    svritem->state = CONNECTED;
+    CHECKFD(svritem->fd);
+    ssize_t len = CAWakeUpForReadFdsUpdate(svritem->sep.endpoint.addr);
+    if (-1 == len)
+    {
+        return CA_SOCKET_OPERATION_FAILED;
+    }
+    return CA_STATUS_OK;
 }
 
 static int CACreateAcceptSocket(int family, CASocket_t *sock)
@@ -1080,18 +1089,9 @@ CATCPSessionInfo_t *CAConnectTCPSession(const CAEndpoint_t *endpoint)
     svritem->sep.endpoint.port = endpoint->port;
     svritem->sep.endpoint.flags = endpoint->flags;
     svritem->sep.endpoint.ifindex = endpoint->ifindex;
+    svritem->state = CONNECTING;
 
-    // #2. create the socket and connect to TCP server
-    int family = (svritem->sep.endpoint.flags & CA_IPV6) ? AF_INET6 : AF_INET;
-    int fd = CATCPCreateSocket(family, svritem);
-    if (-1 == fd)
-    {
-        OICFree(svritem);
-        return NULL;
-    }
-
-    // #3. add TCP connection info to list
-    svritem->fd = fd;
+    // #2. add TCP connection info to list
     ca_mutex_lock(g_mutexObjectList);
     if (caglobals.tcp.svrlist)
     {
@@ -1107,9 +1107,14 @@ CATCPSessionInfo_t *CAConnectTCPSession(const CAEndpoint_t *endpoint)
     }
     ca_mutex_unlock(g_mutexObjectList);
 
-    CHECKFD(fd);
+    // #3. create the socket and connect to TCP server
+    int family = (svritem->sep.endpoint.flags & CA_IPV6) ? AF_INET6 : AF_INET;
+    if (CA_STATUS_OK != CATCPCreateSocket(family, svritem))
+    {
+        return NULL;
+    }
 
-    // pass the connection information to CA Common Layer.
+    // #4. pass the connection information to CA Common Layer.
     if (g_connectionCallback)
     {
         g_connectionCallback(&(svritem->sep.endpoint), true);
@@ -1128,17 +1133,18 @@ CAResult_t CADisconnectTCPSession(CATCPSessionInfo_t *svritem, size_t index)
         shutdown(svritem->fd, SHUT_RDWR);
         close(svritem->fd);
         svritem->fd = -1;
+        svritem->state = (CONNECTED == svritem->state) ? DISCONNECTED : svritem->state;
+
+        // pass the connection information to CA Common Layer.
+        if (g_connectionCallback && DISCONNECTED == svritem->state)
+        {
+            g_connectionCallback(&(svritem->sep.endpoint), false);
+        }
     }
     u_arraylist_remove(caglobals.tcp.svrlist, index);
     OICFree(svritem->data);
     svritem->data = NULL;
 
-    // pass the connection information to CA Common Layer.
-    if (g_connectionCallback)
-    {
-        g_connectionCallback(&(svritem->sep.endpoint), false);
-    }
-
     OICFree(svritem);
     svritem = NULL;
     return CA_STATUS_OK;
@@ -1147,6 +1153,7 @@ CAResult_t CADisconnectTCPSession(CATCPSessionInfo_t *svritem, size_t index)
 void CATCPDisconnectAll()
 {
     ca_mutex_lock(g_mutexObjectList);
+
     uint32_t length = u_arraylist_length(caglobals.tcp.svrlist);
     CATCPSessionInfo_t *svritem = NULL;
     for (size_t i = 0; i < length; i++)
@@ -1158,9 +1165,10 @@ void CATCPDisconnectAll()
             close(svritem->fd);
             OICFree(svritem->data);
             svritem->data = NULL;
+            svritem->state = (CONNECTED == svritem->state) ? DISCONNECTED : svritem->state;
 
             // pass the connection information to CA Common Layer.
-            if (g_connectionCallback)
+            if (g_connectionCallback && DISCONNECTED == svritem->state)
             {
                 g_connectionCallback(&(svritem->sep.endpoint), false);
             }