nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1882255 [Linux] Wayland-Proxy: check Wayland compositor is here before we run proxy r=emilio

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D202806
This commit is contained in:
stransky 2024-02-29 21:07:04 +00:00
parent f76aefd29e
commit 7fd26424b8
2 changed files with 51 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

54
third_party/wayland-proxy/wayland-proxy.cpp vendored
View file

@ -464,6 +464,45 @@ bool ProxiedConnection::Process() {
return !mFailed; return !mFailed;
} }
bool WaylandProxy::CheckWaylandDisplay(const char* aWaylandDisplay) {
struct sockaddr_un addr = {};
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, aWaylandDisplay);
int sc = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
if (sc == -1) {
Error("CheckWaylandDisplay(): failed to create socket");
return false;
}
bool ret =
connect(sc, (const struct sockaddr*)&addr,
sizeof(struct sockaddr_un)) != -1;
if (!ret) {
switch (errno) {
case EAGAIN:
case EALREADY:
case ECONNREFUSED:
case EINPROGRESS:
case EINTR:
case EISCONN:
case ETIMEDOUT:
// We can recover from these errors and try again
ret = true;
break;
default:
ErrorPlain(
"CheckWaylandDisplay(): Failed to connect to Wayland display '%s' error: %s\n",
mWaylandDisplay, strerror(errno));
break;
}
}
close(sc);
return ret;
}
bool WaylandProxy::SetupWaylandDisplays() { bool WaylandProxy::SetupWaylandDisplays() {
char* waylandDisplay = getenv("WAYLAND_DISPLAY_COMPOSITOR"); char* waylandDisplay = getenv("WAYLAND_DISPLAY_COMPOSITOR");
if (!waylandDisplay) { if (!waylandDisplay) {
@ -496,8 +535,9 @@ bool WaylandProxy::SetupWaylandDisplays() {
} }
} }
// Save original Wayland display variable for potential reuse if (!CheckWaylandDisplay(mWaylandDisplay)) {
setenv("WAYLAND_DISPLAY_COMPOSITOR", waylandDisplay, /* overwrite = */ true); return false;
}
int ret = snprintf(mWaylandProxy, sMaxDisplayNameLen, int ret = snprintf(mWaylandProxy, sMaxDisplayNameLen,
"%s/wayland-proxy-%d", XDGRuntimeDir, getpid()); "%s/wayland-proxy-%d", XDGRuntimeDir, getpid());
@ -506,7 +546,11 @@ bool WaylandProxy::SetupWaylandDisplays() {
return false; return false;
} }
Info("SetupWaylandDisplays() Wayland '%s' proxy '%s'\n", mWaylandDisplay, mWaylandProxy); // Save original Wayland display variable for potential reuse
setenv("WAYLAND_DISPLAY_COMPOSITOR", waylandDisplay, /* overwrite = */ true);
Info("SetupWaylandDisplays() Wayland '%s' proxy '%s'\n",
mWaylandDisplay, mWaylandProxy);
return true; return true;
} }
@ -733,7 +777,9 @@ bool WaylandProxy::RunChildApplication(char* argv[]) {
if (mApplicationPID == 0) { if (mApplicationPID == 0) {
SetWaylandProxyDisplay(); SetWaylandProxyDisplay();
if (execv(argv[0], argv) == -1) { if (execv(argv[0], argv) == -1) {
ErrorPlain("WaylandProxy::RunChildApplication: failed to run %s error %s\n", argv[0], strerror(errno)); ErrorPlain(
"WaylandProxy::RunChildApplication: failed to run %s error %s\n",
argv[0], strerror(errno));
exit(1); exit(1);
} }
} }

1
third_party/wayland-proxy/wayland-proxy.h vendored
View file

@ -39,6 +39,7 @@ class WaylandProxy {
void SetWaylandProxyDisplay(); void SetWaylandProxyDisplay();
static void* RunProxyThread(WaylandProxy* aProxy); static void* RunProxyThread(WaylandProxy* aProxy);
bool CheckWaylandDisplay(const char* aWaylandDisplay);
bool SetupWaylandDisplays(); bool SetupWaylandDisplays();
bool StartProxyServer(); bool StartProxyServer();