From patchwork Thu Jan 14 16:50:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 42913 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1B76B7CD8 for ; Fri, 15 Jan 2010 04:05:55 +1100 (EST) Received: from localhost ([127.0.0.1]:53728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVT7V-0004FP-Kx for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2010 12:04:29 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVSvd-0007HA-4c for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVSvV-0007CP-QK for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:10 -0500 Received: from [199.232.76.173] (port=44456 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVSvV-0007CE-B1 for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19122) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVSvU-0002D5-Ki for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:05 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0EGq3WS014452 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Jan 2010 11:52:03 -0500 Received: from localhost (vpn-10-170.rdu.redhat.com [10.11.10.170]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0EGq0nN007288; Thu, 14 Jan 2010 11:52:01 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2010 14:50:55 -0200 Message-Id: <1263487859-6318-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1263487859-6318-1-git-send-email-lcapitulino@redhat.com> References: <1263487859-6318-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 4/8] VNC: Add 'family' key X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It contains the socket adress family name, like "ipv4" or "ipv6". This is useful for clients so that they can interpret the 'host' key reliably. Signed-off-by: Luiz Capitulino --- vnc.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/vnc.c b/vnc.c index e35cc36..e023824 100644 --- a/vnc.c +++ b/vnc.c @@ -100,6 +100,26 @@ char *vnc_socket_remote_addr(const char *format, int fd) { return addr_to_string(format, &sa, salen); } +static QString *get_sock_family(const struct sockaddr_storage *sa) +{ + const char *name; + + switch (sa->ss_family) + { + case AF_INET: + name = "ipv4"; + break; + case AF_INET6: + name = "ipv6"; + break; + default: + name = "unknown"; + break; + } + + return qstring_from_str(name); +} + static int put_addr_qdict(QDict *qdict, struct sockaddr_storage *sa, socklen_t salen) { @@ -118,6 +138,7 @@ static int put_addr_qdict(QDict *qdict, struct sockaddr_storage *sa, qdict_put(qdict, "host", qstring_from_str(host)); qdict_put(qdict, "service", qstring_from_str(serv)); + qdict_put(qdict, "family", get_sock_family(sa)); return 0; } @@ -294,6 +315,7 @@ void do_info_vnc_print(Monitor *mon, const QObject *data) * * - "enabled": true or false * - "host": server's IP address + * - "family": address family ("ipv4" or "ipv6") * - "service": server's port number * - "auth": authentication method * - "clients": a QList of all connected clients @@ -301,6 +323,7 @@ void do_info_vnc_print(Monitor *mon, const QObject *data) * Clients are described by a QDict, with the following information: * * - "host": client's IP address + * - "family": address family ("ipv4" or "ipv6") * - "service": client's port number * - "x509_dname": TLS dname (optional) * - "sasl_username": SASL username (optional) @@ -308,7 +331,8 @@ void do_info_vnc_print(Monitor *mon, const QObject *data) * Example: * * { "enabled": true, "host": "0.0.0.0", "service": "50402", "auth": "vnc", - * "clients": [ { "host": "127.0.0.1", "service": "50401" } ] } + * "family": "ipv4", + * "clients": [{ "host": "127.0.0.1", "service": "50401", "family": "ipv4" }]} */ void do_info_vnc(Monitor *mon, QObject **ret_data) {