Unify server handler return code processing - handlers should return

errors to HandleRequestMessage, which should never fail based on these
codes

Author: bigbrett

src/wh_server.c

@@ -325,6 +325,7 @@ int wh_Server_HandleRequestMessage(whServerContext* server)
     uint16_t seq = 0;
     uint16_t size = 0;
     uint8_t* data = NULL;
+    int      handlerRc = 0;
 
     if (server == NULL) {
         return WH_ERROR_BADARGS;
@@ -342,7 +343,7 @@ int wh_Server_HandleRequestMessage(whServerContext* server)
     int rc = wh_CommServer_RecvRequest(server->comm, &magic, &kind, &seq,
             &size, data);
     /* Got a packet? */
-    if (rc == 0) {
+    if (rc == WH_ERROR_OK) {
         group = WH_MESSAGE_GROUP(kind);
         action = WH_MESSAGE_ACTION(kind);
         switch (group) {
@@ -407,33 +408,44 @@ int wh_Server_HandleRequestMessage(whServerContext* server)
 #endif /* WOLFHSM_CFG_CERTIFICATE_MANAGER && !WOLFHSM_CFG_NO_CRYPTO */
 
         default:
-            /* Unknown group. Return empty packet*/
-            /* TODO: Respond with aux error flag */
+            /* Unknown group. Return empty packet */
+            rc   = WH_ERROR_NOTIMPL;
             size = 0;
         }
 
-        /* Send a response */
-        /* TODO: Respond with ErrorResponse if handler returns an error */
+        /* Capture handler result for logging. The response packet already
+         * contains the error code for the client in the resp.rc field. */
+        handlerRc = rc;
+
+        /* Handle cancellation by modifying response kind */
 #ifdef WOLFHSM_CFG_CANCEL_API
-        if (rc == WH_ERROR_CANCEL) {
+        if (handlerRc == WH_ERROR_CANCEL) {
             /* notify the client that their request was canceled */
             kind = WH_MESSAGE_KIND(WH_MESSAGE_GROUP_CANCEL, 0);
             size = 0;
             data = NULL;
-            /* reset RC so the cancellation response is sent */
-            rc = 0;
         }
 #endif
-        if (rc == 0) {
-            do {
-                rc = wh_CommServer_SendResponse(server->comm, magic, kind, seq,
-                    size, data);
-            } while (rc == WH_ERROR_NOTREADY);
-        }
-        WH_LOG_ON_ERROR_F(
-            &server->log, WH_LOG_LEVEL_ERROR, rc,
-            "Request Handler for (group=%d, action=%d) Returned Error: %d",
-            group, action, rc);
+
+        /* Always send the response to the client, regardless of handler error.
+         * The response packet contains the operational error code for the
+         * client in the resp.rc field. */
+        do {
+            rc = wh_CommServer_SendResponse(server->comm, magic, kind, seq,
+                                            size, data);
+        } while (rc == WH_ERROR_NOTREADY);
+
+        /* Log any communication errors */
+        WH_LOG_ON_ERROR_F(&server->log, WH_LOG_LEVEL_ERROR, rc,
+                          "SendResponse failed for (group=%d, action=%d): %d",
+                          group, action, rc);
+
+        (void)handlerRc; /* Suppress unused variable warning until logging is
+                          * implemented */
+
+        /* Always return success when we processed a request, so no handler
+         * error can terminate the server's request processing loop. */
+        rc = WH_ERROR_OK;
     }
 
     return rc;

src/wh_server_counter.c

@@ -80,8 +80,6 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
                 resp.counter = *counter;
             }
             resp.rc = ret;
-            /* TODO: are there any fatal server errors? */
-            ret = WH_ERROR_OK;
 
             (void)wh_MessageCounter_TranslateInitResponse(
                 magic, &resp, (whMessageCounter_InitResponse*)resp_packet);
@@ -139,9 +137,6 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
                 magic, &resp, (whMessageCounter_IncrementResponse*)resp_packet);
 
             *out_resp_size = sizeof(resp);
-
-            /* TODO: are there any fatal server errors? */
-            ret = WH_ERROR_OK;
         } break;
 
         case WH_COUNTER_READ: {
@@ -178,9 +173,6 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
                 magic, &resp, (whMessageCounter_ReadResponse*)resp_packet);
 
             *out_resp_size = sizeof(resp);
-
-            /* TODO: are there any fatal server errors? */
-            ret = WH_ERROR_OK;
         } break;
 
         case WH_COUNTER_DESTROY: {
@@ -211,9 +203,6 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
                 magic, &resp, (whMessageCounter_DestroyResponse*)resp_packet);
 
             *out_resp_size = sizeof(resp);
-
-            /* TODO: are there any fatal server errors? */
-            ret = WH_ERROR_OK;
         } break;
 
         default:

src/wh_server_crypto.c

@@ -4231,16 +4231,6 @@ int wh_Server_HandleCryptoRequest(whServerContext* ctx, uint16_t magic,
 
     WH_DEBUG_SERVER_VERBOSE("End ret:%d\n", ret);
 
-    /* Since crypto error codes are propagated to the client in the response
-     * packet, return success to the caller unless a cancellation has occurred
-     */
-#ifdef WOLFHSM_CFG_CANCEL_API
-    if (ret != WH_ERROR_CANCEL) {
-        ret = WH_ERROR_OK;
-    }
-#else
-    ret = WH_ERROR_OK;
-#endif
     return ret;
 }
 
@@ -5724,16 +5714,7 @@ int wh_Server_HandleCryptoDmaRequest(whServerContext* ctx, uint16_t magic,
 
 
     WH_DEBUG_SERVER_VERBOSE("Crypto DMA request. Action:%u\n", action);
-    /* Since crypto error codes are propagated to the client in the response
-     * packet, return success to the caller unless a cancellation has occurred
-     */
-#ifdef WOLFHSM_CFG_CANCEL_API
-    if (ret != WH_ERROR_CANCEL) {
-        ret = WH_ERROR_OK;
-    }
-#else
-    ret = WH_ERROR_OK;
-#endif
+
     return ret;
 }
 #endif /* WOLFHSM_CFG_DMA */