Report failure from the custom io file client and server

Author: aidangarske

custom-io-callbacks/file-client/file-client.c

@@ -172,6 +172,7 @@ int main(int argc, char** argv)
     char msg[] = "Hello wolfSSL\r\n";
     char reply[MAXSZ];
     int    ret, msgSz;
+    int    rc = -1;
     WOLFSSL* sslCli;
     WOLFSSL_CTX* ctxCli = NULL;
 
@@ -242,6 +243,7 @@ int main(int argc, char** argv)
         else {
             reply[ret] = '\0';
             printf("Client Received Reply: %s\n", reply);
+            rc = 0;
             break;
         }
 
@@ -263,5 +265,5 @@ int main(int argc, char** argv)
     close(open(CR, O_RDWR | O_NOCTTY | O_NDELAY));
     close(open(SR, O_RDWR | O_NOCTTY | O_NDELAY));
 
-    return -1;
+    return rc;
 }

custom-io-callbacks/file-server/check.sh

@@ -1,17 +1,32 @@
 #!/bin/sh
+
+# Start the server first: the client's first write must not race an absent reader.
 ./start-server $1 &
-PID1=$!
-RESULT1=$?
+SERVER_PID=$!
 
-cd ../file-client
+cd ../file-client || exit 1
 ./start-client $1
-PID2=$!
-RESULT2=$?
+CLIENT_RESULT=$?
+cd ../file-server || exit 1
+
+# Bound the wait. A failed client leaves the server blocked reading a fifo that
+# will never deliver, and a bare `wait` would hang until the CI step times out.
+i=0
+while kill -0 "${SERVER_PID}" 2>/dev/null && [ "$i" -lt 30 ]; do
+    sleep 1
+    i=$((i + 1))
+done
+
+if kill -0 "${SERVER_PID}" 2>/dev/null; then
+    echo "server still running after ${i}s; killing it"
+    kill "${SERVER_PID}" 2>/dev/null
+    SERVER_RESULT=1
+else
+    wait "${SERVER_PID}"
+    SERVER_RESULT=$?
+fi
 
-echo "RESULT1 = ${RESULT1}"
-echo ""
-echo "RESULT2 = ${RESULT2}"
-echo ""
-kill ${PID1}
-kill ${PID2}
+echo "server exited ${SERVER_RESULT}"
+echo "client exited ${CLIENT_RESULT}"
 
+[ ${CLIENT_RESULT} -eq 0 ] && [ ${SERVER_RESULT} -eq 0 ]

custom-io-callbacks/file-server/file-server.c

@@ -162,6 +162,7 @@ int main(int argc, char** argv)
     char sMsg[] = "I hear you fashizzle\r\n";
     char reply[MAXSZ];
     int ret, msgSz;
+    int rc = -1;
     WOLFSSL* sslServ;
     WOLFSSL_CTX* ctxServ = NULL;
 
@@ -185,7 +186,7 @@ int main(int argc, char** argv)
 //    sslServ = Server(&ctxServ, "ECDHE-RSA-AES128-SHA", 1);
     sslServ = Server(&ctxServ, "let-wolfssl-choose", 0);
 
-    if (sslServ == NULL) { printf("sslServ NULL\n"); return 0;}
+    if (sslServ == NULL) { printf("sslServ NULL\n"); return -1;}
     ret = SSL_FAILURE;
     printf("Starting server\n");
     while (ret != SSL_SUCCESS) {
@@ -216,7 +217,7 @@ int main(int argc, char** argv)
             if (error != SSL_ERROR_WANT_READ &&
                 error != SSL_ERROR_WANT_WRITE) {
                 printf("server read failed\n");
-                break;
+                goto cleanup;
             }
         }
         else {
@@ -241,6 +242,7 @@ int main(int argc, char** argv)
             }
         } else if (ret == msgSz) {
             printf("Server send successful\n");
+            rc = 0;
             break;
         } else {
             printf("Unkown error occurred, shutting down\n");
@@ -272,5 +274,5 @@ int main(int argc, char** argv)
         if (f != NULL) fclose(f);
     }
 
-    return -1;
+    return rc;
 }