server: allow re-INIT after CLOSE so the channel can recover

Author: aidangarske

src/wh_server.c

@@ -233,6 +233,11 @@ static int _wh_Server_HandleCommRequest(whServerContext* server,
         /* Process the init action */
         server->comm->client_id = req.client_id;
 
+        /* A fresh INIT after a prior CLOSE must put the channel back into
+         * the connected state so the subsequent request loop accepts non-
+         * COMM groups again. */
+        wh_Server_SetConnected(server, WH_COMM_CONNECTED);
+
         resp.client_id = server->comm->client_id;
         resp.server_id = server->comm->server_id;
 
@@ -526,9 +531,8 @@ int wh_Server_HandleRequestMessage(whServerContext* server)
     /* Use the CommServer internal buffer to avoid copies */
     data = wh_CommServer_GetDataPtr(server->comm);
 
-    /* Are we connected with a valid data pointer? */
-    if (    (server->connected == WH_COMM_DISCONNECTED) ||
-            (data == NULL) ) {
+    /* Valid data pointer? */
+    if (data == NULL) {
         return WH_ERROR_NOTREADY;
     }
 
@@ -539,6 +543,15 @@ int wh_Server_HandleRequestMessage(whServerContext* server)
         group = WH_MESSAGE_GROUP(kind);
         action = WH_MESSAGE_ACTION(kind);
 
+        /* When disconnected, only allow COMM-group messages through so the
+         * client can re-establish (INIT), interrogate (INFO/ECHO) or repeat
+         * a CLOSE on the channel. Any other request is rejected with
+         * NOTREADY until a fresh INIT brings the channel back up. */
+        if (server->connected == WH_COMM_DISCONNECTED &&
+            group != WH_MESSAGE_GROUP_COMM) {
+            return WH_ERROR_NOTREADY;
+        }
+
 #ifdef WOLFHSM_CFG_ENABLE_AUTHENTICATION
         /* General authentication check for if user has permissions for the
          * group and action requested. When dealing with key ID's there should