Skip to content

N
nx-libs
Commit e8bc4c7e authored by Kristian Høgsberg's avatar Kristian Høgsberg Committed by Mike Gabriel
Browse files
Options

os: Add a mechanism to prevent creating any listen sockets

commit 44fe1b8ea284df6bbaef67e246016d104665b2fe Author: Kristian Høgsberg <krh@bitplanet.net> Date: Wed Mar 19 14:03:13 2014 -0700 os: Add a mechanism to prevent creating any listen sockets A socket-activated server will receive its listening sockets from the parent process and should not create its own sockets. This patch introduces a NoListen flag that can be set by a DDX to prevent the server from creating the sockets. When NoListen is enabled, we also disable the server lock checking, since the parent process is responsible for checking the lock before picking the display name and creating the sockets. Signed-off-by: 's avatarKristian Høgsberg <krh@bitplanet.net> Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Reviewed-by: 's avatarDaniel Stone <daniel@fooishbar.org> Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
parent 89496d98
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
nx-X11/programs/Xserver/include/opaque.h
View file @ e8bc4c7e
......@@ -77,6 +77,6 @@ extern long maxBigRequestSize;
extern Bool blackRoot;
extern Bool CoreDump;
extern Bool NoListenAll;
#endif /* OPAQUE_H */
nx-X11/programs/Xserver/os/connection.c
View file @ e8bc4c7e
......@@ -137,6 +137,7 @@ int MaxClients = 0;
int NumNotifyWriteFd; /* Number of NotifyFd members with write set */
Bool NewOutputPending; /* not yet attempted to write some new output */
Bool AnyWritesPending; /* true if some client blocked on write or NotifyFd with write */
Bool NoListenAll; /* Don't establish any listening sockets */
Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
static char dynamic_display[7]; /* display name */
Bool PartialNetwork; /* continue even if unable to bind all addrs */
......@@ -411,7 +412,10 @@ CreateWellKnownSockets(void)
/* display is initialized to "0" by main(). It is then set to the display
* number if specified on the command line, or to NULL when the -displayfd
* option is used. */
if (display) {
if (NoListenAll) {
ListenTransCount = 0;
}
else if (display) {
if (TryCreateSocket(atoi(display), &partial) &&
ListenTransCount >= 1)
if (!PartialNetwork && partial)
......@@ -445,7 +449,7 @@ CreateWellKnownSockets(void)
DefineSelf (fd);
}
if (!XFD_ANYSET (&WellKnownConnections))
if (!XFD_ANYSET (&WellKnownConnections) && !NoListenAll)
FatalError ("Cannot establish any listening sockets - Make sure an X server isn't already running");
#if !defined(WIN32)
OsSignal (SIGPIPE, SIG_IGN);
......
nx-X11/programs/Xserver/os/utils.c
View file @ e8bc4c7e
......@@ -338,7 +338,7 @@ LockServer(void)
int len;
char port[20];
if (nolock) return;
if (nolock || NoListenAll) return;
/*
* Path names
*/
......@@ -464,7 +464,7 @@ LockServer(void)
void
UnlockServer(void)
{
if (nolock) return;
if (nolock || NoListenAll) return;
if (!StillLocking){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment