From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bvKw5-00058n-K7 for qemu-devel@nongnu.org; Sat, 15 Oct 2016 05:07:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bvKw4-0001qa-H0 for qemu-devel@nongnu.org; Sat, 15 Oct 2016 05:07:21 -0400 From: Ashijeet Acharya Date: Sat, 15 Oct 2016 14:34:38 +0530 Message-Id: <1476522280-23211-4-git-send-email-ashijeetacharya@gmail.com> In-Reply-To: <1476522280-23211-1-git-send-email-ashijeetacharya@gmail.com> References: <1476522280-23211-1-git-send-email-ashijeetacharya@gmail.com> Subject: [Qemu-devel] [v2 3/5] block/ssh: Use inet_connect_saddr() to establish socket connection List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com Cc: rjones@redhat.com, jcody@redhat.com, mreitz@redhat.com, eblake@redhat.com, armbru@redhat.com, berrange@redhat.com, kraxel@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, Ashijeet Acharya Make inet_connect_saddr() in util/qemu-socktets.c public and use it instead of inet_connect() because this directly takes the InetSocketAddress to establish a socket connection for the SSH block driver. Signed-off-by: Ashijeet Acharya --- block/ssh.c | 5 +---- include/qemu/sockets.h | 2 ++ util/qemu-sockets.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index 3b18907..6420359 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -666,13 +666,10 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, goto err; } - /* Construct the host:port name for inet_connect. */ - g_free(s->hostport); port = atoi(s->inet->port); - s->hostport = g_strdup_printf("%s:%d", s->inet->host, port); /* Open the socket and connect. */ - s->sock = inet_connect(s->hostport, errp); + s->sock = inet_connect_saddr(s->inet, errp, NULL, NULL); if (s->sock < 0) { ret = -EIO; goto err; diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 9eb2470..5589e68 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -34,6 +34,8 @@ typedef void NonBlockingConnectHandler(int fd, Error *err, void *opaque); InetSocketAddress *inet_parse(const char *str, Error **errp); int inet_connect(const char *str, Error **errp); +int inet_connect_saddr(InetSocketAddress *saddr, Error **errp, + NonBlockingConnectHandler *callback, void *opaque); NetworkAddressFamily inet_netfamily(int family); diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 4cef549..3411888 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -412,7 +412,7 @@ static struct addrinfo *inet_parse_connect_saddr(InetSocketAddress *saddr, * function succeeds, callback will be called when the connection * completes, with the file descriptor on success, or -1 on error. */ -static int inet_connect_saddr(InetSocketAddress *saddr, Error **errp, +int inet_connect_saddr(InetSocketAddress *saddr, Error **errp, NonBlockingConnectHandler *callback, void *opaque) { Error *local_err = NULL; -- 2.6.2