这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: reenable abstract sockets and prevent socket leaking to xstartup session #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025
Merged

fix: reenable abstract sockets and prevent socket leaking to xstartup session #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions app/src/main/cpp/patches/Xtrans.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,6 @@ diff --git a/Xtranssock.c b/Xtranssock.c
index b06579c..bb5238b 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -141,10 +141,6 @@
/* others don't need this */
#define SocketInitOnce() /**/

-#ifdef __linux__
-#define HAVE_ABSTRACT_SOCKETS
-#endif
-
#define MIN_BACKLOG 128
#ifdef SOMAXCONN
#if SOMAXCONN > MIN_BACKLOG
@@ -200,20 +196,28 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr);


Expand Down
10 changes: 10 additions & 0 deletions app/src/main/cpp/patches/xserver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,3 +349,13 @@ index f9b7b06d9..f4b2aeddc 100644
if (!IsKeyboardDevice(pDev))
return;


+++ ./os/connection.c
@@ -281,6 +281,7 @@ CreateWellKnownSockets(void)
int fd = _XSERVTransGetConnectionNumber(ListenTransConns[i]);

ListenTransFds[i] = fd;
+ _XSERVTransSetOption(ListenTransConns[i], TRANS_CLOSEONEXEC, 0);
SetNotifyFd(fd, EstablishNewConnections, X_NOTIFY_READ, NULL);

if (!_XSERVTransIsLocal(ListenTransConns[i]))