mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-02 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: add log message when client connection is destroyed due to an error

Browse source 
The client connection is destroyed by the server in several
circumstances. This patch adds log messages in case the connection is
destroyed due to an error other than normal hangup.

Signed-off-by: Mathias Fiedler <mathias_fiedler@mentor.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Fiedler, Mathias 2017-12-05 09:49:52 +01:00 • committed by Derek Foreman
parent ff992951a7
commit 35ab47567c
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/wayland-server.c
View file

@ -300,6 +300,13 @@ wl_resource_post_error(struct wl_resource *resource,
client->error = 1; client->error = 1;
} }
static void
destroy_client_with_error(struct wl_client *client, const char *reason)
{
wl_log("%s (pid %u)\n", reason, client->ucred.pid);
wl_client_destroy(client);
}
static int static int
wl_client_connection_data(int fd, uint32_t mask, void *data) wl_client_connection_data(int fd, uint32_t mask, void *data)
{ {
@ -314,15 +321,21 @@ wl_client_connection_data(int fd, uint32_t mask, void *data)
int opcode, size, since; int opcode, size, since;
int len; int len;
if (mask & (WL_EVENT_ERROR | WL_EVENT_HANGUP)) { if (mask & WL_EVENT_HANGUP) {
wl_client_destroy(client); wl_client_destroy(client);
return 1; return 1;
} }
if (mask & WL_EVENT_ERROR) {
destroy_client_with_error(client, "socket error");
return 1;
}
if (mask & WL_EVENT_WRITABLE) { if (mask & WL_EVENT_WRITABLE) {
len = wl_connection_flush(connection); len = wl_connection_flush(connection);
if (len < 0 && errno != EAGAIN) { if (len < 0 && errno != EAGAIN) {
wl_client_destroy(client); destroy_client_with_error(
client, "failed to flush client connection");
return 1; return 1;
} else if (len >= 0) { } else if (len >= 0) {
wl_event_source_fd_update(client->source, wl_event_source_fd_update(client->source,
@ -334,7 +347,8 @@ wl_client_connection_data(int fd, uint32_t mask, void *data)
if (mask & WL_EVENT_READABLE) { if (mask & WL_EVENT_READABLE) {
len = wl_connection_read(connection); len = wl_connection_read(connection);
if (len == 0 || (len < 0 && errno != EAGAIN)) { if (len == 0 || (len < 0 && errno != EAGAIN)) {
wl_client_destroy(client); destroy_client_with_error(
client, "failed to read client connection");
return 1; return 1;
} }
} }
@ -418,8 +432,10 @@ wl_client_connection_data(int fd, uint32_t mask, void *data)
len = wl_connection_pending_input(connection); len = wl_connection_pending_input(connection);
} }
if (client->error) if (client->error) {
wl_client_destroy(client); destroy_client_with_error(client,
"error in client communication");
}
return 1; return 1;
} }