RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Pass error messages to control socket

v0.8
Andri Yngvason 2023-12-26 15:06:05 +00:00
parent a7ed782bb9
commit fb4c5c55a1
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.c
View File

@ -1558,16 +1558,42 @@ void switch_to_prev_output(struct wayvnc* self)
switch_to_output(self, prev); switch_to_output(self, prev);
} }
static char intercepted_error[256];
static void intercept_cmd_error(const struct nvnc_log_data* meta,
const char* message)
{
if (meta->level != NVNC_LOG_ERROR) {
nvnc_default_logger(meta, message);
return;
}
struct nvnc_log_data meta_override = *meta;
meta_override.level = NVNC_LOG_DEBUG;
nvnc_default_logger(&meta_override, message);
size_t len = strlen(intercepted_error);
if (len != 0 && len < sizeof(intercepted_error) - 2)
intercepted_error[len++] = '\n';
strlcpy(intercepted_error + len, message,
sizeof(intercepted_error) - len);
}
static struct cmd_response* on_attach(struct ctl* ctl, const char* display) static struct cmd_response* on_attach(struct ctl* ctl, const char* display)
{ {
struct wayvnc* self = ctl_server_userdata(ctl); struct wayvnc* self = ctl_server_userdata(ctl);
assert(self); assert(self);
// TODO: Add optional output argument memset(intercepted_error, 0, sizeof(intercepted_error));
if (!wayland_attach(self, display, NULL)) nvnc_set_log_fn_thread_local(intercept_cmd_error);
return cmd_failed("Failed to attach to %s", display);
return cmd_ok(); // TODO: Add optional output argument
bool ok = wayland_attach(self, display, NULL);
nvnc_set_log_fn_thread_local(NULL);
return ok ? cmd_ok() : cmd_failed("%s", intercepted_error);
} }
static bool wayland_attach(struct wayvnc* self, const char* display, static bool wayland_attach(struct wayvnc* self, const char* display,