[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: nxcomp/3.5.0-2

[X2Go dev team]

The branch, build-baikal has been updated
       via  232dfc41d41390bfffa75ec2ed065c109fa03a0e (commit)
      from  233de71fc954b38f6be286e28e525e50533f9c49 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 nxcomp/CHANGELOG       |    4 ++++
 nxcomp/Proxy.cpp       |   19 ++++++++++++++++++-
 nxcomp/ServerProxy.cpp |    2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
index df10c85..b7ef0d9 100644
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -1,5 +1,9 @@
 ChangeLog:
 
+nxcomp-3.5.0-2
+
+- Fixed TR11H02398. Solved a race condition when creating channels.
+
 nxcomp-3.5.0-1
 
 - Opened the 3.5.0 branch based on nxcomp-3.4.0-7.
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 347dd5a..3b4df7e 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -1626,6 +1626,23 @@ int Proxy::handleControlFromProxy(const unsigned char *message)
   int channelId = *(message + 2);
 
   //
+  // Check if the channel has been dropped.
+  //
+
+  if (channels_[channelId] != NULL &&
+          (channels_[channelId] -> getDrop() == 1 ||
+              channels_[channelId] -> getClosing() == 1))
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Dropping the descriptor FD#"
+            << getFd(channelId) << " channel ID#"
+            << channelId << ".\n" << logofs_flush;
+    #endif
+
+    handleDrop(channelId);
+  }
+
+  //
   // Check if the channel is in the valid
   // range.
   //
diff --git a/nxcomp/ServerProxy.cpp b/nxcomp/ServerProxy.cpp
index 404dd51..0a72fc3 100644
--- a/nxcomp/ServerProxy.cpp
+++ b/nxcomp/ServerProxy.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).