2003-11-14 16:54:54 +01:00
|
|
|
/***********************************************************
|
|
|
|
|
|
|
|
Copyright 1987, 1989, 1998 The Open Group
|
|
|
|
|
|
|
|
Permission to use, copy, modify, distribute, and sell this software and its
|
|
|
|
documentation for any purpose is hereby granted without fee, provided that
|
|
|
|
the above copyright notice appear in all copies and that both that
|
|
|
|
copyright notice and this permission notice appear in supporting
|
|
|
|
documentation.
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
|
|
all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
|
|
|
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
|
|
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
|
|
|
|
Except as contained in this notice, the name of The Open Group shall not be
|
|
|
|
used in advertising or otherwise to promote the sale, use or other dealings
|
|
|
|
in this Software without prior written authorization from The Open Group.
|
|
|
|
|
|
|
|
Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
|
|
|
|
|
|
|
|
All Rights Reserved
|
|
|
|
|
2014-10-31 00:45:12 +01:00
|
|
|
Permission to use, copy, modify, and distribute this software and its
|
|
|
|
documentation for any purpose and without fee is hereby granted,
|
2003-11-14 16:54:54 +01:00
|
|
|
provided that the above copyright notice appear in all copies and that
|
2014-10-31 00:45:12 +01:00
|
|
|
both that copyright notice and this permission notice appear in
|
2003-11-14 16:54:54 +01:00
|
|
|
supporting documentation, and that the name of Digital not be
|
|
|
|
used in advertising or publicity pertaining to distribution of the
|
2014-10-31 00:45:12 +01:00
|
|
|
software without specific, written prior permission.
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
|
|
|
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
|
|
|
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
|
|
|
|
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
|
|
|
|
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
|
|
|
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
|
|
SOFTWARE.
|
|
|
|
|
|
|
|
******************************************************************/
|
|
|
|
/*****************************************************************
|
|
|
|
* Stuff to create connections --- OS dependent
|
|
|
|
*
|
|
|
|
* EstablishNewConnections, CreateWellKnownSockets, ResetWellKnownSockets,
|
2016-05-29 21:45:53 +02:00
|
|
|
* CloseDownConnection,
|
2015-12-08 00:12:14 +01:00
|
|
|
* OnlyListToOneClient,
|
2003-11-14 16:54:54 +01:00
|
|
|
* ListenToAllClients,
|
|
|
|
*
|
|
|
|
* (WaitForSomething is in its own file)
|
|
|
|
*
|
|
|
|
* In this implementation, a client socket table is not kept.
|
|
|
|
* Instead, what would be the index into the table is just the
|
|
|
|
* file descriptor of the socket. This won't work for if the
|
|
|
|
* socket ids aren't small nums (0 - 2^8)
|
|
|
|
*
|
|
|
|
*****************************************************************/
|
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#endif
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef WIN32
|
|
|
|
#include <X11/Xwinsock.h>
|
|
|
|
#endif
|
2005-04-20 14:25:48 +02:00
|
|
|
#include <X11/X.h>
|
|
|
|
#include <X11/Xproto.h>
|
2005-07-03 09:02:09 +02:00
|
|
|
#define XSERV_t
|
|
|
|
#define TRANS_SERVER
|
|
|
|
#define TRANS_REOPEN
|
2005-04-20 14:25:48 +02:00
|
|
|
#include <X11/Xtrans/Xtrans.h>
|
2007-09-06 05:33:43 +02:00
|
|
|
#include <X11/Xtrans/Xtransint.h>
|
2003-11-14 16:54:54 +01:00
|
|
|
#include <errno.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#include <stdio.h>
|
2003-11-25 20:29:01 +01:00
|
|
|
#include <stdlib.h>
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
#ifndef WIN32
|
|
|
|
#include <sys/socket.h>
|
|
|
|
|
2016-02-08 23:36:03 +01:00
|
|
|
#if defined(TCPCONN)
|
2012-03-21 20:55:09 +01:00
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#ifdef apollo
|
|
|
|
#ifndef NO_TCP_H
|
|
|
|
#include <netinet/tcp.h>
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
#ifdef CSRG_BASED
|
|
|
|
#include <sys/param.h>
|
|
|
|
#endif
|
|
|
|
#include <netinet/tcp.h>
|
|
|
|
#endif
|
|
|
|
#include <arpa/inet.h>
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <sys/uio.h>
|
2008-07-17 17:59:24 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
#endif /* WIN32 */
|
|
|
|
#include "misc.h" /* for typedef of pointer */
|
2003-11-14 16:54:54 +01:00
|
|
|
#include "osdep.h"
|
|
|
|
#include "opaque.h"
|
|
|
|
#include "dixstruct.h"
|
2004-05-05 22:04:52 +02:00
|
|
|
#include "xace.h"
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
#define Pid_t pid_t
|
|
|
|
|
2011-12-01 07:20:09 +01:00
|
|
|
#ifdef HAVE_GETPEERUCRED
|
2012-03-21 20:55:09 +01:00
|
|
|
#include <ucred.h>
|
|
|
|
#include <zone.h>
|
2014-12-10 03:27:11 +01:00
|
|
|
#else
|
2012-03-21 20:55:09 +01:00
|
|
|
#define zoneid_t int
|
|
|
|
#endif
|
2014-12-10 03:27:11 +01:00
|
|
|
|
2019-05-01 17:07:03 +02:00
|
|
|
#ifdef HAVE_SYSTEMD_DAEMON
|
|
|
|
#include <systemd/sd-daemon.h>
|
|
|
|
#endif
|
|
|
|
|
2014-12-10 03:27:11 +01:00
|
|
|
#include "probes.h"
|
2006-11-03 21:54:43 +01:00
|
|
|
|
2016-05-26 19:40:44 +02:00
|
|
|
struct ospoll *server_poll;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
Bool NewOutputPending; /* not yet attempted to write some new output */
|
2014-03-19 22:03:13 +01:00
|
|
|
Bool NoListenAll; /* Don't establish any listening sockets */
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
|
|
|
|
Bool RunFromSigStopParent; /* send SIGSTOP to our own process; Upstart (or
|
|
|
|
equivalent) will send SIGCONT back. */
|
2012-04-05 00:29:42 +02:00
|
|
|
static char dynamic_display[7]; /* display name */
|
2012-03-21 20:55:09 +01:00
|
|
|
Bool PartialNetwork; /* continue even if unable to bind all addrs */
|
2003-11-14 16:54:54 +01:00
|
|
|
static Pid_t ParentProcess;
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int GrabInProgress = 0;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2015-11-12 07:02:17 +01:00
|
|
|
static void
|
2018-10-25 19:13:13 +02:00
|
|
|
EstablishNewConnections(int curconn, int ready, void *data);
|
2015-11-12 07:02:17 +01:00
|
|
|
|
2016-05-26 19:40:44 +02:00
|
|
|
static void
|
|
|
|
set_poll_client(ClientPtr client);
|
|
|
|
|
|
|
|
static void
|
|
|
|
set_poll_clients(void);
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
static XtransConnInfo *ListenTransConns = NULL;
|
|
|
|
static int *ListenTransFds = NULL;
|
|
|
|
static int ListenTransCount;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
static void ErrorConnMax(XtransConnInfo /* trans_conn */ );
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
static XtransConnInfo
|
2012-03-21 20:55:09 +01:00
|
|
|
lookup_trans_conn(int fd)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ListenTransFds) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ListenTransCount; i++)
|
|
|
|
if (ListenTransFds[i] == fd)
|
|
|
|
return ListenTransConns[i];
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
2010-06-06 16:18:40 +02:00
|
|
|
return NULL;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
2007-11-01 20:41:11 +01:00
|
|
|
/*
|
|
|
|
* If SIGUSR1 was set to SIG_IGN when the server started, assume that either
|
|
|
|
*
|
|
|
|
* a- The parent process is ignoring SIGUSR1
|
|
|
|
*
|
|
|
|
* or
|
|
|
|
*
|
|
|
|
* b- The parent process is expecting a SIGUSR1
|
|
|
|
* when the server is ready to accept connections
|
|
|
|
*
|
|
|
|
* In the first case, the signal will be harmless, in the second case,
|
|
|
|
* the signal will be quite useful.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
InitParentProcess(void)
|
|
|
|
{
|
|
|
|
#if !defined(WIN32)
|
|
|
|
OsSigHandlerPtr handler;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
|
|
|
handler = OsSignal(SIGUSR1, SIG_IGN);
|
|
|
|
if (handler == SIG_IGN)
|
|
|
|
RunFromSmartParent = TRUE;
|
2007-11-01 20:41:11 +01:00
|
|
|
OsSignal(SIGUSR1, handler);
|
2012-03-21 20:55:09 +01:00
|
|
|
ParentProcess = getppid();
|
2007-11-01 20:41:11 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2007-11-01 20:41:11 +01:00
|
|
|
NotifyParentProcess(void)
|
|
|
|
{
|
|
|
|
#if !defined(WIN32)
|
2013-03-11 15:34:32 +01:00
|
|
|
if (displayfd >= 0) {
|
2014-04-19 00:00:30 +02:00
|
|
|
if (write(displayfd, display, strlen(display)) != strlen(display))
|
|
|
|
FatalError("Cannot write display number to fd %d\n", displayfd);
|
|
|
|
if (write(displayfd, "\n", 1) != 1)
|
|
|
|
FatalError("Cannot write display number to fd %d\n", displayfd);
|
2012-04-05 00:29:42 +02:00
|
|
|
close(displayfd);
|
2014-04-19 00:00:35 +02:00
|
|
|
displayfd = -1;
|
2012-04-05 00:29:42 +02:00
|
|
|
}
|
2007-11-01 20:41:11 +01:00
|
|
|
if (RunFromSmartParent) {
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ParentProcess > 1) {
|
|
|
|
kill(ParentProcess, SIGUSR1);
|
|
|
|
}
|
2007-11-01 20:41:11 +01:00
|
|
|
}
|
2010-08-30 20:24:30 +02:00
|
|
|
if (RunFromSigStopParent)
|
2012-03-21 20:55:09 +01:00
|
|
|
raise(SIGSTOP);
|
2019-05-01 17:07:03 +02:00
|
|
|
#ifdef HAVE_SYSTEMD_DAEMON
|
|
|
|
/* If we have been started as a systemd service, tell systemd that
|
|
|
|
we are ready. Otherwise sd_notify() won't do anything. */
|
|
|
|
sd_notify(0, "READY=1");
|
|
|
|
#endif
|
2007-11-01 20:41:11 +01:00
|
|
|
#endif
|
|
|
|
}
|
2003-11-14 17:49:22 +01:00
|
|
|
|
2012-04-05 00:29:42 +02:00
|
|
|
static Bool
|
|
|
|
TryCreateSocket(int num, int *partial)
|
|
|
|
{
|
|
|
|
char port[20];
|
|
|
|
|
|
|
|
snprintf(port, sizeof(port), "%d", num);
|
|
|
|
|
|
|
|
return (_XSERVTransMakeAllCOTSServerListeners(port, partial,
|
|
|
|
&ListenTransCount,
|
|
|
|
&ListenTransConns) >= 0);
|
|
|
|
}
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
/*****************
|
|
|
|
* CreateWellKnownSockets
|
|
|
|
* At initialization, create the sockets to listen on for new clients.
|
|
|
|
*****************/
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-25 20:29:01 +01:00
|
|
|
CreateWellKnownSockets(void)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int i;
|
|
|
|
int partial;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-04-05 00:29:42 +02:00
|
|
|
/* display is initialized to "0" by main(). It is then set to the display
|
2013-03-11 15:34:32 +01:00
|
|
|
* number if specified on the command line. */
|
|
|
|
|
2014-03-19 22:03:13 +01:00
|
|
|
if (NoListenAll) {
|
|
|
|
ListenTransCount = 0;
|
|
|
|
}
|
2013-03-11 15:34:32 +01:00
|
|
|
else if ((displayfd < 0) || explicit_display) {
|
2012-04-05 00:29:42 +02:00
|
|
|
if (TryCreateSocket(atoi(display), &partial) &&
|
|
|
|
ListenTransCount >= 1)
|
|
|
|
if (!PartialNetwork && partial)
|
|
|
|
FatalError ("Failed to establish all listening sockets");
|
|
|
|
}
|
2013-03-11 15:34:32 +01:00
|
|
|
else { /* -displayfd and no explicit display number */
|
2012-04-05 00:29:42 +02:00
|
|
|
Bool found = 0;
|
2014-10-21 16:03:55 +02:00
|
|
|
for (i = 0; i < 65536 - X_TCP_PORT; i++) {
|
2012-04-05 00:29:42 +02:00
|
|
|
if (TryCreateSocket(i, &partial) && !partial) {
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
CloseWellKnownConnections();
|
2012-03-21 20:55:09 +01:00
|
|
|
}
|
2012-04-05 00:29:42 +02:00
|
|
|
if (!found)
|
|
|
|
FatalError("Failed to find a socket to listen on");
|
|
|
|
snprintf(dynamic_display, sizeof(dynamic_display), "%d", i);
|
|
|
|
display = dynamic_display;
|
2016-01-02 03:11:14 +01:00
|
|
|
LogSetDisplay();
|
2012-04-05 00:29:42 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2015-03-21 18:08:25 +01:00
|
|
|
ListenTransFds = xallocarray(ListenTransCount, sizeof (int));
|
|
|
|
if (ListenTransFds == NULL)
|
|
|
|
FatalError ("Failed to create listening socket array");
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2012-04-05 00:29:42 +02:00
|
|
|
for (i = 0; i < ListenTransCount; i++) {
|
|
|
|
int fd = _XSERVTransGetConnectionNumber(ListenTransConns[i]);
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2012-04-05 00:29:42 +02:00
|
|
|
ListenTransFds[i] = fd;
|
2018-10-25 19:13:13 +02:00
|
|
|
SetNotifyFd(fd, EstablishNewConnections, X_NOTIFY_READ, NULL);
|
2012-04-05 00:29:42 +02:00
|
|
|
|
|
|
|
if (!_XSERVTransIsLocal(ListenTransConns[i]))
|
|
|
|
DefineSelf (fd);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
2015-11-12 07:02:17 +01:00
|
|
|
if (ListenTransCount == 0 && !NoListenAll)
|
2012-03-21 20:55:09 +01:00
|
|
|
FatalError
|
|
|
|
("Cannot establish any listening sockets - Make sure an X server isn't already running");
|
2014-03-19 22:03:13 +01:00
|
|
|
|
2003-11-14 17:49:22 +01:00
|
|
|
#if !defined(WIN32)
|
2012-03-21 20:55:09 +01:00
|
|
|
OsSignal(SIGPIPE, SIG_IGN);
|
|
|
|
OsSignal(SIGHUP, AutoResetServer);
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
OsSignal(SIGINT, GiveUp);
|
|
|
|
OsSignal(SIGTERM, GiveUp);
|
2003-11-14 16:54:54 +01:00
|
|
|
ResetHosts(display);
|
2007-11-01 20:41:11 +01:00
|
|
|
|
|
|
|
InitParentProcess();
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef XDMCP
|
2012-03-21 20:55:09 +01:00
|
|
|
XdmcpInit();
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
ResetWellKnownSockets(void)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
ResetOsBuffers();
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
for (i = 0; i < ListenTransCount; i++) {
|
|
|
|
int status = _XSERVTransResetListener(ListenTransConns[i]);
|
|
|
|
|
|
|
|
if (status != TRANS_RESET_NOOP) {
|
|
|
|
if (status == TRANS_RESET_FAILURE) {
|
|
|
|
/*
|
|
|
|
* ListenTransConns[i] freed by xtrans.
|
|
|
|
* Remove it from out list.
|
|
|
|
*/
|
|
|
|
|
2015-11-12 07:02:17 +01:00
|
|
|
RemoveNotifyFd(ListenTransFds[i]);
|
2012-03-21 20:55:09 +01:00
|
|
|
ListenTransFds[i] = ListenTransFds[ListenTransCount - 1];
|
|
|
|
ListenTransConns[i] = ListenTransConns[ListenTransCount - 1];
|
|
|
|
ListenTransCount -= 1;
|
|
|
|
i -= 1;
|
|
|
|
}
|
|
|
|
else if (status == TRANS_RESET_NEW_FD) {
|
|
|
|
/*
|
|
|
|
* A new file descriptor was allocated (the old one was closed)
|
|
|
|
*/
|
|
|
|
|
|
|
|
int newfd = _XSERVTransGetConnectionNumber(ListenTransConns[i]);
|
|
|
|
|
|
|
|
ListenTransFds[i] = newfd;
|
|
|
|
}
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2015-11-12 07:02:17 +01:00
|
|
|
for (i = 0; i < ListenTransCount; i++)
|
2018-10-25 19:13:13 +02:00
|
|
|
SetNotifyFd(ListenTransFds[i], EstablishNewConnections, X_NOTIFY_READ,
|
|
|
|
NULL);
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
ResetAuthorization();
|
2003-11-14 16:54:54 +01:00
|
|
|
ResetHosts(display);
|
|
|
|
/*
|
|
|
|
* restart XDMCP
|
|
|
|
*/
|
|
|
|
#ifdef XDMCP
|
2012-03-21 20:55:09 +01:00
|
|
|
XdmcpReset();
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-25 20:29:01 +01:00
|
|
|
CloseWellKnownConnections(void)
|
2003-11-14 17:49:22 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2015-03-09 17:55:57 +01:00
|
|
|
for (i = 0; i < ListenTransCount; i++) {
|
|
|
|
if (ListenTransConns[i] != NULL) {
|
|
|
|
_XSERVTransClose(ListenTransConns[i]);
|
|
|
|
ListenTransConns[i] = NULL;
|
2016-01-02 02:34:41 +01:00
|
|
|
if (ListenTransFds != NULL)
|
|
|
|
RemoveNotifyFd(ListenTransFds[i]);
|
2015-03-09 17:55:57 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
ListenTransCount = 0;
|
2003-11-14 17:49:22 +01:00
|
|
|
}
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
AuthAudit(ClientPtr client, Bool letin,
|
|
|
|
struct sockaddr *saddr, int len,
|
|
|
|
unsigned int proto_n, char *auth_proto, int auth_id)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
char addr[128];
|
2006-11-02 01:17:49 +01:00
|
|
|
char client_uid_string[64];
|
2007-09-28 01:47:06 +02:00
|
|
|
LocalClientCredRec *lcc;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2007-09-28 01:47:06 +02:00
|
|
|
#ifdef XSERVER_DTRACE
|
2006-11-02 01:17:49 +01:00
|
|
|
pid_t client_pid = -1;
|
|
|
|
zoneid_t client_zid = -1;
|
|
|
|
#endif
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
if (!len)
|
2011-10-29 20:13:32 +02:00
|
|
|
strlcpy(addr, "local host", sizeof(addr));
|
2003-11-14 16:54:54 +01:00
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
switch (saddr->sa_family) {
|
|
|
|
case AF_UNSPEC:
|
2007-06-29 00:59:05 +02:00
|
|
|
#if defined(UNIXCONN) || defined(LOCALCONN)
|
2012-03-21 20:55:09 +01:00
|
|
|
case AF_UNIX:
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
strlcpy(addr, "local host", sizeof(addr));
|
|
|
|
break;
|
2016-02-08 23:36:03 +01:00
|
|
|
#if defined(TCPCONN)
|
2012-03-21 20:55:09 +01:00
|
|
|
case AF_INET:
|
|
|
|
snprintf(addr, sizeof(addr), "IP %s",
|
|
|
|
inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr));
|
|
|
|
break;
|
2003-11-25 20:29:01 +01:00
|
|
|
#if defined(IPv6) && defined(AF_INET6)
|
2012-03-21 20:55:09 +01:00
|
|
|
case AF_INET6:{
|
|
|
|
char ipaddr[INET6_ADDRSTRLEN];
|
|
|
|
|
|
|
|
inet_ntop(AF_INET6, &((struct sockaddr_in6 *) saddr)->sin6_addr,
|
|
|
|
ipaddr, sizeof(ipaddr));
|
|
|
|
snprintf(addr, sizeof(addr), "IP %s", ipaddr);
|
|
|
|
}
|
|
|
|
break;
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
default:
|
|
|
|
strlcpy(addr, "unknown address", sizeof(addr));
|
|
|
|
}
|
2006-11-02 00:11:48 +01:00
|
|
|
|
2007-09-28 01:47:06 +02:00
|
|
|
if (GetLocalClientCreds(client, &lcc) != -1) {
|
2012-03-21 20:55:09 +01:00
|
|
|
int slen; /* length written to client_uid_string */
|
|
|
|
|
|
|
|
strcpy(client_uid_string, " ( ");
|
|
|
|
slen = 3;
|
|
|
|
|
|
|
|
if (lcc->fieldsSet & LCC_UID_SET) {
|
|
|
|
snprintf(client_uid_string + slen,
|
|
|
|
sizeof(client_uid_string) - slen,
|
|
|
|
"uid=%ld ", (long) lcc->euid);
|
|
|
|
slen = strlen(client_uid_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lcc->fieldsSet & LCC_GID_SET) {
|
|
|
|
snprintf(client_uid_string + slen,
|
|
|
|
sizeof(client_uid_string) - slen,
|
|
|
|
"gid=%ld ", (long) lcc->egid);
|
|
|
|
slen = strlen(client_uid_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lcc->fieldsSet & LCC_PID_SET) {
|
|
|
|
#ifdef XSERVER_DTRACE
|
|
|
|
client_pid = lcc->pid;
|
2006-11-02 01:17:49 +01:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
snprintf(client_uid_string + slen,
|
|
|
|
sizeof(client_uid_string) - slen,
|
|
|
|
"pid=%ld ", (long) lcc->pid);
|
|
|
|
slen = strlen(client_uid_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lcc->fieldsSet & LCC_ZID_SET) {
|
2007-09-28 01:47:06 +02:00
|
|
|
#ifdef XSERVER_DTRACE
|
2012-03-21 20:55:09 +01:00
|
|
|
client_zid = lcc->zoneid;
|
|
|
|
#endif
|
|
|
|
snprintf(client_uid_string + slen,
|
|
|
|
sizeof(client_uid_string) - slen,
|
|
|
|
"zoneid=%ld ", (long) lcc->zoneid);
|
|
|
|
slen = strlen(client_uid_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
snprintf(client_uid_string + slen, sizeof(client_uid_string) - slen,
|
|
|
|
")");
|
|
|
|
FreeLocalClientCreds(lcc);
|
2007-09-28 01:47:06 +02:00
|
|
|
}
|
2006-11-02 01:17:49 +01:00
|
|
|
else {
|
2012-03-21 20:55:09 +01:00
|
|
|
client_uid_string[0] = '\0';
|
2006-11-02 00:11:48 +01:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2006-11-03 21:54:43 +01:00
|
|
|
#ifdef XSERVER_DTRACE
|
|
|
|
XSERVER_CLIENT_AUTH(client->index, addr, client_pid, client_zid);
|
|
|
|
#endif
|
2008-12-17 08:49:39 +01:00
|
|
|
if (auditTrailLevel > 1) {
|
2012-03-21 20:55:09 +01:00
|
|
|
if (proto_n)
|
|
|
|
AuditF("client %d %s from %s%s\n Auth name: %.*s ID: %d\n",
|
|
|
|
client->index, letin ? "connected" : "rejected", addr,
|
|
|
|
client_uid_string, (int) proto_n, auth_proto, auth_id);
|
|
|
|
else
|
|
|
|
AuditF("client %d %s from %s%s\n",
|
|
|
|
client->index, letin ? "connected" : "rejected", addr,
|
|
|
|
client_uid_string);
|
2006-11-03 21:54:43 +01:00
|
|
|
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
XID
|
2003-11-25 20:29:01 +01:00
|
|
|
AuthorizationIDOfClient(ClientPtr client)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
if (client->osPrivate)
|
2012-03-21 20:55:09 +01:00
|
|
|
return ((OsCommPtr) client->osPrivate)->auth_id;
|
2003-11-14 16:54:54 +01:00
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
return None;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
* ClientAuthorized
|
|
|
|
*
|
|
|
|
* Sent by the client at connection setup:
|
|
|
|
* typedef struct _xConnClientPrefix {
|
|
|
|
* CARD8 byteOrder;
|
|
|
|
* BYTE pad;
|
|
|
|
* CARD16 majorVersion, minorVersion;
|
2014-10-31 00:45:12 +01:00
|
|
|
* CARD16 nbytesAuthProto;
|
|
|
|
* CARD16 nbytesAuthString;
|
2003-11-14 16:54:54 +01:00
|
|
|
* } xConnClientPrefix;
|
|
|
|
*
|
|
|
|
* It is hoped that eventually one protocol will be agreed upon. In the
|
|
|
|
* mean time, a server that implements a different protocol than the
|
|
|
|
* client expects, or a server that only implements the host-based
|
|
|
|
* mechanism, will simply ignore this information.
|
|
|
|
*
|
|
|
|
*****************************************************************/
|
|
|
|
|
2011-12-13 01:49:33 +01:00
|
|
|
const char *
|
2012-03-21 20:55:09 +01:00
|
|
|
ClientAuthorized(ClientPtr client,
|
|
|
|
unsigned int proto_n, char *auth_proto,
|
|
|
|
unsigned int string_n, char *auth_string)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
OsCommPtr priv;
|
|
|
|
Xtransaddr *from = NULL;
|
|
|
|
int family;
|
|
|
|
int fromlen;
|
|
|
|
XID auth_id;
|
|
|
|
const char *reason = NULL;
|
|
|
|
XtransConnInfo trans_conn;
|
|
|
|
|
|
|
|
priv = (OsCommPtr) client->osPrivate;
|
2003-11-14 16:54:54 +01:00
|
|
|
trans_conn = priv->trans_conn;
|
|
|
|
|
2008-08-06 19:23:31 +02:00
|
|
|
/* Allow any client to connect without authorization on a launchd socket,
|
|
|
|
because it is securely created -- this prevents a race condition on launch */
|
2012-03-21 20:55:09 +01:00
|
|
|
if (trans_conn->flags & TRANS_NOXAUTH) {
|
2008-08-06 19:23:31 +02:00
|
|
|
auth_id = (XID) 0L;
|
2012-03-21 20:55:09 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
auth_id =
|
|
|
|
CheckAuthorization(proto_n, auth_proto, string_n, auth_string,
|
|
|
|
client, &reason);
|
2008-08-06 19:23:31 +02:00
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (auth_id == (XID) ~0L) {
|
|
|
|
if (_XSERVTransGetPeerAddr(trans_conn, &family, &fromlen, &from) != -1) {
|
|
|
|
if (InvalidHost((struct sockaddr *) from, fromlen, client))
|
|
|
|
AuthAudit(client, FALSE, (struct sockaddr *) from,
|
|
|
|
fromlen, proto_n, auth_proto, auth_id);
|
|
|
|
else {
|
|
|
|
auth_id = (XID) 0;
|
2006-11-03 21:54:43 +01:00
|
|
|
#ifdef XSERVER_DTRACE
|
2012-03-21 20:55:09 +01:00
|
|
|
if ((auditTrailLevel > 1) || XSERVER_CLIENT_AUTH_ENABLED())
|
2006-11-03 21:54:43 +01:00
|
|
|
#else
|
2012-03-21 20:55:09 +01:00
|
|
|
if (auditTrailLevel > 1)
|
2006-11-03 21:54:43 +01:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
AuthAudit(client, TRUE,
|
|
|
|
(struct sockaddr *) from, fromlen,
|
|
|
|
proto_n, auth_proto, auth_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(from);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (auth_id == (XID) ~0L) {
|
|
|
|
if (reason)
|
|
|
|
return reason;
|
|
|
|
else
|
|
|
|
return "Client is not authorized to connect to Server";
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2006-11-03 21:54:43 +01:00
|
|
|
#ifdef XSERVER_DTRACE
|
|
|
|
else if ((auditTrailLevel > 1) || XSERVER_CLIENT_AUTH_ENABLED())
|
|
|
|
#else
|
2003-11-14 16:54:54 +01:00
|
|
|
else if (auditTrailLevel > 1)
|
2006-11-03 21:54:43 +01:00
|
|
|
#endif
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
if (_XSERVTransGetPeerAddr(trans_conn, &family, &fromlen, &from) != -1) {
|
|
|
|
AuthAudit(client, TRUE, (struct sockaddr *) from, fromlen,
|
|
|
|
proto_n, auth_proto, auth_id);
|
|
|
|
|
|
|
|
free(from);
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
priv->auth_id = auth_id;
|
|
|
|
priv->conn_time = 0;
|
|
|
|
|
|
|
|
#ifdef XDMCP
|
|
|
|
/* indicate to Xdmcp protocol that we've opened new client */
|
|
|
|
XdmcpOpenDisplay(priv->fd);
|
2012-03-21 20:55:09 +01:00
|
|
|
#endif /* XDMCP */
|
2006-12-02 02:48:15 +01:00
|
|
|
|
2004-05-05 22:04:52 +02:00
|
|
|
XaceHook(XACE_AUTH_AVAIL, client, auth_id);
|
2006-12-02 02:48:15 +01:00
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
/* At this point, if the client is authorized to change the access control
|
|
|
|
* list, we should getpeername() information, and add the client to
|
|
|
|
* the selfhosts list. It's not really the host machine, but the
|
|
|
|
* true purpose of the selfhosts list is to see who may change the
|
|
|
|
* access control list.
|
|
|
|
*/
|
2012-03-21 20:55:09 +01:00
|
|
|
return ((char *) NULL);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
2016-05-26 19:40:44 +02:00
|
|
|
static void
|
|
|
|
ClientReady(int fd, int xevents, void *data)
|
|
|
|
{
|
|
|
|
ClientPtr client = data;
|
|
|
|
|
|
|
|
if (xevents & X_NOTIFY_ERROR) {
|
|
|
|
CloseDownClient(client);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (xevents & X_NOTIFY_READ)
|
|
|
|
mark_client_ready(client);
|
|
|
|
if (xevents & X_NOTIFY_WRITE) {
|
|
|
|
ospoll_mute(server_poll, fd, X_NOTIFY_WRITE);
|
|
|
|
NewOutputPending = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
static ClientPtr
|
2012-03-21 20:55:09 +01:00
|
|
|
AllocNewConnection(XtransConnInfo trans_conn, int fd, CARD32 conn_time)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
OsCommPtr oc;
|
|
|
|
ClientPtr client;
|
|
|
|
|
2010-05-05 20:44:06 +02:00
|
|
|
oc = malloc(sizeof(OsCommRec));
|
2003-11-14 16:54:54 +01:00
|
|
|
if (!oc)
|
2012-03-21 20:55:09 +01:00
|
|
|
return NullClient;
|
2003-11-14 16:54:54 +01:00
|
|
|
oc->trans_conn = trans_conn;
|
|
|
|
oc->fd = fd;
|
2012-03-21 20:55:09 +01:00
|
|
|
oc->input = (ConnectionInputPtr) NULL;
|
|
|
|
oc->output = (ConnectionOutputPtr) NULL;
|
2003-11-14 16:54:54 +01:00
|
|
|
oc->auth_id = None;
|
|
|
|
oc->conn_time = conn_time;
|
2016-05-26 19:40:44 +02:00
|
|
|
oc->flags = 0;
|
2013-12-15 10:05:51 +01:00
|
|
|
if (!(client = NextAvailableClient((void *) oc))) {
|
2012-03-21 20:55:09 +01:00
|
|
|
free(oc);
|
|
|
|
return NullClient;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2012-09-20 19:16:59 +02:00
|
|
|
client->local = ComputeLocalClient(client);
|
2016-05-26 19:40:44 +02:00
|
|
|
ospoll_add(server_poll, fd,
|
|
|
|
ospoll_trigger_edge,
|
|
|
|
ClientReady,
|
|
|
|
client);
|
|
|
|
set_poll_client(client);
|
2003-11-14 17:49:22 +01:00
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
ErrorF("AllocNewConnection: client index = %d, socket fd = %d\n",
|
2012-03-21 20:55:09 +01:00
|
|
|
client->index, fd);
|
2003-11-14 17:49:22 +01:00
|
|
|
#endif
|
2006-11-03 21:54:43 +01:00
|
|
|
#ifdef XSERVER_DTRACE
|
|
|
|
XSERVER_CLIENT_CONNECT(client->index, fd);
|
2012-03-21 20:55:09 +01:00
|
|
|
#endif
|
2003-11-14 17:49:22 +01:00
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
return client;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************
|
|
|
|
* EstablishNewConnections
|
|
|
|
* If anyone is waiting on listened sockets, accept them.
|
2018-10-25 19:13:13 +02:00
|
|
|
* Updates AllClients and AllSockets.
|
2003-11-14 16:54:54 +01:00
|
|
|
*****************/
|
|
|
|
|
2018-10-25 19:13:13 +02:00
|
|
|
static void
|
|
|
|
EstablishNewConnections(int curconn, int ready, void *data)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2015-11-12 07:02:17 +01:00
|
|
|
int newconn; /* fd of new client */
|
2003-11-14 16:54:54 +01:00
|
|
|
CARD32 connect_time;
|
2015-11-12 07:02:17 +01:00
|
|
|
int i;
|
|
|
|
ClientPtr client;
|
|
|
|
OsCommPtr oc;
|
|
|
|
XtransConnInfo trans_conn, new_trans_conn;
|
|
|
|
int status;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
connect_time = GetTimeInMillis();
|
|
|
|
/* kill off stragglers */
|
2012-03-21 20:55:09 +01:00
|
|
|
for (i = 1; i < currentMaxClients; i++) {
|
|
|
|
if ((client = clients[i])) {
|
|
|
|
oc = (OsCommPtr) (client->osPrivate);
|
|
|
|
if ((oc && (oc->conn_time != 0) &&
|
|
|
|
(connect_time - oc->conn_time) >= TimeOutValue) ||
|
|
|
|
(client->noClientException != Success && !client->clientGone))
|
|
|
|
CloseDownClient(client);
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
2015-11-12 07:02:17 +01:00
|
|
|
if ((trans_conn = lookup_trans_conn(curconn)) == NULL)
|
2018-10-25 19:13:13 +02:00
|
|
|
return;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2015-11-12 07:02:17 +01:00
|
|
|
if ((new_trans_conn = _XSERVTransAccept(trans_conn, &status)) == NULL)
|
2018-10-25 19:13:13 +02:00
|
|
|
return;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2015-11-12 07:02:17 +01:00
|
|
|
newconn = _XSERVTransGetConnectionNumber(new_trans_conn);
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2015-11-12 07:02:17 +01:00
|
|
|
_XSERVTransSetOption(new_trans_conn, TRANS_NONBLOCKING, 1);
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2015-11-12 07:02:17 +01:00
|
|
|
if (trans_conn->flags & TRANS_NOXAUTH)
|
|
|
|
new_trans_conn->flags = new_trans_conn->flags | TRANS_NOXAUTH;
|
2011-04-04 20:40:06 +02:00
|
|
|
|
2015-11-12 07:02:17 +01:00
|
|
|
if (!AllocNewConnection(new_trans_conn, newconn, connect_time)) {
|
|
|
|
ErrorConnMax(new_trans_conn);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2018-10-25 19:13:13 +02:00
|
|
|
return;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#define NOROOM "Maximum number of clients reached"
|
|
|
|
|
|
|
|
/************
|
|
|
|
* ErrorConnMax
|
|
|
|
* Fail a connection due to lack of client or file descriptor space
|
|
|
|
************/
|
|
|
|
|
|
|
|
static void
|
2016-05-25 05:51:31 +02:00
|
|
|
ConnMaxNotify(int fd, int events, void *data)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2016-05-25 05:51:31 +02:00
|
|
|
XtransConnInfo trans_conn = data;
|
2011-06-17 19:43:38 +02:00
|
|
|
char order = 0;
|
2016-05-25 05:51:31 +02:00
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
/* try to read the byte-order of the connection */
|
2011-06-17 19:43:38 +02:00
|
|
|
(void) _XSERVTransRead(trans_conn, &order, 1);
|
|
|
|
if (order == 'l' || order == 'B' || order == 'r' || order == 'R') {
|
2016-05-25 05:51:31 +02:00
|
|
|
xConnSetupPrefix csp;
|
|
|
|
char pad[3] = { 0, 0, 0 };
|
|
|
|
int whichbyte = 1;
|
|
|
|
struct iovec iov[3];
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
csp.success = xFalse;
|
|
|
|
csp.lengthReason = sizeof(NOROOM) - 1;
|
|
|
|
csp.length = (sizeof(NOROOM) + 2) >> 2;
|
|
|
|
csp.majorVersion = X_PROTOCOL;
|
|
|
|
csp.minorVersion = X_PROTOCOL_REVISION;
|
2016-05-25 05:51:31 +02:00
|
|
|
if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) ||
|
|
|
|
(!(*(char *) &whichbyte) && (order == 'l' || order == 'r'))) {
|
2012-03-21 20:55:09 +01:00
|
|
|
swaps(&csp.majorVersion);
|
|
|
|
swaps(&csp.minorVersion);
|
|
|
|
swaps(&csp.length);
|
|
|
|
}
|
|
|
|
iov[0].iov_len = sz_xConnSetupPrefix;
|
|
|
|
iov[0].iov_base = (char *) &csp;
|
|
|
|
iov[1].iov_len = csp.lengthReason;
|
2013-01-14 23:24:36 +01:00
|
|
|
iov[1].iov_base = (void *) NOROOM;
|
2012-03-21 20:55:09 +01:00
|
|
|
iov[2].iov_len = (4 - (csp.lengthReason & 3)) & 3;
|
|
|
|
iov[2].iov_base = pad;
|
|
|
|
(void) _XSERVTransWritev(trans_conn, iov, 3);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2016-05-25 05:51:31 +02:00
|
|
|
RemoveNotifyFd(trans_conn->fd);
|
|
|
|
_XSERVTransClose(trans_conn);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ErrorConnMax(XtransConnInfo trans_conn)
|
|
|
|
{
|
|
|
|
if (!SetNotifyFd(trans_conn->fd, ConnMaxNotify, X_NOTIFY_READ, trans_conn))
|
|
|
|
_XSERVTransClose(trans_conn);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/************
|
|
|
|
* CloseDownFileDescriptor:
|
2017-05-17 18:57:26 +02:00
|
|
|
* Remove this file descriptor
|
2003-11-14 16:54:54 +01:00
|
|
|
************/
|
|
|
|
|
2017-05-17 18:57:26 +02:00
|
|
|
void
|
2003-11-25 20:29:01 +01:00
|
|
|
CloseDownFileDescriptor(OsCommPtr oc)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
if (oc->trans_conn) {
|
2017-05-17 18:57:26 +02:00
|
|
|
int connection = oc->fd;
|
|
|
|
#ifdef XDMCP
|
|
|
|
XdmcpCloseDisplay(connection);
|
|
|
|
#endif
|
|
|
|
ospoll_remove(server_poll, connection);
|
2012-03-21 20:55:09 +01:00
|
|
|
_XSERVTransDisconnect(oc->trans_conn);
|
|
|
|
_XSERVTransClose(oc->trans_conn);
|
2017-05-17 18:57:26 +02:00
|
|
|
oc->trans_conn = NULL;
|
2017-05-17 18:57:29 +02:00
|
|
|
oc->fd = -1;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************
|
|
|
|
* CloseDownConnection
|
2014-10-31 00:45:12 +01:00
|
|
|
* Delete client from AllClients and free resources
|
2003-11-14 16:54:54 +01:00
|
|
|
*****************/
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-25 20:29:01 +01:00
|
|
|
CloseDownConnection(ClientPtr client)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
OsCommPtr oc = (OsCommPtr) client->osPrivate;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2010-07-30 00:52:35 +02:00
|
|
|
if (FlushCallback)
|
2016-08-02 10:53:01 +02:00
|
|
|
CallCallbacks(&FlushCallback, client);
|
2010-07-30 00:52:35 +02:00
|
|
|
|
2011-06-17 20:03:01 +02:00
|
|
|
if (oc->output)
|
|
|
|
FlushClient(client, oc, (char *) NULL, 0);
|
2003-11-14 16:54:54 +01:00
|
|
|
CloseDownFileDescriptor(oc);
|
2007-02-15 18:09:00 +01:00
|
|
|
FreeOsBuffers(oc);
|
2010-05-05 20:44:06 +02:00
|
|
|
free(client->osPrivate);
|
2013-12-15 10:05:51 +01:00
|
|
|
client->osPrivate = (void *) NULL;
|
2003-11-14 16:54:54 +01:00
|
|
|
if (auditTrailLevel > 1)
|
2012-03-21 20:55:09 +01:00
|
|
|
AuditF("client %d disconnected\n", client->index);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
2015-11-12 07:02:02 +01:00
|
|
|
struct notify_fd {
|
|
|
|
int mask;
|
|
|
|
NotifyFdProcPtr notify;
|
|
|
|
void *data;
|
|
|
|
};
|
|
|
|
|
2016-05-26 19:40:44 +02:00
|
|
|
/*****************
|
|
|
|
* HandleNotifyFd
|
|
|
|
* A poll callback to be called when the registered
|
|
|
|
* file descriptor is ready.
|
|
|
|
*****************/
|
2015-11-12 07:02:02 +01:00
|
|
|
|
2016-05-26 19:40:44 +02:00
|
|
|
static void
|
|
|
|
HandleNotifyFd(int fd, int xevents, void *data)
|
2015-11-12 07:02:02 +01:00
|
|
|
{
|
2016-05-26 19:40:44 +02:00
|
|
|
struct notify_fd *n = data;
|
|
|
|
n->notify(fd, xevents, n->data);
|
2015-11-12 07:02:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************
|
|
|
|
* SetNotifyFd
|
|
|
|
* Registers a callback to be invoked when the specified
|
|
|
|
* file descriptor becomes readable.
|
|
|
|
*****************/
|
|
|
|
|
|
|
|
Bool
|
|
|
|
SetNotifyFd(int fd, NotifyFdProcPtr notify, int mask, void *data)
|
|
|
|
{
|
|
|
|
struct notify_fd *n;
|
|
|
|
|
2016-05-26 19:40:44 +02:00
|
|
|
n = ospoll_data(server_poll, fd);
|
|
|
|
if (!n) {
|
2015-11-12 07:02:02 +01:00
|
|
|
if (mask == 0)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
n = calloc(1, sizeof (struct notify_fd));
|
|
|
|
if (!n)
|
|
|
|
return FALSE;
|
2016-05-26 19:40:44 +02:00
|
|
|
ospoll_add(server_poll, fd,
|
|
|
|
ospoll_trigger_level,
|
|
|
|
HandleNotifyFd,
|
|
|
|
n);
|
2015-11-12 07:02:03 +01:00
|
|
|
}
|
|
|
|
|
2015-11-12 07:02:02 +01:00
|
|
|
if (mask == 0) {
|
2016-05-26 19:40:44 +02:00
|
|
|
ospoll_remove(server_poll, fd);
|
2015-11-12 07:02:02 +01:00
|
|
|
free(n);
|
|
|
|
} else {
|
2016-05-26 19:40:44 +02:00
|
|
|
int listen = mask & ~n->mask;
|
|
|
|
int mute = n->mask & ~mask;
|
|
|
|
|
|
|
|
if (listen)
|
|
|
|
ospoll_listen(server_poll, fd, listen);
|
|
|
|
if (mute)
|
|
|
|
ospoll_mute(server_poll, fd, mute);
|
2015-11-12 07:02:02 +01:00
|
|
|
n->mask = mask;
|
|
|
|
n->data = data;
|
|
|
|
n->notify = notify;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
/*****************
|
|
|
|
* OnlyListenToOneClient:
|
|
|
|
* Only accept requests from one client. Continue to handle new
|
|
|
|
* connections, but don't take any protocol requests from the new
|
|
|
|
* ones. Note that if GrabInProgress is set, EstablishNewConnections
|
|
|
|
* needs to put new clients into SavedAllSockets and SavedAllClients.
|
|
|
|
* Note also that there is no timeout for this in the protocol.
|
|
|
|
* This routine is "undone" by ListenToAllClients()
|
|
|
|
*****************/
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2003-11-25 20:29:01 +01:00
|
|
|
OnlyListenToOneClient(ClientPtr client)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2016-05-26 19:40:44 +02:00
|
|
|
int rc;
|
2007-08-15 20:14:45 +02:00
|
|
|
|
|
|
|
rc = XaceHook(XACE_SERVER_ACCESS, client, DixGrabAccess);
|
|
|
|
if (rc != Success)
|
2012-03-21 20:55:09 +01:00
|
|
|
return rc;
|
|
|
|
|
|
|
|
if (!GrabInProgress) {
|
|
|
|
GrabInProgress = client->index;
|
2016-05-26 19:40:44 +02:00
|
|
|
set_poll_clients();
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2016-05-26 19:40:44 +02:00
|
|
|
|
2007-08-15 20:14:45 +02:00
|
|
|
return rc;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* ListenToAllClients:
|
|
|
|
* Undoes OnlyListentToOneClient()
|
|
|
|
****************/
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-25 20:29:01 +01:00
|
|
|
ListenToAllClients(void)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
if (GrabInProgress) {
|
|
|
|
GrabInProgress = 0;
|
2016-05-26 19:40:44 +02:00
|
|
|
set_poll_clients();
|
2012-03-21 20:55:09 +01:00
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* IgnoreClient
|
|
|
|
* Removes one client from input masks.
|
|
|
|
* Must have cooresponding call to AttendClient.
|
|
|
|
****************/
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
IgnoreClient(ClientPtr client)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
OsCommPtr oc = (OsCommPtr) client->osPrivate;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2010-06-30 16:59:04 +02:00
|
|
|
client->ignoreCount++;
|
|
|
|
if (client->ignoreCount > 1)
|
2012-03-21 20:55:09 +01:00
|
|
|
return;
|
2010-06-30 16:59:04 +02:00
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
isItTimeToYield = TRUE;
|
2016-05-19 22:59:54 +02:00
|
|
|
mark_client_not_ready(client);
|
2016-05-26 19:40:44 +02:00
|
|
|
|
|
|
|
oc->flags |= OS_COMM_IGNORED;
|
|
|
|
set_poll_client(client);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* AttendClient
|
|
|
|
* Adds one client back into the input masks.
|
|
|
|
****************/
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
AttendClient(ClientPtr client)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
OsCommPtr oc = (OsCommPtr) client->osPrivate;
|
2010-06-30 16:59:04 +02:00
|
|
|
|
|
|
|
client->ignoreCount--;
|
|
|
|
if (client->ignoreCount)
|
2012-03-21 20:55:09 +01:00
|
|
|
return;
|
2010-06-30 16:59:04 +02:00
|
|
|
|
2016-05-26 19:40:44 +02:00
|
|
|
oc->flags &= ~OS_COMM_IGNORED;
|
|
|
|
set_poll_client(client);
|
|
|
|
if (listen_to_client(client))
|
|
|
|
mark_client_ready(client);
|
2017-01-10 03:10:21 +01:00
|
|
|
else {
|
|
|
|
/* grab active, mark ready when grab goes away */
|
|
|
|
mark_client_saved_ready(client);
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* make client impervious to grabs; assume only executing client calls this */
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-25 20:29:01 +01:00
|
|
|
MakeClientGrabImpervious(ClientPtr client)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
OsCommPtr oc = (OsCommPtr) client->osPrivate;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2016-05-26 19:40:44 +02:00
|
|
|
oc->flags |= OS_COMM_GRAB_IMPERVIOUS;
|
|
|
|
set_poll_client(client);
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ServerGrabCallback) {
|
|
|
|
ServerGrabInfoRec grabinfo;
|
|
|
|
|
|
|
|
grabinfo.client = client;
|
|
|
|
grabinfo.grabstate = CLIENT_IMPERVIOUS;
|
|
|
|
CallCallbacks(&ServerGrabCallback, &grabinfo);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* make client pervious to grabs; assume only executing client calls this */
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-25 20:29:01 +01:00
|
|
|
MakeClientGrabPervious(ClientPtr client)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
OsCommPtr oc = (OsCommPtr) client->osPrivate;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2016-05-26 19:40:44 +02:00
|
|
|
oc->flags &= ~OS_COMM_GRAB_IMPERVIOUS;
|
|
|
|
set_poll_client(client);
|
|
|
|
isItTimeToYield = TRUE;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ServerGrabCallback) {
|
|
|
|
ServerGrabInfoRec grabinfo;
|
|
|
|
|
|
|
|
grabinfo.client = client;
|
|
|
|
grabinfo.grabstate = CLIENT_PERVIOUS;
|
|
|
|
CallCallbacks(&ServerGrabCallback, &grabinfo);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-19 06:05:58 +01:00
|
|
|
/* Add a fd (from launchd or similar) to our listeners */
|
2012-03-21 20:55:09 +01:00
|
|
|
void
|
|
|
|
ListenOnOpenFD(int fd, int noxauth)
|
|
|
|
{
|
2008-08-06 19:23:31 +02:00
|
|
|
char port[256];
|
2008-05-19 08:31:41 +02:00
|
|
|
XtransConnInfo ciptr;
|
2010-04-14 18:06:04 +02:00
|
|
|
const char *display_env = getenv("DISPLAY");
|
2008-08-06 19:23:31 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (display_env && (strncmp(display_env, "/tmp/launch", 11) == 0)) {
|
2008-08-06 19:23:31 +02:00
|
|
|
/* Make the path the launchd socket if our DISPLAY is set right */
|
2010-04-14 18:06:04 +02:00
|
|
|
strcpy(port, display_env);
|
2012-03-21 20:55:09 +01:00
|
|
|
}
|
|
|
|
else {
|
2008-08-06 19:23:31 +02:00
|
|
|
/* Just some default so things don't break and die. */
|
2011-10-29 20:08:17 +02:00
|
|
|
snprintf(port, sizeof(port), ":%d", atoi(display));
|
2008-08-06 19:23:31 +02:00
|
|
|
}
|
2008-05-17 23:56:53 +02:00
|
|
|
|
|
|
|
/* Make our XtransConnInfo
|
|
|
|
* TRANS_SOCKET_LOCAL_INDEX = 5 from Xtrans.c
|
|
|
|
*/
|
|
|
|
ciptr = _XSERVTransReopenCOTSServer(5, fd, port);
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ciptr == NULL) {
|
2014-03-19 06:05:58 +01:00
|
|
|
ErrorF("Got NULL while trying to Reopen listen port.\n");
|
2008-05-17 23:56:53 +02:00
|
|
|
return;
|
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
|
|
|
|
if (noxauth)
|
2008-08-06 19:23:31 +02:00
|
|
|
ciptr->flags = ciptr->flags | TRANS_NOXAUTH;
|
|
|
|
|
2008-05-17 23:56:53 +02:00
|
|
|
/* Allocate space to store it */
|
2012-03-21 20:55:09 +01:00
|
|
|
ListenTransFds =
|
2015-03-21 18:08:25 +01:00
|
|
|
xnfreallocarray(ListenTransFds, ListenTransCount + 1, sizeof(int));
|
2012-03-21 20:55:09 +01:00
|
|
|
ListenTransConns =
|
2015-03-21 18:08:25 +01:00
|
|
|
xnfreallocarray(ListenTransConns, ListenTransCount + 1,
|
|
|
|
sizeof(XtransConnInfo));
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2008-05-17 23:56:53 +02:00
|
|
|
/* Store it */
|
|
|
|
ListenTransConns[ListenTransCount] = ciptr;
|
|
|
|
ListenTransFds[ListenTransCount] = fd;
|
|
|
|
|
2018-10-25 19:13:13 +02:00
|
|
|
SetNotifyFd(fd, EstablishNewConnections, X_NOTIFY_READ, NULL);
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2008-05-17 23:56:53 +02:00
|
|
|
/* Increment the count */
|
|
|
|
ListenTransCount++;
|
|
|
|
}
|
2014-03-20 04:46:41 +01:00
|
|
|
|
|
|
|
/* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */
|
|
|
|
Bool
|
|
|
|
AddClientOnOpenFD(int fd)
|
|
|
|
{
|
|
|
|
XtransConnInfo ciptr;
|
|
|
|
CARD32 connect_time;
|
|
|
|
char port[20];
|
|
|
|
|
|
|
|
snprintf(port, sizeof(port), ":%d", atoi(display));
|
|
|
|
ciptr = _XSERVTransReopenCOTSServer(5, fd, port);
|
|
|
|
if (ciptr == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
_XSERVTransSetOption(ciptr, TRANS_NONBLOCKING, 1);
|
|
|
|
ciptr->flags |= TRANS_NOXAUTH;
|
|
|
|
|
|
|
|
connect_time = GetTimeInMillis();
|
|
|
|
|
|
|
|
if (!AllocNewConnection(ciptr, fd, connect_time)) {
|
|
|
|
ErrorConnMax(ciptr);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
2016-05-26 19:40:44 +02:00
|
|
|
|
|
|
|
Bool
|
|
|
|
listen_to_client(ClientPtr client)
|
|
|
|
{
|
|
|
|
OsCommPtr oc = (OsCommPtr) client->osPrivate;
|
|
|
|
|
|
|
|
if (oc->flags & OS_COMM_IGNORED)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!GrabInProgress)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
if (client->index == GrabInProgress)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
if (oc->flags & OS_COMM_GRAB_IMPERVIOUS)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
set_poll_client(ClientPtr client)
|
|
|
|
{
|
|
|
|
OsCommPtr oc = (OsCommPtr) client->osPrivate;
|
|
|
|
|
2017-05-17 18:57:27 +02:00
|
|
|
if (oc->trans_conn) {
|
|
|
|
if (listen_to_client(client))
|
|
|
|
ospoll_listen(server_poll, oc->trans_conn->fd, X_NOTIFY_READ);
|
|
|
|
else
|
|
|
|
ospoll_mute(server_poll, oc->trans_conn->fd, X_NOTIFY_READ);
|
|
|
|
}
|
2016-05-26 19:40:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
set_poll_clients(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 1; i < currentMaxClients; i++) {
|
|
|
|
ClientPtr client = clients[i];
|
|
|
|
if (client && !client->clientGone)
|
|
|
|
set_poll_client(client);
|
|
|
|
}
|
|
|
|
}
|