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
|
|
|
|
|
|
|
|
Permission to use, copy, modify, and distribute this software and its
|
|
|
|
documentation for any purpose and without fee is hereby granted,
|
|
|
|
provided that the above copyright notice appear in all copies and that
|
|
|
|
both that copyright notice and this permission notice appear in
|
|
|
|
supporting documentation, and that the name of Digital not be
|
|
|
|
used in advertising or publicity pertaining to distribution of the
|
|
|
|
software without specific, written prior permission.
|
|
|
|
|
|
|
|
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,
|
|
|
|
* CloseDownConnection, CheckConnections, AddEnabledDevice,
|
|
|
|
* RemoveEnabledDevice, OnlyListToOneClient,
|
|
|
|
* 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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(TCPCONN) || defined(STREAMSCONN)
|
|
|
|
# include <netinet/in.h>
|
2003-11-14 17:49:22 +01:00
|
|
|
# include <arpa/inet.h>
|
2003-11-14 16:54:54 +01:00
|
|
|
# ifdef apollo
|
|
|
|
# ifndef NO_TCP_H
|
|
|
|
# include <netinet/tcp.h>
|
|
|
|
# endif
|
|
|
|
# else
|
2003-11-14 17:49:22 +01:00
|
|
|
# ifdef CSRG_BASED
|
|
|
|
# include <sys/param.h>
|
|
|
|
# endif
|
2007-06-29 00:59:05 +02:00
|
|
|
# include <netinet/tcp.h>
|
2003-11-14 16:54:54 +01:00
|
|
|
# endif
|
2003-11-25 20:29:01 +01:00
|
|
|
# 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
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif /* WIN32 */
|
2005-07-03 10:53:54 +02:00
|
|
|
#include "misc.h" /* for typedef of pointer */
|
2003-11-14 16:54:54 +01:00
|
|
|
#include "osdep.h"
|
2003-11-14 17:49:22 +01:00
|
|
|
#include <X11/Xpoll.h>
|
2003-11-14 16:54:54 +01:00
|
|
|
#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
|
|
|
|
|
|
|
|
#ifdef DNETCONN
|
|
|
|
#include <netdnet/dn.h>
|
|
|
|
#endif /* DNETCONN */
|
|
|
|
|
2006-11-02 01:17:49 +01:00
|
|
|
#ifdef HAS_GETPEERUCRED
|
|
|
|
# include <ucred.h>
|
|
|
|
# include <zone.h>
|
|
|
|
#endif
|
|
|
|
|
2006-11-03 21:54:43 +01:00
|
|
|
#ifdef XSERVER_DTRACE
|
|
|
|
# include <sys/types.h>
|
|
|
|
typedef const char *string;
|
2007-06-23 02:05:21 +02:00
|
|
|
# ifndef HAS_GETPEERUCRED
|
|
|
|
# define zoneid_t int
|
|
|
|
# endif
|
2006-11-03 21:54:43 +01:00
|
|
|
# include "../dix/Xserver-dtrace.h"
|
|
|
|
#endif
|
|
|
|
|
2007-03-25 18:27:01 +02:00
|
|
|
static int lastfdesc; /* maximum file descriptor */
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
fd_set WellKnownConnections; /* Listener mask */
|
|
|
|
fd_set EnabledDevices; /* mask for input devices that are on */
|
|
|
|
fd_set AllSockets; /* select on this */
|
|
|
|
fd_set AllClients; /* available clients */
|
|
|
|
fd_set LastSelectMask; /* mask returned from last select call */
|
|
|
|
fd_set ClientsWithInput; /* clients with FULL requests in buffer */
|
|
|
|
fd_set ClientsWriteBlocked; /* clients who cannot receive output */
|
|
|
|
fd_set OutputPending; /* clients with reply/event data ready to go */
|
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 MaxClients = 0;
|
2003-11-14 16:54:54 +01:00
|
|
|
Bool NewOutputPending; /* not yet attempted to write some new output */
|
|
|
|
Bool AnyClientsWriteBlocked; /* true if some client blocked on write */
|
|
|
|
|
2007-03-25 18:27:01 +02:00
|
|
|
static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
|
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
|
|
|
Bool PartialNetwork; /* continue even if unable to bind all addrs */
|
2003-11-14 16:54:54 +01:00
|
|
|
static Pid_t ParentProcess;
|
|
|
|
|
|
|
|
static Bool debug_conns = FALSE;
|
|
|
|
|
|
|
|
fd_set IgnoredClientsWithInput;
|
|
|
|
static fd_set GrabImperviousClients;
|
|
|
|
static fd_set SavedAllClients;
|
|
|
|
static fd_set SavedAllSockets;
|
|
|
|
static fd_set SavedClientsWithInput;
|
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
|
|
|
|
2004-11-22 14:23:25 +01:00
|
|
|
#if !defined(WIN32)
|
2003-11-14 17:49:22 +01:00
|
|
|
int *ConnectionTranslation = NULL;
|
2004-11-22 14:23:25 +01:00
|
|
|
#else
|
|
|
|
/*
|
2003-11-14 16:54:54 +01:00
|
|
|
* On NT fds are not between 0 and MAXSOCKS, they are unrelated, and there is
|
|
|
|
* not even a known maximum value, so use something quite arbitrary for now.
|
2004-11-22 14:23:25 +01:00
|
|
|
* Do storage is a hash table of size 256. Collisions are handled in a linked
|
|
|
|
* list.
|
2003-11-14 16:54:54 +01:00
|
|
|
*/
|
2004-11-22 14:23:25 +01:00
|
|
|
|
2004-11-15 16:06:51 +01:00
|
|
|
#undef MAXSOCKS
|
|
|
|
#define MAXSOCKS 500
|
|
|
|
#undef MAXSELECT
|
|
|
|
#define MAXSELECT 500
|
2004-11-22 14:23:25 +01:00
|
|
|
|
|
|
|
struct _ct_node {
|
|
|
|
struct _ct_node *next;
|
|
|
|
int key;
|
|
|
|
int value;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _ct_node *ct_head[256];
|
|
|
|
|
|
|
|
void InitConnectionTranslation(void)
|
|
|
|
{
|
|
|
|
bzero(ct_head, sizeof(ct_head));
|
|
|
|
}
|
|
|
|
|
|
|
|
int GetConnectionTranslation(int conn)
|
|
|
|
{
|
|
|
|
struct _ct_node *node = ct_head[conn & 0xff];
|
|
|
|
while (node != NULL)
|
|
|
|
{
|
|
|
|
if (node->key == conn)
|
|
|
|
return node->value;
|
|
|
|
node = node->next;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SetConnectionTranslation(int conn, int client)
|
|
|
|
{
|
|
|
|
struct _ct_node **node = ct_head + (conn & 0xff);
|
|
|
|
if (client == 0) /* remove entry */
|
|
|
|
{
|
|
|
|
while (*node != NULL)
|
|
|
|
{
|
|
|
|
if ((*node)->key == conn)
|
|
|
|
{
|
|
|
|
struct _ct_node *temp = *node;
|
|
|
|
*node = (*node)->next;
|
|
|
|
free(temp);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
node = &((*node)->next);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
while (*node != NULL)
|
|
|
|
{
|
|
|
|
if ((*node)->key == conn)
|
|
|
|
{
|
|
|
|
(*node)->value = client;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
node = &((*node)->next);
|
|
|
|
}
|
2009-01-22 08:11:16 +01:00
|
|
|
*node = xalloc(sizeof(struct _ct_node));
|
2004-11-22 14:23:25 +01:00
|
|
|
(*node)->next = NULL;
|
|
|
|
(*node)->key = conn;
|
|
|
|
(*node)->value = client;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void ClearConnectionTranslation(void)
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
for (i = 0; i < 256; i++)
|
|
|
|
{
|
|
|
|
struct _ct_node *node = ct_head[i];
|
|
|
|
while (node != NULL)
|
|
|
|
{
|
|
|
|
struct _ct_node *temp = node;
|
|
|
|
node = node->next;
|
|
|
|
xfree(temp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
|
2007-03-25 18:27:01 +02:00
|
|
|
static XtransConnInfo *ListenTransConns = NULL;
|
|
|
|
static int *ListenTransFds = NULL;
|
|
|
|
static int ListenTransCount;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2003-11-25 20:29:01 +01:00
|
|
|
static void ErrorConnMax(XtransConnInfo /* trans_conn */);
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
static XtransConnInfo
|
2003-11-25 20:29:01 +01:00
|
|
|
lookup_trans_conn (int fd)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
if (ListenTransFds)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < ListenTransCount; i++)
|
|
|
|
if (ListenTransFds[i] == fd)
|
|
|
|
return ListenTransConns[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
2003-11-14 17:49:22 +01:00
|
|
|
/* Set MaxClients and lastfdesc, and allocate ConnectionTranslation */
|
|
|
|
|
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
|
|
|
InitConnectionLimits(void)
|
2003-11-14 17:49:22 +01:00
|
|
|
{
|
|
|
|
lastfdesc = -1;
|
|
|
|
|
|
|
|
#ifndef __CYGWIN__
|
|
|
|
|
|
|
|
#if !defined(XNO_SYSCONF) && defined(_SC_OPEN_MAX)
|
|
|
|
lastfdesc = sysconf(_SC_OPEN_MAX) - 1;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAS_GETDTABLESIZE
|
|
|
|
if (lastfdesc < 0)
|
|
|
|
lastfdesc = getdtablesize() - 1;
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
|
2003-11-14 17:49:22 +01:00
|
|
|
#ifdef _NFILE
|
|
|
|
if (lastfdesc < 0)
|
|
|
|
lastfdesc = _NFILE - 1;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif /* __CYGWIN__ */
|
|
|
|
|
|
|
|
/* This is the fallback */
|
|
|
|
if (lastfdesc < 0)
|
|
|
|
lastfdesc = MAXSOCKS;
|
|
|
|
|
|
|
|
if (lastfdesc > MAXSELECT)
|
|
|
|
lastfdesc = MAXSELECT;
|
|
|
|
|
|
|
|
if (lastfdesc > MAXCLIENTS)
|
|
|
|
{
|
|
|
|
lastfdesc = MAXCLIENTS;
|
|
|
|
if (debug_conns)
|
|
|
|
ErrorF( "REACHED MAXIMUM CLIENTS LIMIT %d\n", MAXCLIENTS);
|
|
|
|
}
|
|
|
|
MaxClients = lastfdesc;
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
ErrorF("InitConnectionLimits: MaxClients = %d\n", MaxClients);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(WIN32)
|
2007-12-28 14:48:25 +01:00
|
|
|
if (!ConnectionTranslation)
|
|
|
|
ConnectionTranslation = (int *)xnfalloc(sizeof(int)*(lastfdesc + 1));
|
2003-11-14 17:49:22 +01:00
|
|
|
#else
|
2004-11-22 14:23:25 +01:00
|
|
|
InitConnectionTranslation();
|
2003-11-14 17:49:22 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
handler = OsSignal (SIGUSR1, SIG_IGN);
|
|
|
|
if ( handler == SIG_IGN)
|
|
|
|
RunFromSmartParent = TRUE;
|
|
|
|
OsSignal(SIGUSR1, handler);
|
|
|
|
ParentProcess = getppid ();
|
|
|
|
#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)
|
|
|
|
if (RunFromSmartParent) {
|
|
|
|
if (ParentProcess > 1) {
|
|
|
|
kill (ParentProcess, SIGUSR1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2003-11-14 17:49:22 +01:00
|
|
|
|
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
|
|
|
{
|
2003-11-14 17:49:22 +01:00
|
|
|
int i;
|
2003-11-14 16:54:54 +01:00
|
|
|
int partial;
|
|
|
|
char port[20];
|
|
|
|
|
|
|
|
FD_ZERO(&AllSockets);
|
|
|
|
FD_ZERO(&AllClients);
|
|
|
|
FD_ZERO(&LastSelectMask);
|
|
|
|
FD_ZERO(&ClientsWithInput);
|
|
|
|
|
2003-11-14 17:49:22 +01:00
|
|
|
#if !defined(WIN32)
|
|
|
|
for (i=0; i<MaxClients; i++) ConnectionTranslation[i] = 0;
|
2003-11-14 16:54:54 +01:00
|
|
|
#else
|
2004-11-22 14:23:25 +01:00
|
|
|
ClearConnectionTranslation();
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
FD_ZERO (&WellKnownConnections);
|
|
|
|
|
|
|
|
sprintf (port, "%d", atoi (display));
|
|
|
|
|
|
|
|
if ((_XSERVTransMakeAllCOTSServerListeners (port, &partial,
|
|
|
|
&ListenTransCount, &ListenTransConns) >= 0) &&
|
|
|
|
(ListenTransCount >= 1))
|
|
|
|
{
|
|
|
|
if (!PartialNetwork && partial)
|
|
|
|
{
|
|
|
|
FatalError ("Failed to establish all listening sockets");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-01-22 08:11:16 +01:00
|
|
|
ListenTransFds = xalloc (ListenTransCount * sizeof (int));
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
for (i = 0; i < ListenTransCount; i++)
|
|
|
|
{
|
|
|
|
int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]);
|
|
|
|
|
|
|
|
ListenTransFds[i] = fd;
|
|
|
|
FD_SET (fd, &WellKnownConnections);
|
|
|
|
|
|
|
|
if (!_XSERVTransIsLocal (ListenTransConns[i]))
|
|
|
|
{
|
|
|
|
DefineSelf (fd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!XFD_ANYSET (&WellKnownConnections))
|
|
|
|
FatalError ("Cannot establish any listening sockets - Make sure an X server isn't already running");
|
2003-11-14 17:49:22 +01:00
|
|
|
#if !defined(WIN32)
|
2003-11-14 16:54:54 +01:00
|
|
|
OsSignal (SIGPIPE, SIG_IGN);
|
|
|
|
OsSignal (SIGHUP, AutoResetServer);
|
|
|
|
#endif
|
|
|
|
OsSignal (SIGINT, GiveUp);
|
|
|
|
OsSignal (SIGTERM, GiveUp);
|
|
|
|
XFD_COPYSET (&WellKnownConnections, &AllSockets);
|
|
|
|
ResetHosts(display);
|
2007-11-01 20:41:11 +01:00
|
|
|
|
|
|
|
InitParentProcess();
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef XDMCP
|
|
|
|
XdmcpInit ();
|
|
|
|
#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
|
|
|
ResetWellKnownSockets (void)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
ResetOsBuffers();
|
|
|
|
|
|
|
|
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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
FD_CLR (ListenTransFds[i], &WellKnownConnections);
|
|
|
|
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]);
|
|
|
|
|
|
|
|
FD_CLR (ListenTransFds[i], &WellKnownConnections);
|
|
|
|
ListenTransFds[i] = newfd;
|
|
|
|
FD_SET(newfd, &WellKnownConnections);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ResetAuthorization ();
|
|
|
|
ResetHosts(display);
|
|
|
|
/*
|
|
|
|
* restart XDMCP
|
|
|
|
*/
|
|
|
|
#ifdef XDMCP
|
|
|
|
XdmcpReset ();
|
|
|
|
#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;
|
|
|
|
|
|
|
|
for (i = 0; i < ListenTransCount; i++)
|
|
|
|
_XSERVTransClose (ListenTransConns[i]);
|
|
|
|
}
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
static void
|
2003-11-25 20:29:01 +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];
|
|
|
|
char *out = addr;
|
2006-11-02 01:17:49 +01:00
|
|
|
char client_uid_string[64];
|
2007-09-28 01:47:06 +02:00
|
|
|
LocalClientCredRec *lcc;
|
|
|
|
#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)
|
|
|
|
strcpy(out, "local host");
|
|
|
|
else
|
|
|
|
switch (saddr->sa_family)
|
|
|
|
{
|
|
|
|
case AF_UNSPEC:
|
2007-06-29 00:59:05 +02:00
|
|
|
#if defined(UNIXCONN) || defined(LOCALCONN)
|
2003-11-14 16:54:54 +01:00
|
|
|
case AF_UNIX:
|
|
|
|
#endif
|
|
|
|
strcpy(out, "local host");
|
|
|
|
break;
|
2003-11-14 17:49:22 +01:00
|
|
|
#if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
|
2003-11-14 16:54:54 +01:00
|
|
|
case AF_INET:
|
2003-11-25 20:29:01 +01:00
|
|
|
sprintf(out, "IP %s",
|
|
|
|
inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr));
|
|
|
|
break;
|
|
|
|
#if defined(IPv6) && defined(AF_INET6)
|
|
|
|
case AF_INET6: {
|
|
|
|
char ipaddr[INET6_ADDRSTRLEN];
|
|
|
|
inet_ntop(AF_INET6, &((struct sockaddr_in6 *) saddr)->sin6_addr,
|
|
|
|
ipaddr, sizeof(ipaddr));
|
|
|
|
sprintf(out, "IP %s", ipaddr);
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
break;
|
|
|
|
#endif
|
2003-11-25 20:29:01 +01:00
|
|
|
#endif
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef DNETCONN
|
|
|
|
case AF_DECnet:
|
|
|
|
sprintf(out, "DN %s",
|
|
|
|
dnet_ntoa(&((struct sockaddr_dn *) saddr)->sdn_add));
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
strcpy(out, "unknown address");
|
|
|
|
}
|
2006-11-02 00:11:48 +01:00
|
|
|
|
2007-09-28 01:47:06 +02:00
|
|
|
if (GetLocalClientCreds(client, &lcc) != -1) {
|
|
|
|
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
|
2007-09-28 01:47:06 +02: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) {
|
|
|
|
#ifdef XSERVER_DTRACE
|
|
|
|
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);
|
|
|
|
}
|
2006-11-02 01:17:49 +01:00
|
|
|
else {
|
2006-11-02 00:11:48 +01:00
|
|
|
client_uid_string[0] = '\0';
|
|
|
|
}
|
2003-11-25 20:29:01 +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) {
|
2006-11-03 21:54:43 +01:00
|
|
|
if (proto_n)
|
2006-11-02 00:11:48 +01:00
|
|
|
AuditF("client %d %s from %s%s\n Auth name: %.*s ID: %d\n",
|
2003-11-25 20:29:01 +01:00
|
|
|
client->index, letin ? "connected" : "rejected", addr,
|
2006-11-02 00:11:48 +01:00
|
|
|
client_uid_string, (int)proto_n, auth_proto, auth_id);
|
2006-11-03 21:54:43 +01:00
|
|
|
else
|
2006-11-02 00:11:48 +01:00
|
|
|
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)
|
|
|
|
return ((OsCommPtr)client->osPrivate)->auth_id;
|
|
|
|
else
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
* ClientAuthorized
|
|
|
|
*
|
|
|
|
* Sent by the client at connection setup:
|
|
|
|
* typedef struct _xConnClientPrefix {
|
|
|
|
* CARD8 byteOrder;
|
|
|
|
* BYTE pad;
|
|
|
|
* CARD16 majorVersion, minorVersion;
|
|
|
|
* CARD16 nbytesAuthProto;
|
|
|
|
* CARD16 nbytesAuthString;
|
|
|
|
* } 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.
|
|
|
|
*
|
|
|
|
*****************************************************************/
|
|
|
|
|
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
|
|
|
char *
|
2003-11-25 20:29:01 +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
|
|
|
{
|
2003-11-25 20:29:01 +01:00
|
|
|
OsCommPtr priv;
|
2003-11-14 16:54:54 +01:00
|
|
|
Xtransaddr *from = NULL;
|
|
|
|
int family;
|
|
|
|
int fromlen;
|
|
|
|
XID auth_id;
|
|
|
|
char *reason = NULL;
|
|
|
|
XtransConnInfo trans_conn;
|
|
|
|
|
|
|
|
priv = (OsCommPtr)client->osPrivate;
|
|
|
|
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 */
|
2008-11-14 19:56:21 +01:00
|
|
|
if(trans_conn->flags & TRANS_NOXAUTH) {
|
2008-08-06 19:23:31 +02:00
|
|
|
auth_id = (XID) 0L;
|
|
|
|
} else {
|
|
|
|
auth_id = CheckAuthorization (proto_n, auth_proto, string_n, auth_string, client, &reason);
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
if (auth_id == (XID) ~0L)
|
|
|
|
{
|
2007-08-03 19:23:34 +02:00
|
|
|
if (_XSERVTransGetPeerAddr(trans_conn, &family, &fromlen, &from) != -1)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2006-06-02 00:06:41 +02:00
|
|
|
if (InvalidHost ((struct sockaddr *) from, fromlen, client))
|
2003-11-14 16:54:54 +01:00
|
|
|
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
|
|
|
|
if ((auditTrailLevel > 1) || XSERVER_CLIENT_AUTH_ENABLED())
|
|
|
|
#else
|
2003-11-14 16:54:54 +01:00
|
|
|
if (auditTrailLevel > 1)
|
2006-11-03 21:54:43 +01:00
|
|
|
#endif
|
2003-11-14 16:54:54 +01:00
|
|
|
AuthAudit(client, TRUE,
|
|
|
|
(struct sockaddr *) from, fromlen,
|
|
|
|
proto_n, auth_proto, auth_id);
|
|
|
|
}
|
|
|
|
|
2009-01-22 08:11:16 +01:00
|
|
|
xfree (from);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
2003-11-14 17:49:22 +01:00
|
|
|
if (auth_id == (XID) ~0L) {
|
2003-11-14 16:54:54 +01:00
|
|
|
if (reason)
|
|
|
|
return reason;
|
|
|
|
else
|
|
|
|
return "Client is not authorized to connect to Server";
|
2003-11-14 17:49:22 +01:00
|
|
|
}
|
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
|
|
|
{
|
|
|
|
if (_XSERVTransGetPeerAddr (trans_conn,
|
|
|
|
&family, &fromlen, &from) != -1)
|
|
|
|
{
|
|
|
|
AuthAudit(client, TRUE, (struct sockaddr *) from, fromlen,
|
|
|
|
proto_n, auth_proto, auth_id);
|
|
|
|
|
2009-01-22 08:11:16 +01:00
|
|
|
xfree (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);
|
|
|
|
#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.
|
|
|
|
*/
|
|
|
|
return((char *)NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ClientPtr
|
2003-11-25 20:29:01 +01:00
|
|
|
AllocNewConnection (XtransConnInfo trans_conn, int fd, CARD32 conn_time)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
OsCommPtr oc;
|
|
|
|
ClientPtr client;
|
|
|
|
|
|
|
|
if (
|
|
|
|
#ifndef WIN32
|
|
|
|
fd >= lastfdesc
|
|
|
|
#else
|
|
|
|
XFD_SETCOUNT(&AllClients) >= MaxClients
|
|
|
|
#endif
|
|
|
|
)
|
|
|
|
return NullClient;
|
2009-01-22 08:11:16 +01:00
|
|
|
oc = xalloc(sizeof(OsCommRec));
|
2003-11-14 16:54:54 +01:00
|
|
|
if (!oc)
|
|
|
|
return NullClient;
|
|
|
|
oc->trans_conn = trans_conn;
|
|
|
|
oc->fd = fd;
|
|
|
|
oc->input = (ConnectionInputPtr)NULL;
|
|
|
|
oc->output = (ConnectionOutputPtr)NULL;
|
|
|
|
oc->auth_id = None;
|
|
|
|
oc->conn_time = conn_time;
|
|
|
|
if (!(client = NextAvailableClient((pointer)oc)))
|
|
|
|
{
|
|
|
|
xfree (oc);
|
|
|
|
return NullClient;
|
|
|
|
}
|
2004-11-22 14:23:25 +01:00
|
|
|
#if !defined(WIN32)
|
2006-06-02 00:06:41 +02:00
|
|
|
ConnectionTranslation[fd] = client->index;
|
2004-11-22 14:23:25 +01:00
|
|
|
#else
|
2006-06-02 00:06:41 +02:00
|
|
|
SetConnectionTranslation(fd, client->index);
|
2004-11-22 14:23:25 +01:00
|
|
|
#endif
|
2006-06-02 00:06:41 +02:00
|
|
|
if (GrabInProgress)
|
|
|
|
{
|
|
|
|
FD_SET(fd, &SavedAllClients);
|
|
|
|
FD_SET(fd, &SavedAllSockets);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FD_SET(fd, &AllClients);
|
|
|
|
FD_SET(fd, &AllSockets);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2003-11-14 17:49:22 +01:00
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
ErrorF("AllocNewConnection: client index = %d, socket fd = %d\n",
|
|
|
|
client->index, fd);
|
|
|
|
#endif
|
2006-11-03 21:54:43 +01:00
|
|
|
#ifdef XSERVER_DTRACE
|
|
|
|
XSERVER_CLIENT_CONNECT(client->index, fd);
|
|
|
|
#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.
|
|
|
|
* Returns a mask with indices of new clients. Updates AllClients
|
|
|
|
* and AllSockets.
|
|
|
|
*****************/
|
|
|
|
|
|
|
|
/*ARGSUSED*/
|
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
|
|
|
Bool
|
2003-11-25 20:29:01 +01:00
|
|
|
EstablishNewConnections(ClientPtr clientUnused, pointer closure)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
fd_set readyconnections; /* set of listeners that are ready */
|
|
|
|
int curconn; /* fd of listener that's ready */
|
|
|
|
register int newconn; /* fd of new client */
|
|
|
|
CARD32 connect_time;
|
|
|
|
register int i;
|
|
|
|
register ClientPtr client;
|
|
|
|
register OsCommPtr oc;
|
|
|
|
fd_set tmask;
|
|
|
|
|
|
|
|
XFD_ANDSET (&tmask, (fd_set*)closure, &WellKnownConnections);
|
|
|
|
XFD_COPYSET(&tmask, &readyconnections);
|
|
|
|
if (!XFD_ANYSET(&readyconnections))
|
|
|
|
return TRUE;
|
|
|
|
connect_time = GetTimeInMillis();
|
|
|
|
/* kill off stragglers */
|
|
|
|
for (i=1; i<currentMaxClients; i++)
|
|
|
|
{
|
2003-11-14 17:49:22 +01:00
|
|
|
if ((client = clients[i]))
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
oc = (OsCommPtr)(client->osPrivate);
|
2003-11-14 17:49:22 +01:00
|
|
|
if ((oc && (oc->conn_time != 0) &&
|
|
|
|
(connect_time - oc->conn_time) >= TimeOutValue) ||
|
|
|
|
(client->noClientException != Success && !client->clientGone))
|
2003-11-14 16:54:54 +01:00
|
|
|
CloseDownClient(client);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#ifndef WIN32
|
2003-11-14 17:49:22 +01:00
|
|
|
for (i = 0; i < howmany(XFD_SETSIZE, NFDBITS); i++)
|
|
|
|
{
|
|
|
|
while (readyconnections.fds_bits[i])
|
2003-11-14 16:54:54 +01:00
|
|
|
#else
|
2003-11-14 17:49:22 +01:00
|
|
|
for (i = 0; i < XFD_SETCOUNT(&readyconnections); i++)
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
2003-11-14 17:49:22 +01:00
|
|
|
{
|
2003-11-14 16:54:54 +01:00
|
|
|
XtransConnInfo trans_conn, new_trans_conn;
|
|
|
|
int status;
|
|
|
|
|
|
|
|
#ifndef WIN32
|
2009-06-18 18:49:12 +02:00
|
|
|
curconn = mffs (readyconnections.fds_bits[i]) - 1;
|
2003-11-14 17:49:22 +01:00
|
|
|
readyconnections.fds_bits[i] &= ~((fd_mask)1 << curconn);
|
|
|
|
curconn += (i * (sizeof(fd_mask)*8));
|
2003-11-14 16:54:54 +01:00
|
|
|
#else
|
|
|
|
curconn = XFD_FD(&readyconnections, i);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if ((trans_conn = lookup_trans_conn (curconn)) == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if ((new_trans_conn = _XSERVTransAccept (trans_conn, &status)) == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
newconn = _XSERVTransGetConnectionNumber (new_trans_conn);
|
|
|
|
|
|
|
|
if (newconn < lastfdesc)
|
|
|
|
{
|
|
|
|
int clientid;
|
2004-11-22 14:23:25 +01:00
|
|
|
#if !defined(WIN32)
|
2003-11-14 16:54:54 +01:00
|
|
|
clientid = ConnectionTranslation[newconn];
|
2004-11-22 14:23:25 +01:00
|
|
|
#else
|
|
|
|
clientid = GetConnectionTranslation(newconn);
|
|
|
|
#endif
|
2003-11-14 16:54:54 +01:00
|
|
|
if(clientid && (client = clients[clientid]))
|
|
|
|
CloseDownClient(client);
|
|
|
|
}
|
|
|
|
|
|
|
|
_XSERVTransSetOption(new_trans_conn, TRANS_NONBLOCKING, 1);
|
|
|
|
|
2006-06-02 00:06:41 +02:00
|
|
|
if (!AllocNewConnection (new_trans_conn, newconn, connect_time))
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
ErrorConnMax(new_trans_conn);
|
|
|
|
_XSERVTransClose(new_trans_conn);
|
|
|
|
}
|
2008-08-09 19:07:32 +02:00
|
|
|
|
|
|
|
if(trans_conn->flags & TRANS_NOXAUTH)
|
|
|
|
new_trans_conn->flags = new_trans_conn->flags | TRANS_NOXAUTH;
|
|
|
|
|
2003-11-14 17:49:22 +01:00
|
|
|
}
|
|
|
|
#ifndef WIN32
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2003-11-14 17:49:22 +01:00
|
|
|
#endif
|
2003-11-14 16:54:54 +01:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define NOROOM "Maximum number of clients reached"
|
|
|
|
|
|
|
|
/************
|
|
|
|
* ErrorConnMax
|
|
|
|
* Fail a connection due to lack of client or file descriptor space
|
|
|
|
************/
|
|
|
|
|
|
|
|
static void
|
2003-11-25 20:29:01 +01:00
|
|
|
ErrorConnMax(XtransConnInfo trans_conn)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2003-11-25 20:29:01 +01:00
|
|
|
int fd = _XSERVTransGetConnectionNumber (trans_conn);
|
2003-11-14 16:54:54 +01:00
|
|
|
xConnSetupPrefix csp;
|
|
|
|
char pad[3];
|
|
|
|
struct iovec iov[3];
|
|
|
|
char byteOrder = 0;
|
|
|
|
int whichbyte = 1;
|
|
|
|
struct timeval waittime;
|
|
|
|
fd_set mask;
|
|
|
|
|
|
|
|
/* if these seems like a lot of trouble to go to, it probably is */
|
|
|
|
waittime.tv_sec = BOTIMEOUT / MILLI_PER_SECOND;
|
|
|
|
waittime.tv_usec = (BOTIMEOUT % MILLI_PER_SECOND) *
|
|
|
|
(1000000 / MILLI_PER_SECOND);
|
|
|
|
FD_ZERO(&mask);
|
|
|
|
FD_SET(fd, &mask);
|
|
|
|
(void)Select(fd + 1, &mask, NULL, NULL, &waittime);
|
|
|
|
/* try to read the byte-order of the connection */
|
|
|
|
(void)_XSERVTransRead(trans_conn, &byteOrder, 1);
|
|
|
|
if ((byteOrder == 'l') || (byteOrder == 'B'))
|
|
|
|
{
|
|
|
|
csp.success = xFalse;
|
|
|
|
csp.lengthReason = sizeof(NOROOM) - 1;
|
|
|
|
csp.length = (sizeof(NOROOM) + 2) >> 2;
|
|
|
|
csp.majorVersion = X_PROTOCOL;
|
|
|
|
csp.minorVersion = X_PROTOCOL_REVISION;
|
|
|
|
if (((*(char *) &whichbyte) && (byteOrder == 'B')) ||
|
|
|
|
(!(*(char *) &whichbyte) && (byteOrder == 'l')))
|
|
|
|
{
|
|
|
|
swaps(&csp.majorVersion, whichbyte);
|
|
|
|
swaps(&csp.minorVersion, whichbyte);
|
|
|
|
swaps(&csp.length, whichbyte);
|
|
|
|
}
|
|
|
|
iov[0].iov_len = sz_xConnSetupPrefix;
|
|
|
|
iov[0].iov_base = (char *) &csp;
|
|
|
|
iov[1].iov_len = csp.lengthReason;
|
|
|
|
iov[1].iov_base = NOROOM;
|
|
|
|
iov[2].iov_len = (4 - (csp.lengthReason & 3)) & 3;
|
|
|
|
iov[2].iov_base = pad;
|
|
|
|
(void)_XSERVTransWritev(trans_conn, iov, 3);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/************
|
|
|
|
* CloseDownFileDescriptor:
|
|
|
|
* Remove this file descriptor and it's I/O buffers, etc.
|
|
|
|
************/
|
|
|
|
|
|
|
|
static void
|
2003-11-25 20:29:01 +01:00
|
|
|
CloseDownFileDescriptor(OsCommPtr oc)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
int connection = oc->fd;
|
|
|
|
|
|
|
|
if (oc->trans_conn) {
|
|
|
|
_XSERVTransDisconnect(oc->trans_conn);
|
|
|
|
_XSERVTransClose(oc->trans_conn);
|
|
|
|
}
|
2004-11-22 14:23:25 +01:00
|
|
|
#ifndef WIN32
|
2003-11-14 17:49:22 +01:00
|
|
|
ConnectionTranslation[connection] = 0;
|
2004-11-22 14:23:25 +01:00
|
|
|
#else
|
|
|
|
SetConnectionTranslation(connection, 0);
|
|
|
|
#endif
|
2003-11-14 16:54:54 +01:00
|
|
|
FD_CLR(connection, &AllSockets);
|
|
|
|
FD_CLR(connection, &AllClients);
|
|
|
|
FD_CLR(connection, &ClientsWithInput);
|
|
|
|
FD_CLR(connection, &GrabImperviousClients);
|
|
|
|
if (GrabInProgress)
|
|
|
|
{
|
|
|
|
FD_CLR(connection, &SavedAllSockets);
|
|
|
|
FD_CLR(connection, &SavedAllClients);
|
|
|
|
FD_CLR(connection, &SavedClientsWithInput);
|
|
|
|
}
|
|
|
|
FD_CLR(connection, &ClientsWriteBlocked);
|
|
|
|
if (!XFD_ANYSET(&ClientsWriteBlocked))
|
|
|
|
AnyClientsWriteBlocked = FALSE;
|
|
|
|
FD_CLR(connection, &OutputPending);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************
|
2003-11-14 17:49:22 +01:00
|
|
|
* CheckConnections
|
2003-11-14 16:54:54 +01:00
|
|
|
* Some connection has died, go find which one and shut it down
|
|
|
|
* The file descriptor has been closed, but is still in AllClients.
|
|
|
|
* If would truly be wonderful if select() would put the bogus
|
|
|
|
* file descriptors in the exception mask, but nooooo. So we have
|
|
|
|
* to check each and every socket individually.
|
|
|
|
*****************/
|
|
|
|
|
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
|
|
|
CheckConnections(void)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
#ifndef WIN32
|
|
|
|
fd_mask mask;
|
|
|
|
#endif
|
|
|
|
fd_set tmask;
|
2003-11-25 20:29:01 +01:00
|
|
|
int curclient, curoff;
|
2003-11-14 16:54:54 +01:00
|
|
|
int i;
|
|
|
|
struct timeval notime;
|
|
|
|
int r;
|
|
|
|
#ifdef WIN32
|
|
|
|
fd_set savedAllClients;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
notime.tv_sec = 0;
|
|
|
|
notime.tv_usec = 0;
|
|
|
|
|
|
|
|
#ifndef WIN32
|
|
|
|
for (i=0; i<howmany(XFD_SETSIZE, NFDBITS); i++)
|
|
|
|
{
|
|
|
|
mask = AllClients.fds_bits[i];
|
|
|
|
while (mask)
|
|
|
|
{
|
2009-06-18 18:49:12 +02:00
|
|
|
curoff = mffs (mask) - 1;
|
2003-11-14 17:49:22 +01:00
|
|
|
curclient = curoff + (i * (sizeof(fd_mask)*8));
|
2003-11-14 16:54:54 +01:00
|
|
|
FD_ZERO(&tmask);
|
|
|
|
FD_SET(curclient, &tmask);
|
2007-12-05 20:36:37 +01:00
|
|
|
do {
|
|
|
|
r = Select (curclient + 1, &tmask, NULL, NULL, ¬ime);
|
|
|
|
} while (r < 0 && (errno == EINTR || errno == EAGAIN));
|
2003-11-14 16:54:54 +01:00
|
|
|
if (r < 0)
|
2007-12-05 20:31:07 +01:00
|
|
|
if (ConnectionTranslation[curclient] > 0)
|
|
|
|
CloseDownClient(clients[ConnectionTranslation[curclient]]);
|
2003-11-14 17:49:22 +01:00
|
|
|
mask &= ~((fd_mask)1 << curoff);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
XFD_COPYSET(&AllClients, &savedAllClients);
|
|
|
|
for (i = 0; i < XFD_SETCOUNT(&savedAllClients); i++)
|
|
|
|
{
|
|
|
|
curclient = XFD_FD(&savedAllClients, i);
|
|
|
|
FD_ZERO(&tmask);
|
|
|
|
FD_SET(curclient, &tmask);
|
2007-12-05 20:36:37 +01:00
|
|
|
do {
|
|
|
|
r = Select (curclient + 1, &tmask, NULL, NULL, ¬ime);
|
|
|
|
} while (r < 0 && (errno == EINTR || errno == EAGAIN));
|
|
|
|
if (r < 0)
|
|
|
|
if (GetConnectionTranslation(curclient) > 0)
|
|
|
|
CloseDownClient(clients[GetConnectionTranslation(curclient)]);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*****************
|
|
|
|
* CloseDownConnection
|
|
|
|
* Delete client from AllClients and free resources
|
|
|
|
*****************/
|
|
|
|
|
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
|
|
|
{
|
|
|
|
OsCommPtr oc = (OsCommPtr)client->osPrivate;
|
|
|
|
|
|
|
|
if (oc->output && oc->output->count)
|
|
|
|
FlushClient(client, oc, (char *)NULL, 0);
|
|
|
|
#ifdef XDMCP
|
|
|
|
XdmcpCloseDisplay(oc->fd);
|
|
|
|
#endif
|
|
|
|
CloseDownFileDescriptor(oc);
|
2007-02-15 18:09:00 +01:00
|
|
|
FreeOsBuffers(oc);
|
|
|
|
xfree(client->osPrivate);
|
2003-11-14 16:54:54 +01:00
|
|
|
client->osPrivate = (pointer)NULL;
|
|
|
|
if (auditTrailLevel > 1)
|
|
|
|
AuditF("client %d disconnected\n", client->index);
|
|
|
|
}
|
|
|
|
|
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
|
2006-07-19 16:05:12 +02:00
|
|
|
AddGeneralSocket(int fd)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
FD_SET(fd, &AllSockets);
|
2003-11-14 17:49:22 +01:00
|
|
|
if (GrabInProgress)
|
|
|
|
FD_SET(fd, &SavedAllSockets);
|
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
|
2006-07-19 16:05:12 +02:00
|
|
|
AddEnabledDevice(int fd)
|
|
|
|
{
|
|
|
|
FD_SET(fd, &EnabledDevices);
|
|
|
|
AddGeneralSocket(fd);
|
|
|
|
}
|
|
|
|
|
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
|
2006-07-19 16:05:12 +02:00
|
|
|
RemoveGeneralSocket(int fd)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
FD_CLR(fd, &AllSockets);
|
2003-11-14 17:49:22 +01:00
|
|
|
if (GrabInProgress)
|
|
|
|
FD_CLR(fd, &SavedAllSockets);
|
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
|
2006-07-19 16:05:12 +02:00
|
|
|
RemoveEnabledDevice(int fd)
|
|
|
|
{
|
|
|
|
FD_CLR(fd, &EnabledDevices);
|
|
|
|
RemoveGeneralSocket(fd);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
|
|
|
OsCommPtr oc = (OsCommPtr)client->osPrivate;
|
2007-08-15 20:14:45 +02:00
|
|
|
int rc, connection = oc->fd;
|
|
|
|
|
|
|
|
rc = XaceHook(XACE_SERVER_ACCESS, client, DixGrabAccess);
|
|
|
|
if (rc != Success)
|
|
|
|
return rc;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
if (! GrabInProgress)
|
|
|
|
{
|
|
|
|
XFD_COPYSET(&ClientsWithInput, &SavedClientsWithInput);
|
|
|
|
XFD_ANDSET(&ClientsWithInput,
|
|
|
|
&ClientsWithInput, &GrabImperviousClients);
|
|
|
|
if (FD_ISSET(connection, &SavedClientsWithInput))
|
|
|
|
{
|
|
|
|
FD_CLR(connection, &SavedClientsWithInput);
|
|
|
|
FD_SET(connection, &ClientsWithInput);
|
|
|
|
}
|
|
|
|
XFD_UNSET(&SavedClientsWithInput, &GrabImperviousClients);
|
|
|
|
XFD_COPYSET(&AllSockets, &SavedAllSockets);
|
|
|
|
XFD_COPYSET(&AllClients, &SavedAllClients);
|
|
|
|
XFD_UNSET(&AllSockets, &AllClients);
|
|
|
|
XFD_ANDSET(&AllClients, &AllClients, &GrabImperviousClients);
|
|
|
|
FD_SET(connection, &AllClients);
|
|
|
|
XFD_ORSET(&AllSockets, &AllSockets, &AllClients);
|
|
|
|
GrabInProgress = client->index;
|
|
|
|
}
|
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
|
|
|
{
|
|
|
|
if (GrabInProgress)
|
|
|
|
{
|
|
|
|
XFD_ORSET(&AllSockets, &AllSockets, &SavedAllSockets);
|
|
|
|
XFD_ORSET(&AllClients, &AllClients, &SavedAllClients);
|
|
|
|
XFD_ORSET(&ClientsWithInput, &ClientsWithInput, &SavedClientsWithInput);
|
|
|
|
GrabInProgress = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* 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
|
2003-11-25 20:29:01 +01:00
|
|
|
IgnoreClient (ClientPtr client)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
OsCommPtr oc = (OsCommPtr)client->osPrivate;
|
|
|
|
int connection = oc->fd;
|
|
|
|
|
|
|
|
isItTimeToYield = TRUE;
|
|
|
|
if (!GrabInProgress || FD_ISSET(connection, &AllClients))
|
|
|
|
{
|
|
|
|
if (FD_ISSET (connection, &ClientsWithInput))
|
|
|
|
FD_SET(connection, &IgnoredClientsWithInput);
|
|
|
|
else
|
|
|
|
FD_CLR(connection, &IgnoredClientsWithInput);
|
|
|
|
FD_CLR(connection, &ClientsWithInput);
|
|
|
|
FD_CLR(connection, &AllSockets);
|
|
|
|
FD_CLR(connection, &AllClients);
|
|
|
|
FD_CLR(connection, &LastSelectMask);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (FD_ISSET (connection, &SavedClientsWithInput))
|
|
|
|
FD_SET(connection, &IgnoredClientsWithInput);
|
|
|
|
else
|
|
|
|
FD_CLR(connection, &IgnoredClientsWithInput);
|
|
|
|
FD_CLR(connection, &SavedClientsWithInput);
|
|
|
|
FD_CLR(connection, &SavedAllSockets);
|
|
|
|
FD_CLR(connection, &SavedAllClients);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* 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
|
2003-11-25 20:29:01 +01:00
|
|
|
AttendClient (ClientPtr client)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
OsCommPtr oc = (OsCommPtr)client->osPrivate;
|
|
|
|
int connection = oc->fd;
|
|
|
|
if (!GrabInProgress || GrabInProgress == client->index ||
|
|
|
|
FD_ISSET(connection, &GrabImperviousClients))
|
|
|
|
{
|
|
|
|
FD_SET(connection, &AllClients);
|
|
|
|
FD_SET(connection, &AllSockets);
|
|
|
|
FD_SET(connection, &LastSelectMask);
|
|
|
|
if (FD_ISSET (connection, &IgnoredClientsWithInput))
|
|
|
|
FD_SET(connection, &ClientsWithInput);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FD_SET(connection, &SavedAllClients);
|
|
|
|
FD_SET(connection, &SavedAllSockets);
|
|
|
|
if (FD_ISSET(connection, &IgnoredClientsWithInput))
|
|
|
|
FD_SET(connection, &SavedClientsWithInput);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
|
|
{
|
|
|
|
OsCommPtr oc = (OsCommPtr)client->osPrivate;
|
|
|
|
int connection = oc->fd;
|
|
|
|
|
|
|
|
FD_SET(connection, &GrabImperviousClients);
|
|
|
|
|
|
|
|
if (ServerGrabCallback)
|
|
|
|
{
|
|
|
|
ServerGrabInfoRec grabinfo;
|
|
|
|
grabinfo.client = client;
|
|
|
|
grabinfo.grabstate = CLIENT_IMPERVIOUS;
|
|
|
|
CallCallbacks(&ServerGrabCallback, &grabinfo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
|
|
{
|
|
|
|
OsCommPtr oc = (OsCommPtr)client->osPrivate;
|
|
|
|
int connection = oc->fd;
|
|
|
|
|
|
|
|
FD_CLR(connection, &GrabImperviousClients);
|
|
|
|
if (GrabInProgress && (GrabInProgress != client->index))
|
|
|
|
{
|
|
|
|
if (FD_ISSET(connection, &ClientsWithInput))
|
|
|
|
{
|
|
|
|
FD_SET(connection, &SavedClientsWithInput);
|
|
|
|
FD_CLR(connection, &ClientsWithInput);
|
|
|
|
}
|
|
|
|
FD_CLR(connection, &AllSockets);
|
|
|
|
FD_CLR(connection, &AllClients);
|
|
|
|
isItTimeToYield = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ServerGrabCallback)
|
|
|
|
{
|
|
|
|
ServerGrabInfoRec grabinfo;
|
|
|
|
grabinfo.client = client;
|
|
|
|
grabinfo.grabstate = CLIENT_PERVIOUS;
|
|
|
|
CallCallbacks(&ServerGrabCallback, &grabinfo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-05-17 23:56:53 +02:00
|
|
|
#ifdef XQUARTZ
|
|
|
|
/* Add a fd (from launchd) to our listeners */
|
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 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;
|
2008-08-06 19:23:31 +02:00
|
|
|
|
|
|
|
if(!strncmp(getenv("DISPLAY"), "/tmp/launch", 11)) {
|
|
|
|
/* Make the path the launchd socket if our DISPLAY is set right */
|
|
|
|
strcpy(port, getenv("DISPLAY"));
|
|
|
|
} else {
|
|
|
|
/* Just some default so things don't break and die. */
|
|
|
|
sprintf(port, ":%d", atoi(display));
|
|
|
|
}
|
2008-05-17 23:56:53 +02:00
|
|
|
|
|
|
|
/* Make our XtransConnInfo
|
|
|
|
* TRANS_SOCKET_LOCAL_INDEX = 5 from Xtrans.c
|
|
|
|
*/
|
|
|
|
ciptr = _XSERVTransReopenCOTSServer(5, fd, port);
|
|
|
|
if(ciptr == NULL) {
|
2008-05-19 08:31:41 +02:00
|
|
|
ErrorF("Got NULL while trying to Reopen launchd port.\n");
|
2008-05-17 23:56:53 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-08-06 19:23:31 +02:00
|
|
|
if(noxauth)
|
|
|
|
ciptr->flags = ciptr->flags | TRANS_NOXAUTH;
|
|
|
|
|
2008-05-17 23:56:53 +02:00
|
|
|
/* Allocate space to store it */
|
2008-05-19 08:31:41 +02:00
|
|
|
ListenTransFds = (int *) xrealloc(ListenTransFds, (ListenTransCount + 1) * sizeof (int));
|
|
|
|
ListenTransConns = (XtransConnInfo *) xrealloc(ListenTransConns, (ListenTransCount + 1) * sizeof (XtransConnInfo));
|
2008-05-17 23:56:53 +02:00
|
|
|
|
|
|
|
/* Store it */
|
|
|
|
ListenTransConns[ListenTransCount] = ciptr;
|
|
|
|
ListenTransFds[ListenTransCount] = fd;
|
|
|
|
|
|
|
|
FD_SET(fd, &WellKnownConnections);
|
2008-05-23 11:10:14 +02:00
|
|
|
FD_SET(fd, &AllSockets);
|
2008-05-17 23:56:53 +02:00
|
|
|
|
|
|
|
/* Increment the count */
|
|
|
|
ListenTransCount++;
|
2008-05-23 11:10:14 +02:00
|
|
|
|
2008-08-06 19:23:31 +02:00
|
|
|
/* This *might* not be needed... /shrug */
|
|
|
|
ResetAuthorization();
|
|
|
|
ResetHosts(display);
|
2008-05-23 11:10:14 +02:00
|
|
|
#ifdef XDMCP
|
2008-08-06 19:23:31 +02:00
|
|
|
XdmcpReset();
|
2008-05-23 11:10:14 +02:00
|
|
|
#endif
|
2008-05-17 23:56:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|