From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXapm-00046k-Nl for qemu-devel@nongnu.org; Wed, 20 Jan 2010 08:42:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXaph-00043c-1A for qemu-devel@nongnu.org; Wed, 20 Jan 2010 08:42:57 -0500 Received: from [199.232.76.173] (port=41501 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXapg-00043X-SF for qemu-devel@nongnu.org; Wed, 20 Jan 2010 08:42:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50137) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NXapg-0000zz-E3 for qemu-devel@nongnu.org; Wed, 20 Jan 2010 08:42:52 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0KDgpku012888 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 20 Jan 2010 08:42:51 -0500 Received: from localhost (vpn-246-151.phx2.redhat.com [10.3.246.151]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0KDgoAd007877 for ; Wed, 20 Jan 2010 08:42:51 -0500 From: Luiz Capitulino Date: Wed, 20 Jan 2010 11:42:40 -0200 Message-Id: <1263994960-8411-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1263994960-8411-1-git-send-email-lcapitulino@redhat.com> References: <1263994960-8411-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] vnc: Use inet_strfamily() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Luiz Capitulino --- vnc.c | 22 +--------------------- 1 files changed, 1 insertions(+), 21 deletions(-) diff --git a/vnc.c b/vnc.c index c7d6652..cc2a26e 100644 --- a/vnc.c +++ b/vnc.c @@ -100,26 +100,6 @@ 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) { @@ -138,7 +118,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)); + qdict_put(qdict, "family",qstring_from_str(inet_strfamily(sa->ss_family))); return 0; } -- 1.6.6