Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
6c09c0b7
Commit
6c09c0b7
authored
Dec 31, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
Jan 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nxagent: make XDMCP variables Booleans
parent
1b91c8ac
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
Handlers.c
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+7
-7
NXdispatch.c
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+2
-2
Xdmcp.h
nx-X11/programs/Xserver/hw/nxagent/Xdmcp.h
+1
-1
No files found.
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
View file @
6c09c0b7
...
...
@@ -114,8 +114,8 @@ extern void nxagentDumpInputDevicesState(void);
* Used in the handling of the X desktop manager protocol.
*/
int
nxagentXdmcpUp
=
0
;
int
nxagentXdmcpAlertUp
=
0
;
Bool
nxagentXdmcpUp
=
False
;
Bool
nxagentXdmcpAlertUp
=
False
;
/*
* Also used in the block, wakeup and sync handlers.
...
...
@@ -648,7 +648,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
* the session.
*/
if
(
nxagentOption
(
Xdmcp
)
&&
nxagentXdmcpUp
==
0
)
if
(
nxagentOption
(
Xdmcp
)
&&
!
nxagentXdmcpUp
)
{
#ifdef DEBUG
fprintf
(
stderr
,
"nxagentWakeupHandler: XdmcpState [%d].
\n
"
,
XdmcpState
);
...
...
@@ -656,10 +656,10 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
if
(
XdmcpState
==
XDM_RUN_SESSION
)
{
nxagentXdmcpUp
=
1
;
nxagentXdmcpUp
=
True
;
}
if
(
nxagentXdmcpUp
==
0
)
if
(
!
nxagentXdmcpUp
)
{
#ifdef DEBUG
fprintf
(
stderr
,
"nxagentWakeupHandler: XdmcpTime [%lu].
\n
"
,
...
...
@@ -671,7 +671,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
XdmcpTimeOutRtx
);
#endif
if
(
nxagentXdmcpAlertUp
==
0
&&
if
(
!
nxagentXdmcpAlertUp
&&
GetTimeInMillis
()
-
XdmcpStartTime
>=
XDM_TIMEOUT
)
{
#ifdef WARNING
...
...
@@ -681,7 +681,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
NXTransAlert
(
FAILED_XDMCP_CONNECTION_ALERT
,
NX_ALERT_REMOTE
);
nxagentXdmcpAlertUp
=
1
;
nxagentXdmcpAlertUp
=
True
;
}
}
}
...
...
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
View file @
6c09c0b7
...
...
@@ -330,7 +330,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
clientReady
[
0
]
=
0
;
if
(
nxagentHaveSplashWindow
()
||
(
nxagentOption
(
Xdmcp
)
&&
nxagentXdmcpUp
==
0
))
if
(
nxagentHaveSplashWindow
()
||
(
nxagentOption
(
Xdmcp
)
&&
!
nxagentXdmcpUp
))
{
#ifdef TEST
fprintf
(
stderr
,
"******Dispatch: Requesting a timeout of [%d] Ms.
\n
"
,
...
...
@@ -343,7 +343,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
if
(
serverGeneration
>
nxagentMaxAllowedResets
&&
nxagentSessionState
==
SESSION_STARTING
&&
(
!
nxagentOption
(
Xdmcp
)
||
nxagentXdmcpUp
==
1
))
(
!
nxagentOption
(
Xdmcp
)
||
nxagentXdmcpUp
))
{
#ifdef NX_DEBUG_INPUT
fprintf
(
stderr
,
"Session: Session started at '%s' timestamp [%u].
\n
"
,
...
...
nx-X11/programs/Xserver/hw/nxagent/Xdmcp.h
View file @
6c09c0b7
...
...
@@ -36,6 +36,6 @@
extern
xdmcp_states
XdmcpState
;
extern
int
XdmcpTimeOutRtx
;
extern
int
XdmcpStartTime
;
extern
int
nxagentXdmcpUp
;
extern
Bool
nxagentXdmcpUp
;
#endif
/* __Xdmcp_H__ */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment