[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/7] VNC: Add 'family' key
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 4/7] VNC: Add 'family' key |
Date: |
Fri, 8 Jan 2010 19:47:13 -0200 |
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 <address@hidden>
---
vnc.c | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/vnc.c b/vnc.c
index 7b77ffc..a6e54f3 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
@@ -308,7 +330,7 @@ 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"}]}
*/
void do_info_vnc(Monitor *mon, QObject **ret_data)
{
--
1.6.6
- [Qemu-devel] [RFC 0/7]: Add VNC connect/disconnect events, Luiz Capitulino, 2010/01/08
- [Qemu-devel] [PATCH 1/7] VNC: Use 'enabled' key instead of 'status', Luiz Capitulino, 2010/01/08
- [Qemu-devel] [PATCH 2/7] VNC: Make 'auth' key mandatory, Luiz Capitulino, 2010/01/08
- [Qemu-devel] [PATCH 3/7] VNC: Rename client's 'username' key, Luiz Capitulino, 2010/01/08
- [Qemu-devel] [PATCH 4/7] VNC: Add 'family' key,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 5/7] VNC: Cache client info at connection time, Luiz Capitulino, 2010/01/08
- [Qemu-devel] [PATCH 6/7] QMP: Introduce QMP disconnect event, Luiz Capitulino, 2010/01/08
- [Qemu-devel] [PATCH 7/7] QMP: Introduce QMP connect event, Luiz Capitulino, 2010/01/08
- [Qemu-devel] Re: [RFC 0/7]: Add VNC connect/disconnect events, Daniel P. Berrange, 2010/01/11