From patchwork Wed Feb 8 13:39:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonit Halperin X-Patchwork-Id: 140146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6AD20B71B2 for ; Thu, 9 Feb 2012 00:38:58 +1100 (EST) Received: from localhost ([::1]:36204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv7jb-0005Df-4x for incoming@patchwork.ozlabs.org; Wed, 08 Feb 2012 08:38:55 -0500 Received: from eggs.gnu.org ([140.186.70.92]:53552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv7jP-0005DR-QH for qemu-devel@nongnu.org; Wed, 08 Feb 2012 08:38:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rv7jJ-0001T7-Vm for qemu-devel@nongnu.org; Wed, 08 Feb 2012 08:38:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv7jJ-0001Su-P9 for qemu-devel@nongnu.org; Wed, 08 Feb 2012 08:38:37 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q18DcZK4007369 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Feb 2012 08:38:35 -0500 Received: from dhcp-0-9.tlv.redhat.com (dhcp-4-73.tlv.redhat.com [10.35.4.73]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q18DcXQx026126; Wed, 8 Feb 2012 08:38:34 -0500 From: Yonit Halperin To: qemu-devel@nongnu.org, spice-devel@freedesktop.org Date: Wed, 8 Feb 2012 15:39:35 +0200 Message-Id: <1328708375-12246-1-git-send-email-yhalperi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Yonit Halperin , kraxel@redhat.com Subject: [Qemu-devel] [PATCH] server: support IPV6 addresses in channel events sent to qemu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org RHBZ #788444 CC: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Signed-off-by: Yonit Halperin --- server/reds.c | 21 +++++++++++++++++---- server/spice.h | 6 ++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/server/reds.c b/server/reds.c index 2492a89..828ba65 100644 --- a/server/reds.c +++ b/server/reds.c @@ -2005,7 +2005,7 @@ static void reds_get_spice_ticket(RedLinkInfo *link) #if HAVE_SASL static char *addr_to_string(const char *format, - struct sockaddr *sa, + struct sockaddr_storage *sa, socklen_t salen) { char *addr; char host[NI_MAXHOST]; @@ -2013,7 +2013,7 @@ static char *addr_to_string(const char *format, int err; size_t addrlen; - if ((err = getnameinfo(sa, salen, + if ((err = getnameinfo((struct sockaddr *)sa, salen, host, sizeof(host), serv, sizeof(serv), NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { @@ -2402,11 +2402,13 @@ static void reds_start_auth_sasl(RedLinkInfo *link) RedsSASL *sasl = &link->stream->sasl; /* Get local & remote client addresses in form IPADDR;PORT */ - if (!(localAddr = addr_to_string("%s;%s", &link->stream->info.laddr, link->stream->info.llen))) { + if (!(localAddr = addr_to_string("%s;%s", &link->stream->info.laddr_ext, + link->stream->info.llen_ext))) { goto error; } - if (!(remoteAddr = addr_to_string("%s;%s", &link->stream->info.paddr, link->stream->info.plen))) { + if (!(remoteAddr = addr_to_string("%s;%s", &link->stream->info.paddr_ext, + link->stream->info.plen_ext))) { free(localAddr); goto error; } @@ -2717,10 +2719,21 @@ static RedLinkInfo *reds_init_client_connection(int socket) stream->socket = socket; /* gather info + send event */ + + /* deprecated fields. Filling them for backward compatibility */ stream->info.llen = sizeof(stream->info.laddr); stream->info.plen = sizeof(stream->info.paddr); getsockname(stream->socket, (struct sockaddr*)(&stream->info.laddr), &stream->info.llen); getpeername(stream->socket, (struct sockaddr*)(&stream->info.paddr), &stream->info.plen); + + stream->info.flags |= SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT; + stream->info.llen_ext = sizeof(stream->info.laddr_ext); + stream->info.plen_ext = sizeof(stream->info.paddr_ext); + getsockname(stream->socket, (struct sockaddr*)(&stream->info.laddr_ext), + &stream->info.llen_ext); + getpeername(stream->socket, (struct sockaddr*)(&stream->info.paddr_ext), + &stream->info.plen_ext); + reds_stream_channel_event(stream, SPICE_CHANNEL_EVENT_CONNECTED); openssl_init(link); diff --git a/server/spice.h b/server/spice.h index c582e6c..7397655 100644 --- a/server/spice.h +++ b/server/spice.h @@ -54,6 +54,7 @@ typedef struct SpiceCoreInterface SpiceCoreInterface; #define SPICE_CHANNEL_EVENT_DISCONNECTED 3 #define SPICE_CHANNEL_EVENT_FLAG_TLS (1 << 0) +#define SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT (1 << 1) typedef struct SpiceWatch SpiceWatch; typedef void (*SpiceWatchFunc)(int fd, int event, void *opaque); @@ -66,9 +67,14 @@ typedef struct SpiceChannelEventInfo { int type; int id; int flags; + /* deprecated, can't hold ipv6 addresses, kept for backward compatibility */ struct sockaddr laddr; struct sockaddr paddr; socklen_t llen, plen; + /* should be used if (flags & SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT) */ + struct sockaddr_storage laddr_ext; + struct sockaddr_storage paddr_ext; + socklen_t llen_ext, plen_ext; } SpiceChannelEventInfo; struct SpiceCoreInterface {