[Qemu-devel] [PATCH 0/3]: Small VNC related cleanup

[Qemu-devel] [PATCH 0/3]: Small VNC related cleanup

[Luiz Capitulino]

 This series makes VNC events code use inet_strfamily() from qemu-socket
instead of duplicating code, as suggested by Gerd.

 Thanks.

[Qemu-devel] [PATCH 1/3] net: Make inet_strfamily() public

[Luiz Capitulino]

So that it can be used by other subsystems.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qemu-sockets.c |    2 +-
 qemu_socket.h  |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/qemu-sockets.c b/qemu-sockets.c
index 8850516..720de22 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -91,7 +91,7 @@ static void inet_setport(struct addrinfo *e, int port)
     }
 }
 
-static const char *inet_strfamily(int family)
+const char *inet_strfamily(int family)
 {
     switch (family) {
     case PF_INET6: return "ipv6";
diff --git a/qemu_socket.h b/qemu_socket.h
index 86bdbf5..7ee46ac 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -44,6 +44,7 @@ int inet_listen(const char *str, char *ostr, int olen,
 int inet_connect_opts(QemuOpts *opts);
 int inet_connect(const char *str, int socktype);
 int inet_dgram_opts(QemuOpts *opts);
+const char *inet_strfamily(int family);
 
 int unix_listen_opts(QemuOpts *opts);
 int unix_listen(const char *path, char *ostr, int olen);
-- 
1.6.6

Re: [Qemu-devel] [PATCH 1/3] net: Make inet_strfamily() public

[Anthony Liguori]

On 01/20/2010 07:42 AM, Luiz Capitulino wrote:
> So that it can be used by other subsystems.
>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   qemu-sockets.c |    2 +-
>   qemu_socket.h  |    1 +
>   2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/qemu-sockets.c b/qemu-sockets.c
> index 8850516..720de22 100644
> --- a/qemu-sockets.c
> +++ b/qemu-sockets.c
> @@ -91,7 +91,7 @@ static void inet_setport(struct addrinfo *e, int port)
>       }
>   }
>
> -static const char *inet_strfamily(int family)
> +const char *inet_strfamily(int family)
>   {
>       switch (family) {
>       case PF_INET6: return "ipv6";
> diff --git a/qemu_socket.h b/qemu_socket.h
> index 86bdbf5..7ee46ac 100644
> --- a/qemu_socket.h
> +++ b/qemu_socket.h
> @@ -44,6 +44,7 @@ int inet_listen(const char *str, char *ostr, int olen,
>   int inet_connect_opts(QemuOpts *opts);
>   int inet_connect(const char *str, int socktype);
>   int inet_dgram_opts(QemuOpts *opts);
> +const char *inet_strfamily(int family);
>
>   int unix_listen_opts(QemuOpts *opts);
>   int unix_listen(const char *path, char *ostr, int olen);
>    

[Qemu-devel] [PATCH 2/3] net: inet_strfamily(): Better unknown family report

[Luiz Capitulino]

Returning "????" is a bit meaningless, let's call it "unknown".

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qemu-sockets.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/qemu-sockets.c b/qemu-sockets.c
index 720de22..d912fed 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -98,7 +98,7 @@ const char *inet_strfamily(int family)
     case PF_INET:  return "ipv4";
     case PF_UNIX:  return "unix";
     }
-    return "????";
+    return "unknown";
 }
 
 static void inet_print_addrinfo(const char *tag, struct addrinfo *res)
-- 
1.6.6

[Qemu-devel] [PATCH 3/3] vnc: Use inet_strfamily()

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 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