pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-05 04:02:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: pull out reds_handle_link(), for future reuse

Browse Source 
+ a couple of indent, style change

https://bugs.freedesktop.org/show_bug.cgi?id=34795
This commit is contained in:
Marc-André Lureau 2011-02-11 03:57:59 +01:00 committed by Alon Levy
parent b1df04b9c5
commit 8186db28c2
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/reds.c
View File

@ -2543,6 +2543,15 @@ static void reds_handle_other_links(RedLinkInfo *link)
free(link_mess);
}
static void reds_handle_link(RedLinkInfo *link)
{
if (link->link_mess->channel_type == SPICE_CHANNEL_MAIN) {
reds_handle_main_link(link);
} else {
reds_handle_other_links(link);
}
}
static void reds_handle_ticket(void *opaque)
{
RedLinkInfo *link = (RedLinkInfo *)opaque;
@ -2573,11 +2582,8 @@ static void reds_handle_ticket(void *opaque)
return;
}
}
if (link->link_mess->channel_type == SPICE_CHANNEL_MAIN) {
reds_handle_main_link(link);
} else {
reds_handle_other_links(link);
}
reds_handle_link(link);
}
static inline void async_read_clear_handlers(AsyncRead *obj)
@ -2646,8 +2652,8 @@ static void reds_handle_read_link_done(void *opaque)
uint32_t num_caps = link_mess->num_common_caps + link_mess->num_channel_caps;
if (num_caps && (num_caps * sizeof(uint32_t) + link_mess->caps_offset >
link->link_header.size ||
link_mess->caps_offset < sizeof(*link_mess))) {
link->link_header.size ||
link_mess->caps_offset < sizeof(*link_mess))) {
reds_send_link_error(link, SPICE_LINK_ERR_INVALID_DATA);
reds_link_free(link);
return;
@ -2821,6 +2827,7 @@ static RedLinkInfo *reds_accept_connection(int listen_socket)
if (!(link = __reds_accept_connection(listen_socket))) {
return NULL;
}
stream = link->stream;
stream->read = stream_read_cb;
stream->write = stream_write_cb;
@ -2916,7 +2923,7 @@ static int reds_init_socket(const char *addr, int portnr, int family)
snprintf(port, sizeof(port), "%d", portnr);
rc = getaddrinfo(strlen(addr) ? addr : NULL, port, &ai, &res);
if (rc != 0) {
red_error("getaddrinfo(%s,%s): %s\n", addr, port,
red_error("getaddrinfo(%s,%s): %s", addr, port,
gai_strerror(rc));
}
@ -2942,7 +2949,7 @@ static int reds_init_socket(const char *addr, int portnr, int family)
}
close(slisten);
}
red_printf("%s: binding socket to %s:%d failed\n", __FUNCTION__,
red_printf("%s: binding socket to %s:%d failed", __FUNCTION__,
addr, portnr);
freeaddrinfo(res);
return -1;