[PATCH net v3 4/6] vsock/test: Introduce vsock_connect_fd()

[Michal Luczaj]

Distill timeout-guarded vsock_connect_fd(). Adapt callers.

Suggested-by: Stefano Garzarella <sgarz...@redhat.com>
Reviewed-by: Stefano Garzarella <sgarz...@redhat.com>
Signed-off-by: Michal Luczaj <m...@rbox.co>
---
 tools/testing/vsock/util.c | 45 +++++++++++++++++----------------------------
 tools/testing/vsock/util.h |  1 +
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c
index 
6e36f9371532cfc75dd14131b84bf8393ca0952b..de25892f865f07672da0886be8bd1a429ade8b05
 100644
--- a/tools/testing/vsock/util.c
+++ b/tools/testing/vsock/util.c
@@ -120,27 +120,33 @@ int vsock_bind(unsigned int cid, unsigned int port, int 
type)
        return fd;
 }
 
-/* Bind to <bind_port>, connect to <cid, port> and return the file descriptor. 
*/
-int vsock_bind_connect(unsigned int cid, unsigned int port, unsigned int 
bind_port, int type)
+int vsock_connect_fd(int fd, unsigned int cid, unsigned int port)
 {
-       struct sockaddr_vm sa_server = {
+       struct sockaddr_vm sa = {
                .svm_family = AF_VSOCK,
                .svm_cid = cid,
                .svm_port = port,
        };
-
-       int client_fd, ret;
-
-       client_fd = vsock_bind(VMADDR_CID_ANY, bind_port, type);
+       int ret;
 
        timeout_begin(TIMEOUT);
        do {
-               ret = connect(client_fd, (struct sockaddr *)&sa_server, 
sizeof(sa_server));
+               ret = connect(fd, (struct sockaddr *)&sa, sizeof(sa));
                timeout_check("connect");
        } while (ret < 0 && errno == EINTR);
        timeout_end();
 
-       if (ret < 0) {
+       return ret;
+}
+
+/* Bind to <bind_port>, connect to <cid, port> and return the file descriptor. 
*/
+int vsock_bind_connect(unsigned int cid, unsigned int port, unsigned int 
bind_port, int type)
+{
+       int client_fd;
+
+       client_fd = vsock_bind(VMADDR_CID_ANY, bind_port, type);
+
+       if (vsock_connect_fd(client_fd, cid, port)) {
                perror("connect");
                exit(EXIT_FAILURE);
        }
@@ -151,17 +157,6 @@ int vsock_bind_connect(unsigned int cid, unsigned int 
port, unsigned int bind_po
 /* Connect to <cid, port> and return the file descriptor. */
 int vsock_connect(unsigned int cid, unsigned int port, int type)
 {
-       union {
-               struct sockaddr sa;
-               struct sockaddr_vm svm;
-       } addr = {
-               .svm = {
-                       .svm_family = AF_VSOCK,
-                       .svm_port = port,
-                       .svm_cid = cid,
-               },
-       };
-       int ret;
        int fd;
 
        control_expectln("LISTENING");
@@ -172,20 +167,14 @@ int vsock_connect(unsigned int cid, unsigned int port, 
int type)
                exit(EXIT_FAILURE);
        }
 
-       timeout_begin(TIMEOUT);
-       do {
-               ret = connect(fd, &addr.sa, sizeof(addr.svm));
-               timeout_check("connect");
-       } while (ret < 0 && errno == EINTR);
-       timeout_end();
-
-       if (ret < 0) {
+       if (vsock_connect_fd(fd, cid, port)) {
                int old_errno = errno;
 
                close(fd);
                fd = -1;
                errno = old_errno;
        }
+
        return fd;
 }
 
diff --git a/tools/testing/vsock/util.h b/tools/testing/vsock/util.h
index 
077842905bc3e7a4bbd22caba4b7bde976de2718..d1f765ce3eeeed8f738630846bb47c4f3f6f946f
 100644
--- a/tools/testing/vsock/util.h
+++ b/tools/testing/vsock/util.h
@@ -39,6 +39,7 @@ struct test_case {
 void init_signals(void);
 unsigned int parse_cid(const char *str);
 unsigned int parse_port(const char *str);
+int vsock_connect_fd(int fd, unsigned int cid, unsigned int port);
 int vsock_connect(unsigned int cid, unsigned int port, int type);
 int vsock_accept(unsigned int cid, unsigned int port,
                 struct sockaddr_vm *clientaddrp, int type);

-- 
2.48.1