aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/ClientChannel.cpp
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:52 +0100
committerReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:52 +0100
commitca416e79745b336c3a6f89c863da0a5b39d8b5ab (patch)
tree4cc470eaf16c51cd1dd778f6db0d81a9edec8601 /nxcomp/ClientChannel.cpp
parent95ce6b74b70f9d9645a07e03eed9a8004ba7c8cc (diff)
downloadnx-libs-ca416e79745b336c3a6f89c863da0a5b39d8b5ab.tar.gz
nx-libs-ca416e79745b336c3a6f89c863da0a5b39d8b5ab.tar.bz2
nx-libs-ca416e79745b336c3a6f89c863da0a5b39d8b5ab.zip
Imported nxcomp-3.3.0-4.tar.gznxcomp/3.3.0-4
Summary: Imported nxcomp-3.3.0-4.tar.gz Keywords: Imported nxcomp-3.3.0-4.tar.gz into Git repository
Diffstat (limited to 'nxcomp/ClientChannel.cpp')
-rwxr-xr-xnxcomp/ClientChannel.cpp26
1 files changed, 6 insertions, 20 deletions
diff --git a/nxcomp/ClientChannel.cpp b/nxcomp/ClientChannel.cpp
index f93156a17..ef9ea270c 100755
--- a/nxcomp/ClientChannel.cpp
+++ b/nxcomp/ClientChannel.cpp
@@ -4539,24 +4539,6 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
lastSequence_ = serverSequence_;
}
}
-/*
-FIXME: This block was added, otherwise we have a loss
- of the nxagent events.
-*/
- else
- {
- #ifdef DEBUG
- *logofs << "handleWrite: Updating last event's sequence "
- << lastSequence_ << " to X server's sequence number "
- << serverSequence_ << " for FD#" << fd_
- << ".\n" << logofs_flush;
- #endif
-
- lastSequence_ = serverSequence_;
- }
-
-/*
-FIXME: This causes the loss of the nxagent events.
//
// Check if by producing events at client side we
@@ -4565,7 +4547,12 @@ FIXME: This causes the loss of the nxagent events.
// comply with the last one known by client.
//
- if (serverSequence_ > lastSequence_)
+/*
+FIXME: Recover the sequence number if the proxy
+ is not connected to an agent.
+*/
+ if (serverSequence_ > lastSequence_ ||
+ control -> SessionMode != session_proxy)
{
#ifdef DEBUG
*logofs << "handleWrite: Updating last event's sequence "
@@ -4589,7 +4576,6 @@ FIXME: This causes the loss of the nxagent events.
<< logofs_flush;
}
#endif
-*/
//
// Check if remote side used fast encoding.