From: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue, 25 Jun 2019 17:36:36 +0000 (+0100)
Subject: util: remove unused helper for getting UNIX socket path
X-Git-Tag: v5.6.0-rc1~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1dd97cd8d831dd2a4cd4ee16c56b2d2135b1784;p=thirdparty%2Flibvirt.git

util: remove unused helper for getting UNIX socket path

The new systemd activation APIs mean there is no longer a need to get
the UNIX socket path associated with a plain FD.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 11134e2e34..7dfa5af3b3 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3234,7 +3234,6 @@ virGetHostnameQuiet;
 virGetSelfLastChanged;
 virGetSystemPageSize;
 virGetSystemPageSizeKB;
-virGetUNIXSocketPath;
 virGetUnprivSGIOSysfsPath;
 virGetUserCacheDirectory;
 virGetUserConfigDirectory;
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 4bd719127b..019009be8c 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1785,50 +1785,6 @@ void virUpdateSelfLastChanged(const char *path)
 }
 
 
-#ifdef HAVE_SYS_UN_H
-char *virGetUNIXSocketPath(int fd)
-{
-    union {
-        struct sockaddr sa;
-        struct sockaddr_storage ss;
-        struct sockaddr_un un;
-    } addr = { .ss = { 0 } };
-    socklen_t len = sizeof(addr.ss);
-    char *path;
-
-    if (getsockname(fd, &addr.sa, &len) < 0) {
-        virReportSystemError(errno, _("Unable to get address of FD %d"), fd);
-        return NULL;
-    }
-
-    if (addr.ss.ss_family != AF_UNIX) {
-        virReportSystemError(EINVAL, _("FD %d is not a UNIX socket, has af=%d"),
-                             fd, addr.ss.ss_family);
-        return NULL;
-    }
-
-    if (addr.un.sun_path[0] == '\0')
-        addr.un.sun_path[0] = '@';
-
-    if (VIR_ALLOC_N(path, sizeof(addr.un.sun_path) + 1) < 0)
-        return NULL;
-
-    memcpy(path, addr.un.sun_path, sizeof(addr.un.sun_path));
-    path[sizeof(addr.un.sun_path)] = '\0';
-    return path;
-}
-
-#else /* HAVE_SYS_UN_H */
-
-char *virGetUNIXSocketPath(int fd ATTRIBUTE_UNUSED)
-{
-    virReportSystemError(ENOSYS, "%s",
-                         _("UNIX sockets not supported on this platform"));
-    return NULL;
-}
-
-#endif /* HAVE_SYS_UN_H */
-
 #ifndef WIN32
 long virGetSystemPageSize(void)
 {
diff --git a/src/util/virutil.h b/src/util/virutil.h
index b9715e5e66..7ea702f27a 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -149,8 +149,6 @@ bool virIsSUID(void);
 time_t virGetSelfLastChanged(void);
 void virUpdateSelfLastChanged(const char *path);
 
-char *virGetUNIXSocketPath(int fd);
-
 long virGetSystemPageSize(void) ATTRIBUTE_NOINLINE;
 long virGetSystemPageSizeKB(void) ATTRIBUTE_NOINLINE;