build: remove cnxk support from dpdk external deps

[vpp.git] / src / vppinfra / socket.c

diff --git a/src/vppinfra/socket.c b/src/vppinfra/socket.c
index 3226061..a3024ae 100644 (file)
--- a/src/vppinfra/socket.c
+++ b/src/vppinfra/socket.c
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include <string.h>            /* strchr */
 #define __USE_GNU
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -51,9 +52,15 @@
 #include <vppinfra/mem.h>
 #include <vppinfra/vec.h>
 #include <vppinfra/socket.h>
+#include <vppinfra/linux/netns.h>
 #include <vppinfra/format.h>
 #include <vppinfra/error.h>
 
+#ifndef __GLIBC__
+/* IPPORT_USERRESERVED is not part of musl libc. */
+#define IPPORT_USERRESERVED 5000
+#endif
+
 __clib_export void
 clib_socket_tx_add_formatted (clib_socket_t * s, char *fmt, ...)
 {
@@ -107,6 +114,18 @@ socket_config (char *config,
       *addr_len = sizeof (su[0]);
     }
 
+  /* Treat everything that starts with @ as an abstract socket. */
+  else if (config[0] == '@')
+    {
+      struct sockaddr_un *su = addr;
+      su->sun_family = PF_LOCAL;
+      clib_memcpy (&su->sun_path, config,
+                  clib_min (sizeof (su->sun_path), 1 + strlen (config)));
+
+      *addr_len = sizeof (su->sun_family) + strlen (config);
+      su->sun_path[0] = '\0';
+    }
+
   /* Hostname or hostname:port or port. */
   else
     {
@@ -211,7 +230,7 @@ default_socket_write (clib_socket_t * s)
   else if (written > 0)
     {
       if (written == tx_len)
-       _vec_len (s->tx_buffer) = 0;
+       vec_set_len (s->tx_buffer, 0);
       else
        vec_delete (s->tx_buffer, written, 0);
     }
@@ -259,7 +278,7 @@ default_socket_read (clib_socket_t * sock, int n_bytes)
     sock->flags |= CLIB_SOCKET_F_RX_END_OF_FILE;
 
 non_fatal:
-  _vec_len (sock->rx_buffer) += n_read - n_bytes;
+  vec_inc_len (sock->rx_buffer, n_read - n_bytes);
 
   return 0;
 }
@@ -434,7 +453,8 @@ clib_socket_init (clib_socket_t * s)
              need_bind = 0;
            }
        }
-      if (addr.sa.sa_family == PF_LOCAL)
+      if (addr.sa.sa_family == PF_LOCAL &&
+         ((struct sockaddr_un *) &addr)->sun_path[0] != 0)
        unlink (((struct sockaddr_un *) &addr)->sun_path);
 
       /* Make address available for multiple users. */
@@ -471,8 +491,9 @@ clib_socket_init (clib_socket_t * s)
                                          s->fd, s->config);
          goto done;
        }
-      if (addr.sa.sa_family == PF_LOCAL
-         && s->flags & CLIB_SOCKET_F_ALLOW_GROUP_WRITE)
+      if (addr.sa.sa_family == PF_LOCAL &&
+         s->flags & CLIB_SOCKET_F_ALLOW_GROUP_WRITE &&
+         ((struct sockaddr_un *) &addr)->sun_path[0] != 0)
        {
          struct stat st = { 0 };
          if (stat (((struct sockaddr_un *) &addr)->sun_path, &st) < 0)
@@ -512,6 +533,16 @@ clib_socket_init (clib_socket_t * s)
                                          s->fd, s->config);
          goto done;
        }
+      /* Connect was blocking so set fd to non-blocking now unless
+       * blocking mode explicitly requested. */
+      if (!(s->flags & CLIB_SOCKET_F_NON_BLOCKING_CONNECT) &&
+         !(s->flags & CLIB_SOCKET_F_BLOCKING) &&
+         fcntl (s->fd, F_SETFL, O_NONBLOCK) < 0)
+       {
+         error = clib_error_return_unix (0, "fcntl NONBLOCK2 (fd %d, '%s')",
+                                         s->fd, s->config);
+         goto done;
+       }
     }
 
   return error;
@@ -522,6 +553,45 @@ done:
   return error;
 }
 
+__clib_export clib_error_t *
+clib_socket_init_netns (clib_socket_t *s, u8 *namespace)
+{
+  if (namespace == NULL || namespace[0] == 0)
+    return clib_socket_init (s);
+
+  clib_error_t *error;
+  int old_netns_fd, nfd = -1;
+
+  old_netns_fd = clib_netns_open (NULL /* self */);
+  if (old_netns_fd < 0)
+    return clib_error_return_unix (0, "get current netns failed");
+
+  if ((nfd = clib_netns_open (namespace)) == -1)
+    {
+      error = clib_error_return_unix (0, "clib_netns_open '%s'", namespace);
+      goto done;
+    }
+
+  if (clib_setns (nfd) == -1)
+    {
+      error = clib_error_return_unix (0, "setns '%s'", namespace);
+      goto done;
+    }
+
+  error = clib_socket_init (s);
+
+done:
+  if (clib_setns (old_netns_fd) == -1)
+    clib_warning ("Cannot set old ns");
+
+  close (old_netns_fd);
+
+  if (-1 != nfd)
+    close (nfd);
+
+  return error;
+}
+
 __clib_export clib_error_t *
 clib_socket_accept (clib_socket_t * server, clib_socket_t * client)
 {