dix: Remove -to option to set the default connection timeout
One minute is admittedly arbitrary, but again, pretty sure this never gets set on the command line in practice.
This commit is contained in:
parent
46a275522f
commit
2d1ed64d2a
|
@ -118,5 +118,3 @@ const char *display;
|
||||||
int displayfd = -1;
|
int displayfd = -1;
|
||||||
Bool explicit_display = FALSE;
|
Bool explicit_display = FALSE;
|
||||||
char *ConnectionInfo;
|
char *ConnectionInfo;
|
||||||
|
|
||||||
CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;
|
|
||||||
|
|
|
@ -42,7 +42,6 @@ extern _X_EXPORT volatile char dispatchException;
|
||||||
#define DE_TERMINATE 2
|
#define DE_TERMINATE 2
|
||||||
#define DE_PRIORITYCHANGE 4 /* set when a client's priority changes */
|
#define DE_PRIORITYCHANGE 4 /* set when a client's priority changes */
|
||||||
|
|
||||||
extern _X_EXPORT CARD32 TimeOutValue;
|
|
||||||
extern _X_EXPORT int ScreenSaverBlanking;
|
extern _X_EXPORT int ScreenSaverBlanking;
|
||||||
extern _X_EXPORT int ScreenSaverAllowExposures;
|
extern _X_EXPORT int ScreenSaverAllowExposures;
|
||||||
extern _X_EXPORT int defaultScreenSaverBlanking;
|
extern _X_EXPORT int defaultScreenSaverBlanking;
|
||||||
|
|
|
@ -51,7 +51,6 @@ SOFTWARE.
|
||||||
* The following constants contain default values for all of the variables
|
* The following constants contain default values for all of the variables
|
||||||
* that can be initialized on the server command line or in the environment.
|
* that can be initialized on the server command line or in the environment.
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_TIMEOUT 60 /* seconds */
|
|
||||||
#define DEFAULT_KEYBOARD_CLICK 0
|
#define DEFAULT_KEYBOARD_CLICK 0
|
||||||
#define DEFAULT_BELL 50
|
#define DEFAULT_BELL 50
|
||||||
#define DEFAULT_BELL_PITCH 400
|
#define DEFAULT_BELL_PITCH 400
|
||||||
|
|
|
@ -269,9 +269,6 @@ This overrides a previous
|
||||||
.B \-noreset
|
.B \-noreset
|
||||||
command line option.
|
command line option.
|
||||||
.TP 8
|
.TP 8
|
||||||
.B \-to \fIseconds\fP
|
|
||||||
sets default connection timeout in seconds.
|
|
||||||
.TP 8
|
|
||||||
.B \-tst
|
.B \-tst
|
||||||
disables all testing extensions (e.g., XTEST, XTrap, XTestExtension1, RECORD).
|
disables all testing extensions (e.g., XTEST, XTrap, XTestExtension1, RECORD).
|
||||||
.TP 8
|
.TP 8
|
||||||
|
|
|
@ -647,10 +647,10 @@ AllocNewConnection(XtransConnInfo trans_conn, int fd, CARD32 conn_time)
|
||||||
|
|
||||||
/*****************
|
/*****************
|
||||||
* EstablishNewConnections
|
* EstablishNewConnections
|
||||||
* If anyone is waiting on listened sockets, accept them.
|
* If anyone is waiting on listened sockets, accept them. Drop pending
|
||||||
* Updates AllClients and AllSockets.
|
* connections if they've stuck around for more than one minute.
|
||||||
*****************/
|
*****************/
|
||||||
|
#define TimeOutValue 60 * MILLI_PER_SECOND
|
||||||
static void
|
static void
|
||||||
EstablishNewConnections(int curconn, int ready, void *data)
|
EstablishNewConnections(int curconn, int ready, void *data)
|
||||||
{
|
{
|
||||||
|
|
|
@ -560,7 +560,6 @@ UseMsg(void)
|
||||||
ErrorF("-seat string seat to run on\n");
|
ErrorF("-seat string seat to run on\n");
|
||||||
ErrorF("-t # default pointer threshold (pixels/t)\n");
|
ErrorF("-t # default pointer threshold (pixels/t)\n");
|
||||||
ErrorF("-terminate terminate at server reset\n");
|
ErrorF("-terminate terminate at server reset\n");
|
||||||
ErrorF("-to # connection time out\n");
|
|
||||||
ErrorF("-tst disable testing extensions\n");
|
ErrorF("-tst disable testing extensions\n");
|
||||||
ErrorF("ttyxx server started from init on /dev/ttyxx\n");
|
ErrorF("ttyxx server started from init on /dev/ttyxx\n");
|
||||||
ErrorF("v video blanking for screen-saver\n");
|
ErrorF("v video blanking for screen-saver\n");
|
||||||
|
@ -916,12 +915,6 @@ ProcessCommandLine(int argc, char *argv[])
|
||||||
else if (strcmp(argv[i], "-terminate") == 0) {
|
else if (strcmp(argv[i], "-terminate") == 0) {
|
||||||
dispatchExceptionAtReset = DE_TERMINATE;
|
dispatchExceptionAtReset = DE_TERMINATE;
|
||||||
}
|
}
|
||||||
else if (strcmp(argv[i], "-to") == 0) {
|
|
||||||
if (++i < argc)
|
|
||||||
TimeOutValue = ((CARD32) atoi(argv[i])) * MILLI_PER_SECOND;
|
|
||||||
else
|
|
||||||
UseMsg();
|
|
||||||
}
|
|
||||||
else if (strcmp(argv[i], "-tst") == 0) {
|
else if (strcmp(argv[i], "-tst") == 0) {
|
||||||
noTestExtensions = TRUE;
|
noTestExtensions = TRUE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue