[libvirt] [PATCH 03/12] Introduce a generic object for using network sockets
Daniel P. Berrange
berrange at redhat.com
Fri Mar 18 18:54:18 UTC 2011
Introduces a simple wrapper around the raw POSIX sockets APIs
and name resolution APIs. Allows for easy creation of client
and server sockets with correct usage of name resolution APIs
for protocol agnostic socket setup.
It can listen for UNIX and TCP stream sockets.
It can connect to UNIX, TCP streams directly, or indirectly
to UNIX sockets via an SSH tunnel or external command
* src/Makefile.am: Add to libvirt-net-rpc.la
* src/rpc/virnetsocket.c, src/rpc/virnetsocket.h: Generic
sockets APIs
---
.x-sc_avoid_write | 1 +
cfg.mk | 1 +
configure.ac | 2 +-
po/POTFILES.in | 1 +
src/Makefile.am | 3 +-
src/rpc/virnetsocket.c | 835 ++++++++++++++++++++++++++++++++++++++++++++++++
src/rpc/virnetsocket.h | 107 ++++++
7 files changed, 948 insertions(+), 2 deletions(-)
create mode 100644 src/rpc/virnetsocket.c
create mode 100644 src/rpc/virnetsocket.h
diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write
index f6fc1b2..303c940 100644
--- a/.x-sc_avoid_write
+++ b/.x-sc_avoid_write
@@ -1,6 +1,7 @@
^src/libvirt\.c$
^src/fdstream\.c$
^src/qemu/qemu_monitor\.c$
+^src/rpc/virnetsocket\.c$
^src/util/command\.c$
^src/util/util\.c$
^src/xen/xend_internal\.c$
diff --git a/cfg.mk b/cfg.mk
index dc8ed01..95bbd0e 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -115,6 +115,7 @@ useless_free_options = \
--name=virJSONValueFree \
--name=virLastErrFreeData \
--name=virNetMessageFree \
+ --name=virNetSocketFree \
--name=virNWFilterDefFree \
--name=virNWFilterEntryFree \
--name=virNWFilterHashTableFree \
diff --git a/configure.ac b/configure.ac
index 9d8862c..62e64dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ LIBS=$old_libs
dnl Availability of various common headers (non-fatal if missing).
AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/un.h \
sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \
- sys/un.h sys/syscall.h])
+ sys/un.h sys/syscall.h netinet/tcp.h])
AC_CHECK_LIB([intl],[gettext],[])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 187d056..b99aa29 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -67,6 +67,7 @@ src/qemu/qemu_monitor_text.c
src/qemu/qemu_process.c
src/remote/remote_driver.c
src/rpc/virnetmessage.c
+src/rpc/virnetsocket.c
src/secret/secret_driver.c
src/security/security_apparmor.c
src/security/security_dac.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 0ddbf24..1dc3819 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1227,7 +1227,8 @@ noinst_LTLIBRARIES += libvirt-net-rpc.la
libvirt_net_rpc_la_SOURCES = \
rpc/virnetmessage.h rpc/virnetmessage.c \
- rpc/virnetprotocol.h rpc/virnetprotocol.c
+ rpc/virnetprotocol.h rpc/virnetprotocol.c \
+ rpc/virnetsocket.h rpc/virnetsocket.c
libvirt_net_rpc_la_CFLAGS = \
$(AM_CFLAGS)
libvirt_net_rpc_la_LDFLAGS = \
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
new file mode 100644
index 0000000..6855397
--- /dev/null
+++ b/src/rpc/virnetsocket.c
@@ -0,0 +1,835 @@
+/*
+ * virnetsocket.c: generic network socket handling
+ *
+ * Copyright (C) 2006-2011 Red Hat, Inc.
+ * Copyright (C) 2006 Daniel P. Berrange
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Daniel P. Berrange <berrange at redhat.com>
+ */
+
+#include <config.h>
+
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#ifdef HAVE_NETINET_TCP_H
+# include <netinet/tcp.h>
+#endif
+
+#include "virnetsocket.h"
+#include "util.h"
+#include "memory.h"
+#include "virterror_internal.h"
+#include "logging.h"
+#include "files.h"
+#include "event.h"
+
+#define VIR_FROM_THIS VIR_FROM_RPC
+
+#define virNetError(code, ...) \
+ virReportErrorHelper(NULL, VIR_FROM_RPC, code, __FILE__, \
+ __FUNCTION__, __LINE__, __VA_ARGS__)
+
+
+struct _virNetSocket {
+ int fd;
+ int watch;
+ pid_t pid;
+ int errfd;
+ bool client;
+ virNetSocketIOFunc func;
+ void *opaque;
+ virSocketAddr localAddr;
+ virSocketAddr remoteAddr;
+ char *localAddrStr;
+ char *remoteAddrStr;
+};
+
+
+#ifndef WIN32
+static int virNetSocketForkDaemon(const char *binary)
+{
+ int ret;
+ virCommandPtr cmd = virCommandNewArgList(binary,
+ "--timeout=30",
+ NULL);
+
+ virCommandAddEnvPassCommon(cmd);
+ virCommandClearCaps(cmd);
+ virCommandDaemonize(cmd);
+ ret = virCommandRun(cmd, NULL);
+ virCommandFree(cmd);
+ return ret;
+}
+#endif
+
+
+static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
+ virSocketAddrPtr remoteAddr,
+ bool isClient,
+ int fd, int errfd, pid_t pid)
+{
+ virNetSocketPtr sock;
+ int no_slow_start = 1;
+
+ VIR_DEBUG("localAddr=%p remoteAddr=%p fd=%d errfd=%d pid=%d",
+ localAddr, remoteAddr,
+ fd, errfd, pid);
+
+ if (virSetCloseExec(fd) < 0) {
+ virReportSystemError(errno, "%s",
+ _("Unable to set close-on-exec flag"));
+ return NULL;
+ }
+ if (virSetNonBlock(fd) < 0) {
+ virReportSystemError(errno, "%s",
+ _("Unable to enable non-blocking flag"));
+ return NULL;
+ }
+
+ if (VIR_ALLOC(sock) < 0) {
+ virReportOOMError();
+ return NULL;
+ }
+
+ if (localAddr)
+ sock->localAddr = *localAddr;
+ if (remoteAddr)
+ sock->remoteAddr = *remoteAddr;
+ sock->fd = fd;
+ sock->errfd = errfd;
+ sock->pid = pid;
+
+ /* Disable nagle for TCP sockets */
+ if (sock->localAddr.data.sa.sa_family == AF_INET ||
+ sock->localAddr.data.sa.sa_family == AF_INET6) {
+ if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
+ &no_slow_start,
+ sizeof(no_slow_start)) < 0) {
+ virReportSystemError(errno, "%s",
+ _("Unable to disable nagle algorithm"));
+ goto error;
+ }
+ }
+
+
+ if (localAddr &&
+ !(sock->localAddrStr = virSocketFormatAddrFull(localAddr, true, ";")))
+ goto error;
+
+ if (remoteAddr &&
+ !(sock->remoteAddrStr = virSocketFormatAddrFull(remoteAddr, true, ";")))
+ goto error;
+
+ sock->client = isClient;
+
+ VIR_DEBUG("sock=%p localAddrStr=%s remoteAddrStr=%s",
+ sock, NULLSTR(sock->localAddrStr), NULLSTR(sock->remoteAddrStr));
+
+ return sock;
+
+error:
+ sock->fd = sock->errfd = -1; /* Caller owns fd/errfd on failure */
+ virNetSocketFree(sock);
+ return NULL;
+}
+
+
+int virNetSocketNewListenTCP(const char *nodename,
+ const char *service,
+ virNetSocketPtr **retsocks,
+ size_t *nretsocks)
+{
+ virNetSocketPtr *socks = NULL;
+ size_t nsocks = 0;
+ struct addrinfo *ai = NULL;
+ struct addrinfo hints;
+ int fd = -1;
+ int i;
+
+ *retsocks = NULL;
+ *nretsocks = 0;
+
+ memset(&hints, 0, sizeof hints);
+ hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+ hints.ai_socktype = SOCK_STREAM;
+
+ int e = getaddrinfo(nodename, service, &hints, &ai);
+ if (e != 0) {
+ virNetError(VIR_ERR_SYSTEM_ERROR,
+ _("Unable to resolve address '%s' service '%s': %s"),
+ nodename, service, gai_strerror(e));
+ return -1;
+ }
+
+ struct addrinfo *runp = ai;
+ while (runp) {
+ virSocketAddr addr;
+
+ memset(&addr, 0, sizeof(addr));
+
+ if ((fd = socket(runp->ai_family, runp->ai_socktype,
+ runp->ai_protocol)) < 0) {
+ virReportSystemError(errno, "%s", _("Unable to create socket"));
+ goto error;
+ }
+
+ int opt = 1;
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof opt) < 0) {
+ virReportSystemError(errno, "%s", _("Unable to enable port reuse"));
+ goto error;
+ }
+
+#ifdef IPV6_V6ONLY
+ if (runp->ai_family == PF_INET6) {
+ int on = 1;
+ /*
+ * Normally on Linux an INET6 socket will bind to the INET4
+ * address too. If getaddrinfo returns results with INET4
+ * first though, this will result in INET6 binding failing.
+ * We can trivially cope with multiple server sockets, so
+ * we force it to only listen on IPv6
+ */
+ if (setsockopt(fd, IPPROTO_IPV6,IPV6_V6ONLY,
+ (void*)&on, sizeof on) < 0) {
+ virReportSystemError(errno, "%s",
+ _("Unable to force bind to IPv6 only"));
+ goto error;
+ }
+ }
+#endif
+
+ if (bind(fd, runp->ai_addr, runp->ai_addrlen) < 0) {
+ if (errno != EADDRINUSE) {
+ virReportSystemError(errno, "%s", _("Unable to bind to port"));
+ goto error;
+ }
+ VIR_FORCE_CLOSE(fd);
+ continue;
+ }
+
+ addr.len = sizeof(addr.data);
+ if (getsockname(fd, &addr.data.sa, &addr.len) < 0) {
+ virReportSystemError(errno, "%s", _("Unable to get local socket name"));
+ goto error;
+ }
+
+ VIR_DEBUG("%p f=%d f=%d", &addr, runp->ai_family, addr.data.sa.sa_family);
+
+ if (VIR_EXPAND_N(socks, nsocks, 1) < 0) {
+ virReportOOMError();
+ goto error;
+ }
+
+ if (!(socks[nsocks-1] = virNetSocketNew(&addr, NULL, false, fd, -1, 0)))
+ goto error;
+ runp = runp->ai_next;
+ fd = -1;
+ }
+
+ freeaddrinfo(ai);
+
+ *retsocks = socks;
+ *nretsocks = nsocks;
+ return 0;
+
+error:
+ for (i = 0 ; i < nsocks ; i++)
+ virNetSocketFree(socks[i]);
+ VIR_FREE(socks);
+ freeaddrinfo(ai);
+ VIR_FORCE_CLOSE(fd);
+ return -1;
+}
+
+
+#if HAVE_SYS_UN_H
+int virNetSocketNewListenUNIX(const char *path,
+ mode_t mask,
+ gid_t grp,
+ virNetSocketPtr *retsock)
+{
+ virSocketAddr addr;
+ mode_t oldmask;
+ int fd;
+
+ *retsock = NULL;
+
+ memset(&addr, 0, sizeof(addr));
+
+ addr.len = sizeof(addr.data.un);
+
+ if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+ virReportSystemError(errno, "%s", _("Failed to create socket"));
+ goto error;
+ }
+
+ addr.data.un.sun_family = AF_UNIX;
+ if (virStrcpyStatic(addr.data.un.sun_path, path) == NULL) {
+ virReportSystemError(ENOMEM, _("Path %s too long for unix socket"), path);
+ goto error;
+ }
+ if (addr.data.un.sun_path[0] == '@')
+ addr.data.un.sun_path[0] = '\0';
+ else
+ unlink(addr.data.un.sun_path);
+
+ oldmask = umask(~mask);
+
+ if (bind(fd, &addr.data.sa, addr.len) < 0) {
+ virReportSystemError(errno,
+ _("Failed to bind socket to '%s'"),
+ path);
+ goto error;
+ }
+ umask(oldmask);
+
+ /* chown() doesn't work for abstract sockets but we use them only
+ * if libvirtd runs unprivileged
+ */
+ if (grp != 0 && chown(path, -1, grp)) {
+ virReportSystemError(errno,
+ _("Failed to change group ID of '%s' to %d"),
+ path, grp);
+ goto error;
+ }
+
+ if (!(*retsock = virNetSocketNew(&addr, NULL, false, fd, -1, 0)))
+ goto error;
+
+ return 0;
+
+error:
+ if (path[0] != '@')
+ unlink(path);
+ VIR_FORCE_CLOSE(fd);
+ return -1;
+}
+#else
+int virNetSocketNewListenUNIX(const char *path ATTRIBUTE_UNUSED,
+ mode_t mask ATTRIBUTE_UNUSED,
+ gid_t grp ATTRIBUTE_UNUSED,
+ virNetSocketPtr *retsock ATTRIBUTE_UNUSED)
+{
+ virReportSystemError(ENOSYS, "%s",
+ _("UNIX sockets are not supported on this platform"));
+ return -1;
+}
+#endif
+
+
+int virNetSocketNewConnectTCP(const char *nodename,
+ const char *service,
+ virNetSocketPtr *retsock)
+{
+ struct addrinfo *ai = NULL;
+ struct addrinfo hints;
+ int fd = -1;
+ virSocketAddr localAddr;
+ virSocketAddr remoteAddr;
+ struct addrinfo *runp;
+ int savedErrno = ENOENT;
+
+ *retsock = NULL;
+
+ memset(&localAddr, 0, sizeof(localAddr));
+ memset(&remoteAddr, 0, sizeof(remoteAddr));
+
+ memset(&hints, 0, sizeof hints);
+ hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+ hints.ai_socktype = SOCK_STREAM;
+
+ int e = getaddrinfo(nodename, service, &hints, &ai);
+ if (e != 0) {
+ virNetError(VIR_ERR_SYSTEM_ERROR,
+ _("Unable to resolve address '%s' service '%s': %s"),
+ nodename, service, gai_strerror (e));
+ return -1;
+ }
+
+ runp = ai;
+ while (runp) {
+ int opt = 1;
+
+ if ((fd = socket(runp->ai_family, runp->ai_socktype,
+ runp->ai_protocol)) < 0) {
+ virReportSystemError(errno, "%s", _("Unable to create socket"));
+ goto error;
+ }
+
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof opt);
+
+ if (connect(fd, runp->ai_addr, runp->ai_addrlen) >= 0)
+ break;
+
+ savedErrno = errno;
+ VIR_FORCE_CLOSE(fd);
+ runp = runp->ai_next;
+ }
+
+ if (fd == -1) {
+ virReportSystemError(savedErrno,
+ _("unable to connect to server at '%s:%s'"),
+ nodename, service);
+ goto error;
+ }
+
+ localAddr.len = sizeof(localAddr.data);
+ if (getsockname(fd, &localAddr.data.sa, &localAddr.len) < 0) {
+ virReportSystemError(errno, "%s", _("Unable to get local socket name"));
+ goto error;
+ }
+
+ remoteAddr.len = sizeof(remoteAddr.data);
+ if (getpeername(fd, &remoteAddr.data.sa, &remoteAddr.len) < 0) {
+ virReportSystemError(errno, "%s", _("Unable to get remote socket name"));
+ goto error;
+ }
+
+ if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, 0)))
+ goto error;
+
+ freeaddrinfo(ai);
+
+ return 0;
+
+error:
+ freeaddrinfo(ai);
+ VIR_FORCE_CLOSE(fd);
+ return -1;
+}
+
+
+#if HAVE_SYS_UN_H
+int virNetSocketNewConnectUNIX(const char *path,
+ bool spawnDaemon,
+ const char *binary,
+ virNetSocketPtr *retsock)
+{
+ virSocketAddr localAddr;
+ virSocketAddr remoteAddr;
+ int fd;
+ int retries = 0;
+
+ memset(&localAddr, 0, sizeof(localAddr));
+ memset(&remoteAddr, 0, sizeof(remoteAddr));
+
+ remoteAddr.len = sizeof(remoteAddr.data.un);
+
+ if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+ virReportSystemError(errno, "%s", _("Failed to create socket"));
+ goto error;
+ }
+
+ remoteAddr.data.un.sun_family = AF_UNIX;
+ if (virStrcpyStatic(remoteAddr.data.un.sun_path, path) == NULL) {
+ virReportSystemError(ENOMEM, _("Path %s too long for unix socket"), path);
+ goto error;
+ }
+ if (remoteAddr.data.un.sun_path[0] == '@')
+ remoteAddr.data.un.sun_path[0] = '\0';
+
+retry:
+ if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) {
+ if (errno == ECONNREFUSED && spawnDaemon && retries < 20) {
+ if (retries == 0 &&
+ virNetSocketForkDaemon(binary) < 0)
+ goto error;
+
+ retries++;
+ usleep(1000 * 100 * retries);
+ goto retry;
+ }
+
+ virReportSystemError(errno,
+ _("Failed to connect socket to '%s'"),
+ path);
+ goto error;
+ }
+
+ localAddr.len = sizeof(localAddr.data);
+ if (getsockname(fd, &localAddr.data.sa, &localAddr.len) < 0) {
+ virReportSystemError(errno, "%s", _("Unable to get local socket name"));
+ goto error;
+ }
+
+ if (!(*retsock = virNetSocketNew(&localAddr, &remoteAddr, true, fd, -1, 0)))
+ goto error;
+
+ return 0;
+
+error:
+ VIR_FORCE_CLOSE(fd);
+ return -1;
+}
+#else
+int virNetSocketNewConnectUNIX(const char *path ATTRIBUTE_UNUSED,
+ bool spawnDaemon ATTRIBUTE_UNUSED,
+ const char *binary ATTRIBUTE_UNUSED,
+ virNetSocketPtr *retsock ATTRIBUTE_UNUSED)
+{
+ virReportSystemError(ENOSYS, "%s",
+ _("UNIX sockets are not supported on this platform"));
+ return -1;
+}
+#endif
+
+
+#ifndef WIN32
+int virNetSocketNewConnectCommand(virCommandPtr cmd,
+ virNetSocketPtr *retsock)
+{
+ pid_t pid = 0;
+ int sv[2];
+ int errfd[2];
+
+ *retsock = NULL;
+
+ /* Fork off the external process. Use socketpair to create a private
+ * (unnamed) Unix domain socket to the child process so we don't have
+ * to faff around with two file descriptors (a la 'pipe(2)').
+ */
+ if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) < 0) {
+ virReportSystemError(errno, "%s",
+ _("unable to create socket pair"));
+ goto error;
+ }
+
+ if (pipe(errfd) < 0) {
+ virReportSystemError(errno, "%s",
+ _("unable to create socket pair"));
+ goto error;
+ }
+
+ virCommandSetInputFD(cmd, sv[1]);
+ virCommandSetOutputFD(cmd, &sv[1]);
+ virCommandSetErrorFD(cmd, &errfd[1]);
+
+ if (virCommandRunAsync(cmd, &pid) < 0)
+ goto error;
+
+ /* Parent continues here. */
+ VIR_FORCE_CLOSE(sv[1]);
+ VIR_FORCE_CLOSE(errfd[1]);
+
+ if (!(*retsock = virNetSocketNew(NULL, NULL, true, sv[0], errfd[0], pid)))
+ goto error;
+
+ virCommandFree(cmd);
+
+ return 0;
+
+error:
+ VIR_FORCE_CLOSE(sv[0]);
+ VIR_FORCE_CLOSE(sv[1]);
+ VIR_FORCE_CLOSE(errfd[0]);
+ VIR_FORCE_CLOSE(errfd[1]);
+
+ if (pid > 0) {
+ kill(pid, SIGTERM);
+ if (virCommandWait(cmd, NULL) < 0) {
+ kill(pid, SIGKILL);
+ if (virCommandWait(cmd, NULL) < 0) {
+ VIR_WARN("Unable to wait for command %d", pid);
+ }
+ }
+ }
+
+ virCommandFree(cmd);
+
+ return -1;
+}
+#else
+int virNetSocketNewConnectCommand(virCommandPtr cmd ATTRIBUTE_UNUSED,
+ virNetSocketPtr *retsock ATTRIBUTE_UNUSED)
+{
+ virReportSystemError(errno, "%s",
+ _("Tunnelling sockets not supported on this platform"));
+ return -1;
+}
+#endif
+
+int virNetSocketNewConnectSSH(const char *nodename,
+ const char *service,
+ const char *binary,
+ const char *username,
+ bool noTTY,
+ const char *netcat,
+ const char *path,
+ virNetSocketPtr *retsock)
+{
+ virCommandPtr cmd;
+ *retsock = NULL;
+
+ cmd = virCommandNew(binary ? binary : "ssh");
+ virCommandAddEnvPassCommon(cmd);
+ virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
+ virCommandAddEnvPass(cmd, "SSH_ASKPASS");
+ virCommandClearCaps(cmd);
+
+ if (service)
+ virCommandAddArgList(cmd, "-p", service, NULL);
+ if (username)
+ virCommandAddArgList(cmd, "-l", username, NULL);
+ if (noTTY)
+ virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes",
+ "-e", "none", NULL);
+ virCommandAddArgList(cmd, nodename,
+ netcat ? netcat : "nc",
+ "-U", path, NULL);
+
+ return virNetSocketNewConnectCommand(cmd, retsock);
+}
+
+
+int virNetSocketNewConnectExternal(const char **cmdargv,
+ virNetSocketPtr *retsock)
+{
+ virCommandPtr cmd;
+
+ *retsock = NULL;
+
+ cmd = virCommandNewArgs(cmdargv);
+ virCommandAddEnvPassCommon(cmd);
+ virCommandClearCaps(cmd);
+
+ return virNetSocketNewConnectCommand(cmd, retsock);
+}
+
+
+void virNetSocketFree(virNetSocketPtr sock)
+{
+ if (!sock)
+ return;
+
+ VIR_DEBUG("sock=%p fd=%d", sock, sock->fd);
+ if (sock->watch > 0) {
+ virEventRemoveHandle(sock->watch);
+ sock->watch = -1;
+ }
+
+#ifdef HAVE_SYS_UN_H
+ /* If a server socket, then unlink UNIX path */
+ if (!sock->client &&
+ sock->localAddr.data.sa.sa_family == AF_UNIX &&
+ sock->localAddr.data.un.sun_path[0] != '\0')
+ unlink(sock->localAddr.data.un.sun_path);
+#endif
+
+ VIR_FORCE_CLOSE(sock->fd);
+ VIR_FORCE_CLOSE(sock->errfd);
+
+#ifndef WIN32
+ if (sock->pid > 0) {
+ pid_t reap;
+ kill(sock->pid, SIGTERM);
+ do {
+retry:
+ reap = waitpid(sock->pid, NULL, 0);
+ if (reap == -1 && errno == EINTR)
+ goto retry;
+ } while (reap != -1 && reap != sock->pid);
+ }
+#endif
+
+ VIR_FREE(sock->localAddrStr);
+ VIR_FREE(sock->remoteAddrStr);
+
+ VIR_FREE(sock);
+}
+
+
+int virNetSocketGetFD(virNetSocketPtr sock)
+{
+ return sock->fd;
+}
+
+
+bool virNetSocketIsLocal(virNetSocketPtr sock)
+{
+ if (sock->localAddr.data.sa.sa_family == AF_UNIX)
+ return true;
+ return false;
+}
+
+
+#ifdef SO_PEERCRED
+int virNetSocketGetLocalIdentity(virNetSocketPtr sock,
+ uid_t *uid,
+ pid_t *pid)
+{
+ struct ucred cr;
+ unsigned int cr_len = sizeof (cr);
+
+ if (getsockopt(sock->fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) < 0) {
+ virReportSystemError(errno, "%s",
+ _("Failed to get client socket identity"));
+ return -1;
+ }
+
+ *pid = cr.pid;
+ *uid = cr.uid;
+ return 0;
+}
+# else
+int virNetSocketGetLocalIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED,
+ uid_t *uid ATTRIBUTE_UNUSED,
+ pid_t *pid ATTRIBUTE_UNUSED)
+{
+ /* XXX Many more OS support UNIX socket credentials we could port to. See dbus ....*/
+ virReportSystemError(ENOSYS, "%s",
+ _("Client socket identity not available"));
+ return -1;
+}
+# endif
+
+
+int virNetSocketSetBlocking(virNetSocketPtr sock,
+ bool blocking)
+{
+ return virSetBlocking(sock->fd, blocking);
+}
+
+
+const char *virNetSocketLocalAddrString(virNetSocketPtr sock)
+{
+ return sock->localAddrStr;
+}
+
+const char *virNetSocketRemoteAddrString(virNetSocketPtr sock)
+{
+ return sock->remoteAddrStr;
+}
+
+ssize_t virNetSocketRead(virNetSocketPtr sock, char *buf, size_t len)
+{
+ return read(sock->fd, buf, len);
+}
+
+ssize_t virNetSocketWrite(virNetSocketPtr sock, const char *buf, size_t len)
+{
+ return write(sock->fd, buf, len);
+}
+
+
+int virNetSocketListen(virNetSocketPtr sock)
+{
+ if (listen(sock->fd, 30) < 0) {
+ virReportSystemError(errno, "%s", _("Unable to listen on socket"));
+ return -1;
+ }
+ return 0;
+}
+
+int virNetSocketAccept(virNetSocketPtr sock, virNetSocketPtr *clientsock)
+{
+ int fd;
+ virSocketAddr localAddr;
+ virSocketAddr remoteAddr;
+
+ *clientsock = NULL;
+
+ memset(&localAddr, 0, sizeof(localAddr));
+ memset(&remoteAddr, 0, sizeof(remoteAddr));
+
+ remoteAddr.len = sizeof(remoteAddr.data.stor);
+ if ((fd = accept(sock->fd, &remoteAddr.data.sa, &remoteAddr.len)) < 0) {
+ if (errno == ECONNABORTED ||
+ errno == EAGAIN)
+ return 0;
+
+ virReportSystemError(errno, "%s",
+ _("Unable to accept client"));
+ return -1;
+ }
+
+ localAddr.len = sizeof(localAddr.data);
+ if (getsockname(fd, &localAddr.data.sa, &localAddr.len) < 0) {
+ virReportSystemError(errno, "%s", _("Unable to get local socket name"));
+ VIR_FORCE_CLOSE(fd);
+ return -1;
+ }
+
+ if (!(*clientsock = virNetSocketNew(&localAddr,
+ &remoteAddr,
+ true,
+ fd, -1, 0))) {
+ VIR_FORCE_CLOSE(fd);
+ return -1;
+ }
+
+ return 0;
+}
+
+
+static void virNetSocketEventHandle(int fd ATTRIBUTE_UNUSED,
+ int watch ATTRIBUTE_UNUSED,
+ int events,
+ void *opaque)
+{
+ virNetSocketPtr sock = opaque;
+
+ sock->func(sock, events, sock->opaque);
+}
+
+int virNetSocketAddIOCallback(virNetSocketPtr sock,
+ int events,
+ virNetSocketIOFunc func,
+ void *opaque)
+{
+ if (sock->watch > 0) {
+ VIR_DEBUG("Watch already registered on socket %p", sock);
+ return -1;
+ }
+
+ if ((sock->watch = virEventAddHandle(sock->fd,
+ events,
+ virNetSocketEventHandle,
+ sock,
+ NULL)) < 0) {
+ VIR_WARN("Failed to register watch on socket %p", sock);
+ return -1;
+ }
+ sock->func = func;
+ sock->opaque = opaque;
+
+ return 0;
+}
+
+void virNetSocketUpdateIOCallback(virNetSocketPtr sock,
+ int events)
+{
+ if (sock->watch <= 0) {
+ VIR_DEBUG("Watch not registered on socket %p", sock);
+ return;
+ }
+
+ virEventUpdateHandle(sock->watch, events);
+}
+
+void virNetSocketRemoveIOCallback(virNetSocketPtr sock)
+{
+ if (sock->watch <= 0) {
+ VIR_DEBUG("Watch not registered on socket %p", sock);
+ return;
+ }
+
+ virEventRemoveHandle(sock->watch);
+ sock->watch = 0;
+}
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
new file mode 100644
index 0000000..218fe8f
--- /dev/null
+++ b/src/rpc/virnetsocket.h
@@ -0,0 +1,107 @@
+/*
+ * virnetsocket.h: generic network socket handling
+ *
+ * Copyright (C) 2006-2011 Red Hat, Inc.
+ * Copyright (C) 2006 Daniel P. Berrange
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Daniel P. Berrange <berrange at redhat.com>
+ */
+
+#ifndef __VIR_NET_SOCKET_H__
+# define __VIR_NET_SOCKET_H__
+
+# include "network.h"
+# include "command.h"
+
+typedef struct _virNetSocket virNetSocket;
+typedef virNetSocket *virNetSocketPtr;
+
+
+typedef void (*virNetSocketIOFunc)(virNetSocketPtr sock,
+ int events,
+ void *opaque);
+
+
+int virNetSocketNewListenTCP(const char *nodename,
+ const char *service,
+ virNetSocketPtr **addrs,
+ size_t *naddrs);
+
+int virNetSocketNewListenUNIX(const char *path,
+ mode_t mask,
+ gid_t grp,
+ virNetSocketPtr *addr);
+
+int virNetSocketNewConnectTCP(const char *nodename,
+ const char *service,
+ virNetSocketPtr *addr);
+
+int virNetSocketNewConnectUNIX(const char *path,
+ bool spawnDaemon,
+ const char *binary,
+ virNetSocketPtr *addr);
+
+int virNetSocketNewConnectCommand(virCommandPtr cmd,
+ virNetSocketPtr *retsock);
+
+int virNetSocketNewConnectSSH(const char *nodename,
+ const char *service,
+ const char *binary,
+ const char *username,
+ bool noTTY,
+ const char *netcat,
+ const char *path,
+ virNetSocketPtr *addr);
+
+int virNetSocketNewConnectExternal(const char **cmdargv,
+ virNetSocketPtr *addr);
+
+int virNetSocketGetFD(virNetSocketPtr sock);
+bool virNetSocketIsLocal(virNetSocketPtr sock);
+
+int virNetSocketGetLocalIdentity(virNetSocketPtr sock,
+ uid_t *uid,
+ pid_t *pid);
+
+int virNetSocketSetBlocking(virNetSocketPtr sock,
+ bool blocking);
+
+ssize_t virNetSocketRead(virNetSocketPtr sock, char *buf, size_t len);
+ssize_t virNetSocketWrite(virNetSocketPtr sock, const char *buf, size_t len);
+
+void virNetSocketFree(virNetSocketPtr sock);
+
+const char *virNetSocketLocalAddrString(virNetSocketPtr sock);
+const char *virNetSocketRemoteAddrString(virNetSocketPtr sock);
+
+int virNetSocketListen(virNetSocketPtr sock);
+int virNetSocketAccept(virNetSocketPtr sock,
+ virNetSocketPtr *clientsock);
+
+int virNetSocketAddIOCallback(virNetSocketPtr sock,
+ int events,
+ virNetSocketIOFunc func,
+ void *opaque);
+
+void virNetSocketUpdateIOCallback(virNetSocketPtr sock,
+ int events);
+
+void virNetSocketRemoveIOCallback(virNetSocketPtr sock);
+
+
+
+#endif /* __VIR_NET_SOCKET_H__ */
--
1.7.4
More information about the libvir-list
mailing list