qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Miguel Di Ciurcio Filho <miguel.filho@gmail.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH v4 09/10] net: socket: introduce info_dict
Date: Tue, 18 May 2010 14:07:48 -0300	[thread overview]
Message-ID: <1274202469-9332-10-git-send-email-miguel.filho@gmail.com> (raw)
In-Reply-To: <1274202469-9332-1-git-send-email-miguel.filho@gmail.com>

Signed-off-by: Miguel Di Ciurcio Filho <miguel.filho@gmail.com>
---
 net/socket.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index 1c4e153..5be1b54 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -28,6 +28,7 @@
 #include "net.h"
 #include "qemu-char.h"
 #include "qemu-common.h"
+#include "qjson.h"
 #include "qemu-error.h"
 #include "qemu-option.h"
 #include "qemu_socket.h"
@@ -49,6 +50,16 @@ typedef struct NetSocketListenState {
     int fd;
 } NetSocketListenState;
 
+static QDict *net_socket_format_info_dict(const char *host,
+                                        int service,
+                                        const char *family,
+                                        int is_server)
+{
+    return qobject_to_qdict(qobject_from_jsonf("{ 'model': 'socket', \
+        'host': %s, 'family': %s, 'service': %d, 'server': %i }", host,
+        family, service, is_server));
+}
+
 /* XXX: we consider we can send the whole packet without blocking */
 static ssize_t net_socket_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
 {
@@ -369,6 +380,9 @@ static void net_socket_accept(void *opaque)
         snprintf(s1->nc.info_str, sizeof(s1->nc.info_str),
                  "socket: connection from %s:%d",
                  inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+
+        s1->nc.info_dict = net_socket_format_info_dict(inet_ntoa(saddr.sin_addr),
+            ntohs(saddr.sin_port), "ipv4", 1);
     }
 }
 
@@ -462,6 +476,10 @@ static int net_socket_connect_init(VLANState *vlan,
     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
              "socket: connect to %s:%d",
              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+
+    s->nc.info_dict = net_socket_format_info_dict(inet_ntoa(saddr.sin_addr),
+        ntohs(saddr.sin_port), "ipv4", 0);
+
     return 0;
 }
 
@@ -491,6 +509,10 @@ static int net_socket_mcast_init(VLANState *vlan,
     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
              "socket: mcast=%s:%d",
              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+
+    s->nc.info_dict = net_socket_format_info_dict(inet_ntoa(saddr.sin_addr),
+        ntohs(saddr.sin_port), "ipv4", 0);
+
     return 0;
 
 }
-- 
1.7.1

  parent reply	other threads:[~2010-05-18 17:19 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-18 17:07 [Qemu-devel] [PATCH v4 0/10] Introduce 'info netdevices' with QMP support Miguel Di Ciurcio Filho
2010-05-18 17:07 ` [Qemu-devel] [PATCH v4 01/10] QObject API: introduce qdict_to_qstring() function Miguel Di Ciurcio Filho
2010-05-27 17:50   ` [Qemu-devel] " Luiz Capitulino
2010-05-18 17:07 ` [Qemu-devel] [PATCH v4 02/10] net: introduce qemu_nic_format_info_dict and VLANClientState->info_dict Miguel Di Ciurcio Filho
2010-05-18 17:07 ` [Qemu-devel] [PATCH v4 03/10] net: various devices: add qemu_format_nic_info_dict Miguel Di Ciurcio Filho
2010-05-18 17:07 ` [Qemu-devel] [PATCH v4 04/10] net: xen: introduce info_dict Miguel Di Ciurcio Filho
2010-05-18 17:07 ` [Qemu-devel] [PATCH v4 05/10] net: tap/tap-win32: " Miguel Di Ciurcio Filho
2010-05-27 17:50   ` [Qemu-devel] " Luiz Capitulino
2010-05-18 17:07 ` [Qemu-devel] [PATCH v4 06/10] net: vde: " Miguel Di Ciurcio Filho
2010-05-27 17:51   ` [Qemu-devel] " Luiz Capitulino
2010-05-18 17:07 ` [Qemu-devel] [PATCH v4 07/10] net: dump: " Miguel Di Ciurcio Filho
2010-05-18 17:07 ` [Qemu-devel] [PATCH v4 08/10] net: slirp: " Miguel Di Ciurcio Filho
2010-05-18 17:07 ` Miguel Di Ciurcio Filho [this message]
2010-05-18 17:07 ` [Qemu-devel] [PATCH v4 10/10] monitor/net: introduce 'info netdevices' with QMP support Miguel Di Ciurcio Filho
2010-05-27 17:50 ` [Qemu-devel] Re: [PATCH v4 0/10] Introduce " Luiz Capitulino

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1274202469-9332-10-git-send-email-miguel.filho@gmail.com \
    --to=miguel.filho@gmail.com \
    --cc=armbru@redhat.com \
    --cc=lcapitulino@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).