Commit 6c09c0b7 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

nxagent: make XDMCP variables Booleans

parent 1b91c8ac
...@@ -114,8 +114,8 @@ extern void nxagentDumpInputDevicesState(void); ...@@ -114,8 +114,8 @@ extern void nxagentDumpInputDevicesState(void);
* Used in the handling of the X desktop manager protocol. * Used in the handling of the X desktop manager protocol.
*/ */
int nxagentXdmcpUp = 0; Bool nxagentXdmcpUp = False;
int nxagentXdmcpAlertUp = 0; Bool nxagentXdmcpAlertUp = False;
/* /*
* Also used in the block, wakeup and sync handlers. * Also used in the block, wakeup and sync handlers.
...@@ -648,7 +648,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask) ...@@ -648,7 +648,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
* the session. * the session.
*/ */
if (nxagentOption(Xdmcp) && nxagentXdmcpUp == 0) if (nxagentOption(Xdmcp) && !nxagentXdmcpUp)
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentWakeupHandler: XdmcpState [%d].\n", XdmcpState); fprintf(stderr, "nxagentWakeupHandler: XdmcpState [%d].\n", XdmcpState);
...@@ -656,10 +656,10 @@ void nxagentWakeupHandler(void * data, int count, void * mask) ...@@ -656,10 +656,10 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
if (XdmcpState == XDM_RUN_SESSION) if (XdmcpState == XDM_RUN_SESSION)
{ {
nxagentXdmcpUp = 1; nxagentXdmcpUp = True;
} }
if (nxagentXdmcpUp == 0) if (!nxagentXdmcpUp)
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentWakeupHandler: XdmcpTime [%lu].\n", fprintf(stderr, "nxagentWakeupHandler: XdmcpTime [%lu].\n",
...@@ -671,7 +671,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask) ...@@ -671,7 +671,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
XdmcpTimeOutRtx); XdmcpTimeOutRtx);
#endif #endif
if (nxagentXdmcpAlertUp == 0 && if (!nxagentXdmcpAlertUp &&
GetTimeInMillis() - XdmcpStartTime >= XDM_TIMEOUT) GetTimeInMillis() - XdmcpStartTime >= XDM_TIMEOUT)
{ {
#ifdef WARNING #ifdef WARNING
...@@ -681,7 +681,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask) ...@@ -681,7 +681,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
NXTransAlert(FAILED_XDMCP_CONNECTION_ALERT, NX_ALERT_REMOTE); NXTransAlert(FAILED_XDMCP_CONNECTION_ALERT, NX_ALERT_REMOTE);
nxagentXdmcpAlertUp = 1; nxagentXdmcpAlertUp = True;
} }
} }
} }
......
...@@ -330,7 +330,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio ...@@ -330,7 +330,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
clientReady[0] = 0; clientReady[0] = 0;
if (nxagentHaveSplashWindow() || (nxagentOption(Xdmcp) && nxagentXdmcpUp == 0)) if (nxagentHaveSplashWindow() || (nxagentOption(Xdmcp) && !nxagentXdmcpUp))
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "******Dispatch: Requesting a timeout of [%d] Ms.\n", fprintf(stderr, "******Dispatch: Requesting a timeout of [%d] Ms.\n",
...@@ -343,7 +343,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio ...@@ -343,7 +343,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
if (serverGeneration > nxagentMaxAllowedResets && if (serverGeneration > nxagentMaxAllowedResets &&
nxagentSessionState == SESSION_STARTING && nxagentSessionState == SESSION_STARTING &&
(!nxagentOption(Xdmcp) || nxagentXdmcpUp == 1)) (!nxagentOption(Xdmcp) || nxagentXdmcpUp))
{ {
#ifdef NX_DEBUG_INPUT #ifdef NX_DEBUG_INPUT
fprintf(stderr, "Session: Session started at '%s' timestamp [%u].\n", fprintf(stderr, "Session: Session started at '%s' timestamp [%u].\n",
......
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
extern xdmcp_states XdmcpState; extern xdmcp_states XdmcpState;
extern int XdmcpTimeOutRtx; extern int XdmcpTimeOutRtx;
extern int XdmcpStartTime; extern int XdmcpStartTime;
extern int nxagentXdmcpUp; extern Bool nxagentXdmcpUp;
#endif /* __Xdmcp_H__ */ #endif /* __Xdmcp_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment