XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

1 files changed, 171 insertions, 18 deletions

diff --git a/os/osdep.h b/os/osdep.h
index c7c730740..a1fe2bfed 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.17 2002/05/31 18:46:06 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -46,10 +47,17 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: osdep.h,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
 
+#ifndef _OSDEP_H_
+#define _OSDEP_H_ 1
+
 #define BOTIMEOUT 200 /* in milliseconds */
 #define BUFSIZE 4096
 #define BUFWATERMARK 8192
+#ifndef MAXBUFSIZE
 #define MAXBUFSIZE (1 << 22)
+#endif
+
+#include <X11/Xdmcp.h>
 
 #ifndef sgi	    /* SGI defines OPEN_MAX in a useless way */
 #ifndef X_NOT_POSIX
@@ -69,6 +77,9 @@ SOFTWARE.
 #endif /* X_NOT_POSIX */
 #endif
 
+#ifdef __QNX__
+#define NOFILES_MAX 256
+#endif
 #ifndef OPEN_MAX
 #ifdef SVR4
 #define OPEN_MAX 256
@@ -78,11 +89,22 @@ SOFTWARE.
 #if defined(NOFILE) && !defined(NOFILES_MAX)
 #define OPEN_MAX NOFILE
 #else
+#ifndef __UNIXOS2__
 #define OPEN_MAX NOFILES_MAX
+#else
+#define OPEN_MAX 256
 #endif
 #endif
 #endif
 #endif
+#endif
+
+#include <X11/Xpoll.h>
+
+/*
+ * MAXSOCKS is used only for initialising MaxClients when no other method
+ * like sysconf(_SC_OPEN_MAX) is not supported.
+ */
 
 #if OPEN_MAX <= 256
 #define MAXSOCKS (OPEN_MAX - 1)
@@ -90,10 +112,19 @@ SOFTWARE.
 #define MAXSOCKS 256
 #endif
 
-#ifndef NULL
-#define NULL 0
+/* MAXSELECT is the number of fds that select() can handle */
+#define MAXSELECT (sizeof(fd_set) * NBBY)
+
+#if !defined(hpux) && !defined(SVR4) && !defined(SYSV)
+#define HAS_GETDTABLESIZE
 #endif
 
