ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spice: support ipv6 channel address in monitor events and in spice info 

RHBZ #788444

CC: Gerd Hoffmann <kraxel@redhat.com>

Signed-off-by: Yonit Halperin <yhalperi@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Yonit Halperin 2012-02-08 15:40:15 +02:00 committed by Gerd Hoffmann
parent f1f5f4070c
commit faa9822321
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ui/spice-core.c
View File

@ -220,10 +220,23 @@ static void channel_event(int event, SpiceChannelEventInfo *info)
} }
client = qdict_new(); client = qdict_new();
add_addr_info(client, &info->paddr, info->plen);
server = qdict_new(); server = qdict_new();
add_addr_info(server, &info->laddr, info->llen);
#ifdef SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT
if (info->flags & SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT) {
add_addr_info(client, (struct sockaddr *)&info->paddr_ext,
info->plen_ext);
add_addr_info(server, (struct sockaddr *)&info->laddr_ext,
info->llen_ext);
} else {
fprintf(stderr, "spice: %s, extended address is expected\n",
__func__);
#endif
add_addr_info(client, &info->paddr, info->plen);
add_addr_info(server, &info->laddr, info->llen);
#ifdef SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT
}
#endif
if (event == SPICE_CHANNEL_EVENT_INITIALIZED) { if (event == SPICE_CHANNEL_EVENT_INITIALIZED) {
qdict_put(server, "auth", qstring_from_str(auth)); qdict_put(server, "auth", qstring_from_str(auth));
@ -376,16 +389,30 @@ static SpiceChannelList *qmp_query_spice_channels(void)
QTAILQ_FOREACH(item, &channel_list, link) { QTAILQ_FOREACH(item, &channel_list, link) {
SpiceChannelList *chan; SpiceChannelList *chan;
char host[NI_MAXHOST], port[NI_MAXSERV]; char host[NI_MAXHOST], port[NI_MAXSERV];
struct sockaddr *paddr;
socklen_t plen;
chan = g_malloc0(sizeof(*chan)); chan = g_malloc0(sizeof(*chan));
chan->value = g_malloc0(sizeof(*chan->value)); chan->value = g_malloc0(sizeof(*chan->value));
getnameinfo(&item->info->paddr, item->info->plen, #ifdef SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT
if (item->info->flags & SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT) {
paddr = (struct sockaddr *)&item->info->paddr_ext;
plen = item->info->plen_ext;
} else {
#endif
paddr = &item->info->paddr;
plen = item->info->plen;
#ifdef SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT
}
#endif
getnameinfo(paddr, plen,
host, sizeof(host), port, sizeof(port), host, sizeof(host), port, sizeof(port),
NI_NUMERICHOST | NI_NUMERICSERV); NI_NUMERICHOST | NI_NUMERICSERV);
chan->value->host = g_strdup(host); chan->value->host = g_strdup(host);
chan->value->port = g_strdup(port); chan->value->port = g_strdup(port);
chan->value->family = g_strdup(inet_strfamily(item->info->paddr.sa_family)); chan->value->family = g_strdup(inet_strfamily(paddr->sa_family));
chan->value->connection_id = item->info->connection_id; chan->value->connection_id = item->info->connection_id;
chan->value->channel_type = item->info->type; chan->value->channel_type = item->info->type;