|
 |
adeaf8 |
From 9e7cec4d755341cfb4c27c16aa59b22135612f0e Mon Sep 17 00:00:00 2001
|
|
|
adeaf8 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
adeaf8 |
Date: Mon, 23 Sep 2013 12:46:26 +0100
|
|
|
adeaf8 |
Subject: [PATCH] Add a virNetSocketNewConnectSockFD method
|
|
|
adeaf8 |
|
|
|
adeaf8 |
To allow creation of a virNetSocketPtr instance from a pre-opened
|
|
|
adeaf8 |
socketpair FD, add a virNetSocketNewConnectSockFD method.
|
|
|
adeaf8 |
|
|
|
adeaf8 |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
adeaf8 |
---
|
|
|
adeaf8 |
src/libvirt_private.syms | 1 +
|
|
|
adeaf8 |
src/rpc/virnetsocket.c | 18 ++++++++++++++++++
|
|
|
adeaf8 |
src/rpc/virnetsocket.h | 2 ++
|
|
|
adeaf8 |
3 files changed, 21 insertions(+)
|
|
|
adeaf8 |
|
|
|
adeaf8 |
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
|
|
|
adeaf8 |
index 35f0f1b..873d93d 100644
|
|
|
adeaf8 |
--- a/src/libvirt_private.syms
|
|
|
adeaf8 |
+++ b/src/libvirt_private.syms
|
|
|
adeaf8 |
@@ -1008,6 +1008,7 @@ virNetSocketLocalAddrString;
|
|
|
adeaf8 |
virNetSocketNewConnectCommand;
|
|
|
adeaf8 |
virNetSocketNewConnectExternal;
|
|
|
adeaf8 |
virNetSocketNewConnectLibSSH2;
|
|
|
adeaf8 |
+virNetSocketNewConnectSockFD;
|
|
|
adeaf8 |
virNetSocketNewConnectSSH;
|
|
|
adeaf8 |
virNetSocketNewConnectTCP;
|
|
|
adeaf8 |
virNetSocketNewConnectUNIX;
|
|
|
adeaf8 |
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
|
|
|
adeaf8 |
index ae81512..b311aae 100644
|
|
|
adeaf8 |
--- a/src/rpc/virnetsocket.c
|
|
|
adeaf8 |
+++ b/src/rpc/virnetsocket.c
|
|
|
adeaf8 |
@@ -884,6 +884,24 @@ int virNetSocketNewConnectExternal(const char **cmdargv,
|
|
|
adeaf8 |
}
|
|
|
adeaf8 |
|
|
|
adeaf8 |
|
|
|
adeaf8 |
+int virNetSocketNewConnectSockFD(int sockfd,
|
|
|
adeaf8 |
+ virNetSocketPtr *retsock)
|
|
|
adeaf8 |
+{
|
|
|
adeaf8 |
+ virSocketAddr localAddr;
|
|
|
adeaf8 |
+
|
|
|
adeaf8 |
+ localAddr.len = sizeof(localAddr.data);
|
|
|
adeaf8 |
+ if (getsockname(sockfd, &localAddr.data.sa, &localAddr.len) < 0) {
|
|
|
adeaf8 |
+ virReportSystemError(errno, "%s", _("Unable to get local socket name"));
|
|
|
adeaf8 |
+ return -1;
|
|
|
adeaf8 |
+ }
|
|
|
adeaf8 |
+
|
|
|
adeaf8 |
+ if (!(*retsock = virNetSocketNew(&localAddr, NULL, true, sockfd, -1, -1)))
|
|
|
adeaf8 |
+ return -1;
|
|
|
adeaf8 |
+
|
|
|
adeaf8 |
+ return 0;
|
|
|
adeaf8 |
+}
|
|
|
adeaf8 |
+
|
|
|
adeaf8 |
+
|
|
|
adeaf8 |
virNetSocketPtr virNetSocketNewPostExecRestart(virJSONValuePtr object)
|
|
|
adeaf8 |
{
|
|
|
adeaf8 |
virSocketAddr localAddr;
|
|
|
adeaf8 |
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
|
|
|
adeaf8 |
index ca9ae91..86bc2f6 100644
|
|
|
adeaf8 |
--- a/src/rpc/virnetsocket.h
|
|
|
adeaf8 |
+++ b/src/rpc/virnetsocket.h
|
|
|
adeaf8 |
@@ -97,6 +97,8 @@ int virNetSocketNewConnectLibSSH2(const char *host,
|
|
|
adeaf8 |
int virNetSocketNewConnectExternal(const char **cmdargv,
|
|
|
adeaf8 |
virNetSocketPtr *addr);
|
|
|
adeaf8 |
|
|
|
adeaf8 |
+int virNetSocketNewConnectSockFD(int sockfd,
|
|
|
adeaf8 |
+ virNetSocketPtr *retsock);
|
|
|
adeaf8 |
|
|
|
adeaf8 |
virNetSocketPtr virNetSocketNewPostExecRestart(virJSONValuePtr object);
|
|
|
adeaf8 |
|