+#include <stddef.h>
+
+typedef Bool (*ValidatorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int packet_type);
+typedef Bool (*GeneratorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int packet_type);
+typedef Bool (*AddAuthorFunc)(unsigned name_length, char *name, unsigned data_length, char *data);
+
 typedef struct _connectionInput {
     struct _connectionInput *next;
     char *buffer;               /* contains current client input */
@@ -127,6 +158,36 @@ typedef struct _k5_state {
 typedef struct _LbxProxy *OsProxyPtr;
 #endif
 
+struct _osComm;
+
+#define AuthInitArgs void
+typedef void (*AuthInitFunc) (AuthInitArgs);
+
+#define AuthAddCArgs unsigned short data_length, char *data, XID id
+typedef int (*AuthAddCFunc) (AuthAddCArgs);
+
+#define AuthCheckArgs unsigned short data_length, char *data, ClientPtr client, char **reason
+typedef XID (*AuthCheckFunc) (AuthCheckArgs);
+
+#define AuthFromIDArgs XID id, unsigned short *data_lenp, char **datap
+typedef int (*AuthFromIDFunc) (AuthFromIDArgs);
+
+#define AuthGenCArgs unsigned data_length, char *data, XID id, unsigned *data_length_return, char **data_return
+typedef XID (*AuthGenCFunc) (AuthGenCArgs);
+
+#define AuthRemCArgs unsigned short data_length, char *data
+typedef int (*AuthRemCFunc) (AuthRemCArgs);
+
+#define AuthRstCArgs void
+typedef int (*AuthRstCFunc) (AuthRstCArgs);
+
+#define AuthToIDArgs unsigned short data_length, char *data
+typedef XID (*AuthToIDFunc) (AuthToIDArgs);
+
+typedef void (*OsCloseFunc)(ClientPtr);
+
+typedef int (*OsFlushFunc)(ClientPtr who, struct _osComm * oc, char* extraBuf, int extraCount);
+
 typedef struct _osComm {
     int fd;
     ConnectionInputPtr input;
@@ -140,8 +201,8 @@ typedef struct _osComm {
 #ifdef LBX
     OsProxyPtr proxy;
     ConnectionInputPtr largereq;
-    void (*Close) ();
-    int  (*Flush) ();
+    OsCloseFunc Close;
+    OsFlushFunc Flush;
 #endif
 } OsCommRec, *OsCommPtr;
 
@@ -149,38 +210,130 @@ typedef struct _osComm {
 #define FlushClient(who, oc, extraBuf, extraCount) \
     (*(oc)->Flush)(who, oc, extraBuf, extraCount)
 extern int StandardFlushClient(
-#if NeedFunctionPrototypes
     ClientPtr /*who*/,
     OsCommPtr /*oc*/,
     char* /*extraBuf*/,
     int /*extraCount*/
-#endif
 );
 #else
 extern int FlushClient(
-#if NeedFunctionPrototypes
     ClientPtr /*who*/,
     OsCommPtr /*oc*/,
     char* /*extraBuf*/,
     int /*extraCount*/
-#endif
 );
 #endif
 
 extern void FreeOsBuffers(
-#if NeedFunctionPrototypes
     OsCommPtr /*oc*/
-#endif
 );
 
-extern ConnectionInputPtr AllocateInputBuffer(
-#if NeedFunctionPrototypes
-    void
+#include "dix.h"
+
+extern ConnectionInputPtr AllocateInputBuffer(void);
+
+extern ConnectionOutputPtr AllocateOutputBuffer(void);
+
+extern fd_set AllSockets;
+extern fd_set AllClients;
+extern fd_set LastSelectMask;
+extern fd_set WellKnownConnections;
+extern fd_set EnabledDevices;
+extern fd_set ClientsWithInput;
+extern fd_set ClientsWriteBlocked;
+extern fd_set OutputPending;
+extern fd_set IgnoredClientsWithInput;
+ 
+extern int *ConnectionTranslation;
+ 
+extern Bool NewOutputPending;
+extern Bool AnyClientsWriteBlocked;
+extern Bool CriticalOutputPending;
+
+extern int timesThisConnection;
+extern ConnectionInputPtr FreeInputs;
+extern ConnectionOutputPtr FreeOutputs;
+extern OsCommPtr AvailableInput;
+
+extern WorkQueuePtr workQueue;
+
+/* added by raphael */
+#define ffs mffs
+extern int mffs(fd_mask);
+
+/* in auth.c */
+extern void GenerateRandomData (int len, char *buf);
+
+/* in mitauth.c */
+extern XID  MitCheckCookie    (AuthCheckArgs);
+extern XID  MitGenerateCookie (AuthGenCArgs);
+extern XID  MitToID           (AuthToIDArgs);
+extern int  MitAddCookie      (AuthAddCArgs);
+extern int  MitFromID         (AuthFromIDArgs);
+extern int  MitRemoveCookie   (AuthRemCArgs);
+extern int  MitResetCookie    (AuthRstCArgs);
+
+/* in xdmauth.c */
+#ifdef HASXDMAUTH
+extern XID  XdmCheckCookie    (AuthCheckArgs);
+extern XID  XdmToID           (AuthToIDArgs);
+extern int  XdmAddCookie      (AuthAddCArgs);
+extern int  XdmFromID         (AuthFromIDArgs);
+extern int  XdmRemoveCookie   (AuthRemCArgs);
+extern int  XdmResetCookie    (AuthRstCArgs);
 #endif
-);
 
-extern ConnectionOutputPtr AllocateOutputBuffer(
-#if NeedFunctionPrototypes
-    void
+/* in rpcauth.c */
+#ifdef SECURE_RPC
+extern void SecureRPCInit     (AuthInitArgs);
+extern XID  SecureRPCCheck    (AuthCheckArgs);
+extern XID  SecureRPCToID     (AuthToIDArgs);
+extern int  SecureRPCAdd      (AuthAddCArgs);
+extern int  SecureRPCFromID   (AuthFromIDArgs);
+extern int  SecureRPCRemove   (AuthRemCArgs);
+extern int  SecureRPCReset    (AuthRstCArgs);
 #endif
-);
+
+/* in k5auth.c */
+#ifdef K5AUTH
+extern XID  K5Check           (AuthCheckArgs);
+extern XID  K5ToID            (AuthToIDArgs);
+extern int  K5Add             (AuthAddCArgs);
+extern int  K5FromID          (AuthFromIDArgs);
+extern int  K5Remove          (AuthRemCArgs);
+extern int  K5Reset           (AuthRstCArgs);
+#endif
+
+/* in secauth.c */
+extern XID AuthSecurityCheck (AuthCheckArgs);
+
+/* in xdmcp.c */
+extern void XdmcpUseMsg (void);
+extern int XdmcpOptions(int argc, char **argv, int i);
+extern void XdmcpSetAuthentication (ARRAY8Ptr name);
+extern void XdmcpRegisterConnection (
+    int	    type,
+    char    *address,
+    int	    addrlen);
+extern void XdmcpRegisterAuthorizations (void);
+extern void XdmcpRegisterAuthorization (char *name, int namelen);
+extern void XdmcpRegisterDisplayClass (char *name, int length);
+extern void XdmcpInit (void);
+extern void XdmcpReset (void);
+extern void XdmcpOpenDisplay(int sock);
+extern void XdmcpCloseDisplay(int sock);
+extern void XdmcpRegisterAuthentication (
+    char    *name,
+    int	    namelen,
+    char    *data,
+    int	    datalen,
+    ValidatorFunc Validator,
+    GeneratorFunc Generator,
+    AddAuthorFunc AddAuth);
+extern int XdmcpCheckAuthentication (ARRAY8Ptr Name, ARRAY8Ptr Data, int packet_type);
+extern int XdmcpAddAuthorization (ARRAY8Ptr name, ARRAY8Ptr data);
+
+struct sockaddr_in;
+extern void XdmcpRegisterBroadcastAddress (struct sockaddr_in *addr);
+
+#endif /* _OSDEP_H_ */