[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/25] vnc: Hoist allocation of VncBasicInfo to calle
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 06/25] vnc: Hoist allocation of VncBasicInfo to callers |
Date: |
Fri, 30 Oct 2015 16:42:35 +0100 |
From: Eric Blake <address@hidden>
A future qapi patch will rework generated structs with a base
class to be unboxed. In preparation for that, change the code
that allocates then populates an info struct to instead merely
populate the fields of an info field passed in as a parameter
(renaming vnc_basic_info_get* to vnc_init_basic_info*). Add
rudimentary Error handling at the lowest levels for cases
where the old code returned NULL; but rather than plumb Error
all the way through the stack, the callers drop the error and
return NULL as before.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
ui/vnc.c | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 34 insertions(+), 23 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index faff054..502a10a 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -156,10 +156,11 @@ char *vnc_socket_remote_addr(const char *format, int fd) {
return addr_to_string(format, &sa, salen);
}
-static VncBasicInfo *vnc_basic_info_get(struct sockaddr_storage *sa,
- socklen_t salen)
+static void vnc_init_basic_info(struct sockaddr_storage *sa,
+ socklen_t salen,
+ VncBasicInfo *info,
+ Error **errp)
{
- VncBasicInfo *info;
char host[NI_MAXHOST];
char serv[NI_MAXSERV];
int err;
@@ -168,42 +169,44 @@ static VncBasicInfo *vnc_basic_info_get(struct
sockaddr_storage *sa,
host, sizeof(host),
serv, sizeof(serv),
NI_NUMERICHOST | NI_NUMERICSERV)) != 0) {
- VNC_DEBUG("Cannot resolve address %d: %s\n",
- err, gai_strerror(err));
- return NULL;
+ error_setg(errp, "Cannot resolve address: %s",
+ gai_strerror(err));
+ return;
}
- info = g_malloc0(sizeof(VncBasicInfo));
info->host = g_strdup(host);
info->service = g_strdup(serv);
info->family = inet_netfamily(sa->ss_family);
- return info;
}
-static VncBasicInfo *vnc_basic_info_get_from_server_addr(int fd)
+static void vnc_init_basic_info_from_server_addr(int fd, VncBasicInfo *info,
+ Error **errp)
{
struct sockaddr_storage sa;
socklen_t salen;
salen = sizeof(sa);
if (getsockname(fd, (struct sockaddr*)&sa, &salen) < 0) {
- return NULL;
+ error_setg_errno(errp, errno, "getsockname failed");
+ return;
}
- return vnc_basic_info_get(&sa, salen);
+ vnc_init_basic_info(&sa, salen, info, errp);
}
-static VncBasicInfo *vnc_basic_info_get_from_remote_addr(int fd)
+static void vnc_init_basic_info_from_remote_addr(int fd, VncBasicInfo *info,
+ Error **errp)
{
struct sockaddr_storage sa;
socklen_t salen;
salen = sizeof(sa);
if (getpeername(fd, (struct sockaddr*)&sa, &salen) < 0) {
- return NULL;
+ error_setg_errno(errp, errno, "getpeername failed");
+ return;
}
- return vnc_basic_info_get(&sa, salen);
+ vnc_init_basic_info(&sa, salen, info, errp);
}
static const char *vnc_auth_name(VncDisplay *vd) {
@@ -256,15 +259,18 @@ static const char *vnc_auth_name(VncDisplay *vd) {
static VncServerInfo *vnc_server_info_get(VncDisplay *vd)
{
VncServerInfo *info;
- VncBasicInfo *bi = vnc_basic_info_get_from_server_addr(vd->lsock);
- if (!bi) {
- return NULL;
- }
+ Error *err = NULL;
info = g_malloc(sizeof(*info));
- info->base = bi;
+ info->base = g_malloc(sizeof(*info->base));
+ vnc_init_basic_info_from_server_addr(vd->lsock, info->base, &err);
info->has_auth = true;
info->auth = g_strdup(vnc_auth_name(vd));
+ if (err) {
+ qapi_free_VncServerInfo(info);
+ info = NULL;
+ error_free(err);
+ }
return info;
}
@@ -291,11 +297,16 @@ static void vnc_client_cache_auth(VncState *client)
static void vnc_client_cache_addr(VncState *client)
{
- VncBasicInfo *bi = vnc_basic_info_get_from_remote_addr(client->csock);
+ Error *err = NULL;
- if (bi) {
- client->info = g_malloc0(sizeof(*client->info));
- client->info->base = bi;
+ client->info = g_malloc0(sizeof(*client->info));
+ client->info->base = g_malloc0(sizeof(*client->info->base));
+ vnc_init_basic_info_from_remote_addr(client->csock, client->info->base,
+ &err);
+ if (err) {
+ qapi_free_VncClientInfo(client->info);
+ client->info = NULL;
+ error_free(err);
}
}
--
2.4.3
- [Qemu-devel] [PULL 04/25] qapi: Reserve '*List' type names for list types, (continued)
- [Qemu-devel] [PULL 04/25] qapi: Reserve '*List' type names for list types, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 03/25] qapi: More robust conditions for when labels are needed, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 16/25] sockets: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 13/25] qapi-visit: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 12/25] qapi: Start converting to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 21/25] tpm: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 25/25] qapi-schema: mark InetSocketAddress as mandatory again, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 24/25] qapi: Simplify gen_struct_field(), Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 05/25] qapi: Reserve 'q_*' and 'has_*' member names, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 10/25] qapi: Unbox base members, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 06/25] vnc: Hoist allocation of VncBasicInfo to callers,
Markus Armbruster <=
- [Qemu-devel] [PULL 09/25] qapi: Prefer typesafe upcasts to qapi base classes, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 20/25] memory: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 01/25] tests/qapi-schema: Test for reserved names, empty struct, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 17/25] net: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 15/25] block: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 22/25] qapi: Finish converting to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 14/25] tests: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 11/25] qapi-visit: Remove redundant functions for flat union base, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 19/25] input: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 18/25] char: Convert to new qapi union layout, Markus Armbruster, 2015/10/30