From 7d4bc4d877ffcaa41ef56a7dfef72e05174d1344 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Tue, 26 Jan 2010 18:53:42 -0200 Subject: [PATCH 4/9] VNC: Add 'family' key RH-Author: Luiz Capitulino Message-id: <1264532026-7620-5-git-send-email-lcapitulino@redhat.com> Patchwork-id: 6630 O-Subject: [PATCH RHEL6 qemu-kvm 4/8] VNC: Add 'family' key Bugzilla: 549759 RH-Acked-by: Markus Armbruster RH-Acked-by: Daniel P. Berrange RH-Acked-by: Juan Quintela 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 Signed-off-by: Anthony Liguori (cherry picked from commit 5c7238c5e3515885ed3e9d4a5008050c4e41d44f) --- vnc.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) Signed-off-by: Eduardo Habkost --- vnc.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/vnc.c b/vnc.c index ca05b22..5fbde89 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) { -- 1.6.3.rc4.29.g8146