Fixed problems with connect() implementation

.github/workflows/smoketest.yaml

@@ -115,4 +115,5 @@ jobs:
         ./socket_test.sh &
         # Guard against endless loop in QEMU run (120 CPU secs)
         ulimit -t 120
-        $CFG_QEMU_BIN -M ${{ matrix.config.qemu-machine }} $CFG_QEMU_OPT $CFG_QEMU_IMG -display none -nographic -semihosting -sd sdcard.img -netdev user,id=net0,hostfwd=tcp::5000-:5000 -device usb-net,netdev=net0
+        # Run QEMU with simulated network
+        $CFG_QEMU_BIN -M ${{ matrix.config.qemu-machine }} $CFG_QEMU_OPT $CFG_QEMU_IMG -display none -nographic -semihosting -sd sdcard.img -netdev \"user,id=net0,hostfwd=tcp::5000-:5000,guestfwd=tcp:10.0.2.100:5001-cmd:yes simulated server\" -device usb-net,netdev=net0

samples/05-smoketest/kernel.cpp

@@ -908,8 +908,6 @@ void CKernel::SocketTest(void)
             PErrorExit("close (fd) failed");
         }
 
-#if 0
-        // TODO this attempt to use connect() hangs.
         fd = socket(AF_INET, SOCK_STREAM, 0);
 
         if (fd == -1)
@@ -936,25 +934,26 @@ void CKernel::SocketTest(void)
         read_result = read(fd, buffer, sizeof(buffer));
         if (read_result < 0)
         {
-            PErrorExit("connect() failed");
+            PErrorExit("read() failed after connect");
         }
 
         Report("Read %d bytes from server", read_result);
 
         char const expected_data[] = "simulated server";
         if (strncmp(buffer, expected_data, sizeof(expected_data) - 1) != 0)
         {
-            Report("read() from socket returned unexpeted data");
+            Report("read() from socket returned unexpected data");
             exit(1);
         }
 
+        Report("Received expected data from server");
+
         if (close(fd) < 0)
         {
             PErrorExit("close (fd) failed");
         }
 
         Report("Read from client connection successful");
-#endif
     }
 
     Report("Basic socket lifecycle test successful");

samples/05-smoketest/socket_test.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# echo "Starting socat server in the background"
-
-#socat -U TCP4-LISTEN:5001 "EXEC:yes socat server" &
-
 echo "Waiting for QEMU to open socket 5000..."
 
 while ! nc -z localhost 5000; do