External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: remove unused helper for getting UNIX socket path

Browse Source 
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>
This commit is contained in:
Daniel P. Berrangé 2019-06-25 18:36:36 +01:00
parent 2879315d39
commit a1dd97cd8d
3 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -3234,7 +3234,6 @@ virGetHostnameQuiet;
virGetSelfLastChanged; virGetSelfLastChanged;
virGetSystemPageSize; virGetSystemPageSize;
virGetSystemPageSizeKB; virGetSystemPageSizeKB;
virGetUNIXSocketPath;
virGetUnprivSGIOSysfsPath; virGetUnprivSGIOSysfsPath;
virGetUserCacheDirectory; virGetUserCacheDirectory;
virGetUserConfigDirectory; virGetUserConfigDirectory;

44
src/util/virutil.c
View File

@ -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 #ifndef WIN32
long virGetSystemPageSize(void) long virGetSystemPageSize(void)
{ {

2
src/util/virutil.h
View File

@ -149,8 +149,6 @@ bool virIsSUID(void);
time_t virGetSelfLastChanged(void); time_t virGetSelfLastChanged(void);
void virUpdateSelfLastChanged(const char *path); void virUpdateSelfLastChanged(const char *path);
char *virGetUNIXSocketPath(int fd);
long virGetSystemPageSize(void) ATTRIBUTE_NOINLINE; long virGetSystemPageSize(void) ATTRIBUTE_NOINLINE;
long virGetSystemPageSizeKB(void) ATTRIBUTE_NOINLINE; long virGetSystemPageSizeKB(void) ATTRIBUTE_NOINLINE;