From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2Ptk-0003gN-As for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:28 -0400 Received: from [140.186.70.92] (port=50457 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2Ptf-0003NR-2b for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2Pj2-0007hu-W3 for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:07:26 -0400 Received: from mail-yx0-f180.google.com ([209.85.210.180]:46679) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2Pj2-0007Vy-T4 for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:07:24 -0400 Received: by mail-yx0-f180.google.com with SMTP id 10so693532yxe.18 for ; Thu, 15 Apr 2010 07:07:24 -0700 (PDT) From: Miguel Di Ciurcio Filho Date: Thu, 15 Apr 2010 11:07:04 -0300 Message-Id: <1271340427-12579-10-git-send-email-miguel.filho@gmail.com> In-Reply-To: <1271340427-12579-1-git-send-email-miguel.filho@gmail.com> References: <1271340427-12579-1-git-send-email-miguel.filho@gmail.com> Subject: [Qemu-devel] [PATCH v3 09/12] net: socket: use info_dict instead of info_str List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, lcapitulino@redhat.com Signed-off-by: Miguel Di Ciurcio Filho --- net/socket.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 15 deletions(-) diff --git a/net/socket.c b/net/socket.c index 1c4e153..fa5d24d 100644 --- a/net/socket.c +++ b/net/socket.c @@ -28,6 +28,10 @@ #include "net.h" #include "qemu-char.h" #include "qemu-common.h" +#include "qdict.h" +#include "qstring.h" +#include "qbool.h" +#include "qint.h" #include "qemu-error.h" #include "qemu-option.h" #include "qemu_socket.h" @@ -266,11 +270,14 @@ static NetSocketState *net_socket_fd_init_dgram(VLANState *vlan, } nc = qemu_new_net_client(&net_dgram_socket_info, vlan, NULL, model, name); - - snprintf(nc->info_str, sizeof(nc->info_str), - "socket: fd=%d (%s mcast=%s:%d)", - fd, is_connected ? "cloned" : "", - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); + + nc->info_dict = qdict_new(); + qdict_put(nc->info_dict, "fd", qint_from_int(fd)); + qdict_put(nc->info_dict, "host", + qstring_from_str(inet_ntoa(saddr.sin_addr))); + qdict_put(nc->info_dict, "service", qint_from_int(ntohs(saddr.sin_port))); + qdict_put(nc->info_dict, "family", qstring_from_str("ipv4")); + qdict_put(nc->info_dict, "cloned", qbool_from_int(is_connected)); s = DO_UPCAST(NetSocketState, nc, nc); @@ -306,8 +313,9 @@ static NetSocketState *net_socket_fd_init_stream(VLANState *vlan, NetSocketState *s; nc = qemu_new_net_client(&net_socket_info, vlan, NULL, model, name); + nc->info_dict = qdict_new(); - snprintf(nc->info_str, sizeof(nc->info_str), "socket: fd=%d", fd); + qdict_put(nc->info_dict, "fd", qint_from_int(fd)); s = DO_UPCAST(NetSocketState, nc, nc); @@ -366,9 +374,12 @@ static void net_socket_accept(void *opaque) if (!s1) { closesocket(fd); } else { - 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 = qdict_new(); + + qdict_put(s1->nc.info_dict, "host", + qstring_from_str(inet_ntoa(saddr.sin_addr))); + qdict_put(s1->nc.info_dict, "service", qint_from_int(ntohs(saddr.sin_port))); + qdict_put(s1->nc.info_dict, "family", qstring_from_str("ipv4")); } } @@ -459,9 +470,12 @@ static int net_socket_connect_init(VLANState *vlan, s = net_socket_fd_init(vlan, model, name, fd, connected); if (!s) return -1; - 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 = qdict_new(); + qdict_put(s->nc.info_dict, "host", + qstring_from_str(inet_ntoa(saddr.sin_addr))); + qdict_put(s->nc.info_dict, "service", qint_from_int(ntohs(saddr.sin_port))); + qdict_put(s->nc.info_dict, "family", qstring_from_str("ipv4")); return 0; } @@ -487,10 +501,13 @@ static int net_socket_mcast_init(VLANState *vlan, return -1; s->dgram_dst = saddr; + + s->nc.info_dict = qdict_new(); + qdict_put(s->nc.info_dict, "host", + qstring_from_str(inet_ntoa(saddr.sin_addr))); + qdict_put(s->nc.info_dict, "service", qint_from_int(ntohs(saddr.sin_port))); + qdict_put(s->nc.info_dict, "family", qstring_from_str("ipv4")); - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "socket: mcast=%s:%d", - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); return 0; } -- 1.7.0.4