feat: make the vsock helper take a protocol param

- can be stream or seqpacket. to facilitate seqpacket testing

Signed-off-by: aerosouund <aerosound161@gmail.com>

Author: aerosouund

tests/host_tools/vsock_helper.c

@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
+#include <signal.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
@@ -23,13 +24,15 @@
 #define BUF_SIZE (16 * 1024)
 #define SERVER_ACCEPT_BACKLOG 128
 
+volatile int connection_socket;
 
 int print_usage() {
-    fprintf(stderr, "Usage: ./vsock-helper echo <cid> <port>\n");
+    fprintf(stderr, "Usage: ./vsock-helper echo <cid> <port> [stream|seqpacket]\n");
     fprintf(stderr, "\n");
     fprintf(stderr, "  echo          connect to an echo server, listening on CID:port.\n");
     fprintf(stderr, "                STDIN will be piped through to the echo server, and\n");
     fprintf(stderr, "                data coming from the server will pe sent to STDOUT.\n");
+    fprintf(stderr, "  stream|seqpacket  socket type (default: stream)\n");
     fprintf(stderr, "\n");
     return -1;
 }
@@ -53,9 +56,9 @@ int xfer(int src_fd, int dst_fd) {
 }
 
 
-int run_echo(uint32_t cid, uint32_t port) {
+int run_echo(uint32_t cid, uint32_t port, int sock_type) {
 
-    int sock = socket(AF_VSOCK, SOCK_STREAM, 0);
+    int sock = socket(AF_VSOCK, sock_type, 0);
     if (sock < 0) {
         perror("socket()");
         return -1;
@@ -71,6 +74,8 @@ int run_echo(uint32_t cid, uint32_t port) {
         return -1;
     }
 
+    connection_socket = sock;
+
     for (;;) {
         int ping_cnt = xfer(STDIN_FILENO, sock);
         if (!ping_cnt) break;
@@ -87,23 +92,41 @@ int run_echo(uint32_t cid, uint32_t port) {
     return close(sock);
 }
 
+void stop_server_loop(int sig) {
+    close(connection_socket);
+}
+
 
 int main(int argc, char **argv) {
+    signal(SIGTERM, stop_server_loop);
+    signal(SIGINT, stop_server_loop);
 
     if (argc < 3) {
         return print_usage();
     }
 
     if (strcmp(argv[1], "echo") == 0) {
-        if (argc != 4) {
+        if (argc < 4 || argc > 5) {
             return print_usage();
         }
         uint32_t cid = atoi(argv[2]);
         uint32_t port = atoi(argv[3]);
         if (!cid || !port) {
             return print_usage();
         }
-        return run_echo(cid, port);
+
+        int sock_type = SOCK_STREAM;
+        if (argc == 5) {
+            if (strcmp(argv[4], "seqpacket") == 0) {
+                sock_type = SOCK_SEQPACKET;
+            } else if (strcmp(argv[4], "stream") == 0) {
+                sock_type = SOCK_STREAM;
+            } else {
+                return print_usage();
+            }
+        }
+
+        return run_echo(cid, port, sock_type);
     }
 
     return print_usage();