Update upstream source from tag 'upstream/1.34.0'

Update to upstream version '1.34.0'
with Debian dir b598c27ee9cef517760bc745aa6a3bb7d9fb2ecb

1 files changed, 56 insertions, 0 deletions

diff --git a/src/libnm-base/nm-priv-helper-utils.c b/src/libnm-base/nm-priv-helper-utils.c
new file mode 100644
index 00000000..8e6e4075
--- /dev/null
+++ b/src/libnm-base/nm-priv-helper-utils.c
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
+
+#include "nm-priv-helper-utils.h"
+
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include "libnm-glib-aux/nm-io-utils.h"
+
+/*****************************************************************************/
+
+int
+nm_priv_helper_utils_open_fd(NMPrivHelperGetFDType fd_type, GError **error)
+{
+    nm_auto_close int fd = -1;
+    int               r;
+    int               errsv;
+
+    switch (fd_type) {
+    case NM_PRIV_HELPER_GET_FD_TYPE_OVSDB_SOCKET:
+    {
+        struct sockaddr_un sock;
+        int                sock_len;
+
+        G_STATIC_ASSERT_EXPR(NM_STRLEN(NM_OVSDB_SOCKET) + 1 < sizeof(sock.sun_path));
+        sock_len = nm_io_sockaddr_un_set(&sock, FALSE, NM_OVSDB_SOCKET);
+        nm_assert(sock_len > 0);
+
+        fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+        if (fd < 0) {
+            errsv = NM_ERRNO_NATIVE(errno);
+            g_set_error(error, G_IO_ERROR, g_io_error_from_errno(errsv), "error creating socket");
+            return -errsv;
+        }
+
+        r = connect(fd, (const struct sockaddr *) &sock, sock_len);
+        if (r != 0) {
+            errsv = NM_ERRNO_NATIVE(errno);
+            g_set_error(error,
+                        G_IO_ERROR,
+                        g_io_error_from_errno(errsv),
+                        "error connecting socket (%s)",
+                        nm_strerror_native(errsv));
+            return -errsv;
+        }
+
+        return nm_steal_fd(&fd);
+    }
+    case NM_PRIV_HELPER_GET_FD_TYPE_NONE:
+    default:
+        nm_utils_error_set(error, NM_UTILS_ERROR_UNKNOWN, "invalid fd_type");
+        return -EINVAL;
+    }
+}